X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdimlinearoptions.cpp;h=ad6ea75b9a678bea78415c3510ce58a244231a95;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=b221d11956be5ad7ef4826de2654d9296e02dddf;hpb=0e80da8b560e09124c527f3544859e0c31157ce4;p=architektonas

diff --git a/src/forms/dimlinearoptions.cpp b/src/forms/dimlinearoptions.cpp
index b221d11..ad6ea75 100644
--- a/src/forms/dimlinearoptions.cpp
+++ b/src/forms/dimlinearoptions.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,8 +16,9 @@
 
 #include "dimlinearoptions.h"
 
-#include "rs_actiondimlinear.h"
-#include "rs_actioninterface.h"
+#include "actiondimlinear.h"
+#include "actioninterface.h"
+#include "debug.h"
 #include "settings.h"
 
 DimLinearOptions::DimLinearOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -56,16 +59,16 @@ DimLinearOptions::~DimLinearOptions()
 	settings.endGroup();
 }
 
-void DimLinearOptions::setAction(RS_ActionInterface * a, bool update)
+void DimLinearOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionDimLinear)
 	{
-		action = (RS_ActionDimLinear *)a;
+		action = (ActionDimLinear *)a;
 
 		QString sa;
 
 		if (update)
-			sa = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+			sa = QString("%1").arg(Math::rad2deg(action->getAngle()));
 		else
 		{
 			settings.beginGroup("Dimension");
@@ -76,7 +79,7 @@ void DimLinearOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "DimLinearOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "DimLinearOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -84,7 +87,7 @@ void DimLinearOptions::setAction(RS_ActionInterface * a, bool update)
 void DimLinearOptions::updateAngle(const QString & a)
 {
 	if (action != NULL)
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(a)));
+		action->setAngle(Math::deg2rad(Math::eval(a)));
 }
 
 void DimLinearOptions::setHor()