X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fmoverotateoptions.cpp;h=b807989c239f9deca83031f4b591755bb72bc693;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=4a257e708f093a3a07fafc2f5a3fa6f457279043;hpb=95a6dd28327cbd80f9221b1457e7edd4e7230169;p=architektonas

diff --git a/src/forms/moverotateoptions.cpp b/src/forms/moverotateoptions.cpp
index 4a257e7..b807989 100644
--- a/src/forms/moverotateoptions.cpp
+++ b/src/forms/moverotateoptions.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 "moverotateoptions.h"
 
-#include "rs_actionmodifymoverotate.h"
+#include "actionmodifymoverotate.h"
+#include "debug.h"
 #include "settings.h"
 
 MoveRotateOptions::MoveRotateOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -45,29 +48,29 @@ MoveRotateOptions::~MoveRotateOptions()
 	settings.endGroup();
 }
 
-void MoveRotateOptions::setAction(RS_ActionInterface * a, bool update)
+void MoveRotateOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionModifyMoveRotate)
 	{
-		action = (RS_ActionModifyMoveRotate *)a;
+		action = (ActionModifyMoveRotate *)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("Modify");
 			sa = settings.value("MoveRotate", "30").toString();
 			settings.endGroup();
-			action->setAngle(RS_Math::deg2rad(sa.toDouble()));
+			action->setAngle(Math::deg2rad(sa.toDouble()));
 		}
 
 		leAngle->setText(sa);
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "CircleOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "CircleOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -75,6 +78,6 @@ void MoveRotateOptions::setAction(RS_ActionInterface * a, bool update)
 void MoveRotateOptions::updateAngle(const QString & a)
 {
 	if (action != NULL)
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(a)));
+		action->setAngle(Math::deg2rad(Math::eval(a)));
 }