X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flineangleoptions.cpp;h=7e80f02e9802e6aaa19471593160c3dda5015fc6;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=dca00ae1c478729e9c7e4d9e12add1410f47799e;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/forms/lineangleoptions.cpp b/src/forms/lineangleoptions.cpp
index dca00ae..7e80f02 100644
--- a/src/forms/lineangleoptions.cpp
+++ b/src/forms/lineangleoptions.cpp
@@ -17,7 +17,7 @@
 #include "lineangleoptions.h"
 
 #include "actiondrawlineangle.h"
-#include "rs_debug.h"
+#include "debug.h"
 #include "settings.h"
 
 LineAngleOptions::LineAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -63,7 +63,7 @@ LineAngleOptions::~LineAngleOptions()
 		settings.beginGroup("Draw");
 
 		if (!action->hasFixedAngle())
-			settings.setValue("LineAngleAngle", RS_Math::rad2deg(action->getAngle()));
+			settings.setValue("LineAngleAngle", Math::rad2deg(action->getAngle()));
 
 		settings.setValue("LineAngleLength", action->getLength());
 		settings.setValue("LineAngleSnapPoint", action->getSnapPoint());
@@ -73,7 +73,7 @@ LineAngleOptions::~LineAngleOptions()
 
 void LineAngleOptions::setAction(ActionInterface * a, bool update)
 {
-	if (a != NULL && a->rtti() == RS2::ActionDrawLineAngle)
+	if (a && a->rtti() == RS2::ActionDrawLineAngle)
 	{
 		action = (ActionDrawLineAngle *)a;
 
@@ -83,14 +83,13 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update)
 			leAngle->hide();
 		}
 
-		QString sa;
-		QString sl;
+		QString sa, sl;
 		int sp;
 
 		// 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());
 			sp = action->getSnapPoint();
 		}
@@ -116,25 +115,25 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "LineAngleOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "LineAngleOptions::setAction: wrong action type");
 		this->action = NULL;
 	}
 }
 
 void LineAngleOptions::updateAngle(const QString & a)
 {
-	if (action != NULL && !action->hasFixedAngle())
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(a)));
+	if (action && !action->hasFixedAngle())
+		action->setAngle(Math::deg2rad(Math::eval(a)));
 }
 
 void LineAngleOptions::updateLength(const QString & l)
 {
-	if (action != NULL)
-		action->setLength(RS_Math::eval(l));
+	if (action)
+		action->setLength(Math::eval(l));
 }
 
 void LineAngleOptions::updateSnapPoint(int sp)
 {
-	if (action != NULL)
+	if (action)
 		action->setSnapPoint(sp);
 }