Phase two of adding polyline functionality...

[architektonas] / src / forms / dlgscale.cpp

diff --git a/src/forms/dlgscale.cpp b/src/forms/dlgscale.cpp
index 95078eed08258f0f950fc57dec28afcca8562c0e..97796bd12fd170ea34606509907f64c1affbfe68 100644 (file)
--- a/src/forms/dlgscale.cpp
+++ b/src/forms/dlgscale.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,7 +16,7 @@
 
 #include "dlgscale.h"
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "settings.h"
 
 DlgScale::DlgScale(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
@@ -73,7 +75,7 @@ DlgScale::~DlgScale()
        settings.endGroup();
 }
 
-void DlgScale::setData(RS_ScaleData * d)
+void DlgScale::setData(ScaleData * d)
 {
        data = d;
 }
@@ -87,7 +89,7 @@ void DlgScale::updateData()
        else
                data->number = ui.leNumber->text().toInt();
 
-       data->factor = RS_Math::eval(ui.leFactor->text());
+       data->factor = Math::eval(ui.leFactor->text());
        data->useCurrentAttributes = ui.cbCurrentAttributes->isChecked();
        data->useCurrentLayer = ui.cbCurrentLayer->isChecked();
 }