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

diff --git a/src/forms/lineangleoptions.cpp b/src/forms/lineangleoptions.cpp
index dca00ae..5fd69d5 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*/):
@@ -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,8 +83,7 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update)
 			leAngle->hide();
 		}
 
-		QString sa;
-		QString sl;
+		QString sa, sl;
 		int sp;
 
 		// settings from action:
@@ -123,18 +122,18 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update)
 
 void LineAngleOptions::updateAngle(const QString & a)
 {
-	if (action != NULL && !action->hasFixedAngle())
+	if (action && !action->hasFixedAngle())
 		action->setAngle(RS_Math::deg2rad(RS_Math::eval(a)));
 }
 
 void LineAngleOptions::updateLength(const QString & l)
 {
-	if (action != NULL)
+	if (action)
 		action->setLength(RS_Math::eval(l));
 }
 
 void LineAngleOptions::updateSnapPoint(int sp)
 {
-	if (action != NULL)
+	if (action)
 		action->setSnapPoint(sp);
 }