Bugfixes related to removing Snapper class.

[architektonas] / src / forms / linerelangleoptions.cpp

diff --git a/src/forms/linerelangleoptions.cpp b/src/forms/linerelangleoptions.cpp
index dc92c13f151dc8f4a7a161d2302c5a2e294317e9..24134938b7900f59b985540234a9b77e2362c64c 100644 (file)
--- a/src/forms/linerelangleoptions.cpp
+++ b/src/forms/linerelangleoptions.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,8 @@
 
 #include "linerelangleoptions.h"
 
-#include "rs_actiondrawlinerelangle.h"
+#include "actiondrawlinerelangle.h"
+#include "debug.h"
 #include "settings.h"
 
 LineRelAngleOptions::LineRelAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -51,18 +54,18 @@ LineRelAngleOptions::~LineRelAngleOptions()
                settings.beginGroup("Draw");
 
                if (!action->hasFixedAngle())
-                       settings.value("LineRelAngleAngle", RS_Math::rad2deg(action->getAngle()));
+                       settings.value("LineRelAngleAngle", Math::rad2deg(action->getAngle()));
 
                settings.value("LineRelAngleLength", action->getLength());
                settings.endGroup();
        }
 }
 
-void LineRelAngleOptions::setAction(RS_ActionInterface * a, bool update)
+void LineRelAngleOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionDrawLineRelAngle)
        {
-               action = (RS_ActionDrawLineRelAngle *)a;
+               action = (ActionDrawLineRelAngle *)a;
 
                if (action->hasFixedAngle())
                {
@@ -76,7 +79,7 @@ void LineRelAngleOptions::setAction(RS_ActionInterface * a, bool update)
                // settings from action:
                if (update)
                {
-                       sa = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+                       sa = QString("%1").arg(Math::rad2deg(action->getAngle()));
                        sl = QString("%1").arg(action->getLength());
                }
                // settings from config file:
@@ -87,7 +90,7 @@ void LineRelAngleOptions::setAction(RS_ActionInterface * a, bool update)
                        if (!action->hasFixedAngle())
                                sa = settings.value("LineRelAngleAngle", "30.0").toString();
                        else
-                               sa = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+                               sa = QString("%1").arg(Math::rad2deg(action->getAngle()));
 
                        sl = settings.value("LineRelAngleLength", "10.0").toString();
                        settings.endGroup();
@@ -98,7 +101,7 @@ void LineRelAngleOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR,
+               DEBUG->print(Debug::D_ERROR,
                        "LineRelAngleOptions::setAction: wrong action type");
                this->action = NULL;
        }
@@ -107,11 +110,11 @@ void LineRelAngleOptions::setAction(RS_ActionInterface * a, bool update)
 void LineRelAngleOptions::updateAngle(const QString & a)
 {
        if (action != NULL && !action->hasFixedAngle())
-               action->setAngle(RS_Math::deg2rad(RS_Math::eval(a)));
+               action->setAngle(Math::deg2rad(Math::eval(a)));
 }
 
 void LineRelAngleOptions::updateLength(const QString & l)
 {
        if (action != NULL)
-               action->setLength(RS_Math::eval(l));
+               action->setLength(Math::eval(l));
 }