Bugfixes related to removing Snapper class.

[architektonas] / src / forms / insertoptions.cpp

diff --git a/src/forms/insertoptions.cpp b/src/forms/insertoptions.cpp
index f1f61724d941e152a74ef4a23a0cff7e4e710067..45b1909c64a2d7e16d715e6ba0745ac6e46f6658 100644 (file)
--- a/src/forms/insertoptions.cpp
+++ b/src/forms/insertoptions.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 "insertoptions.h"
 
-#include "rs_actionblocksinsert.h"
+#include "actionblocksinsert.h"
 #include "settings.h"
 
 InsertOptions::InsertOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -78,11 +80,11 @@ InsertOptions::~InsertOptions()
        settings.endGroup();
 }
 
-void InsertOptions::setAction(RS_ActionInterface * a, bool update)
+void InsertOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionBlocksInsert)
        {
-               action = (RS_ActionBlocksInsert *)a;
+               action = (ActionBlocksInsert *)a;
 
                QString sAngle;
                QString sFactor;
@@ -93,7 +95,7 @@ void InsertOptions::setAction(RS_ActionInterface * a, bool update)
 
                if (update)
                {
-                       sAngle = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+                       sAngle = QString("%1").arg(Math::rad2deg(action->getAngle()));
                        sFactor = QString("%1").arg(action->getFactor());
                        sColumns = QString("%1").arg(action->getColumns());
                        sRows = QString("%1").arg(action->getRows());
@@ -121,7 +123,7 @@ void InsertOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "InsertOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "InsertOptions::setAction: wrong action type");
                action = NULL;
        }
 }
@@ -130,11 +132,11 @@ void InsertOptions::updateData()
 {
        if (action != NULL)
        {
-               action->setAngle(RS_Math::deg2rad(RS_Math::eval(leAngle->text())));
-               action->setFactor(RS_Math::eval(leFactor->text()));
+               action->setAngle(Math::deg2rad(Math::eval(leAngle->text())));
+               action->setFactor(Math::eval(leFactor->text()));
                action->setColumns(sbColumns->value());
                action->setRows(sbRows->value());
-               action->setColumnSpacing(RS_Math::eval(leColumnSpacing->text()));
-               action->setRowSpacing(RS_Math::eval(leRowSpacing->text()));
+               action->setColumnSpacing(Math::eval(leColumnSpacing->text()));
+               action->setRowSpacing(Math::eval(leRowSpacing->text()));
        }
 }