X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcircleoptions.cpp;h=a0c38a423561270a22da22807613041593c6fe35;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=9a0f65e36c4065d20b3c5e33d3e7ea604b7fa3d8;hpb=3f46c180da0806c9c263e6d87d0f1404632402da;p=architektonas

diff --git a/src/forms/circleoptions.cpp b/src/forms/circleoptions.cpp
index 9a0f65e..a0c38a4 100644
--- a/src/forms/circleoptions.cpp
+++ b/src/forms/circleoptions.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,9 +16,10 @@
 
 #include "circleoptions.h"
 
-#include "rs.h"
-#include "rs_actioninterface.h"
-#include "rs_actiondrawcirclecr.h"
+#include "enums.h"
+#include "actioninterface.h"
+#include "actiondrawcirclecr.h"
+#include "debug.h"
 #include "settings.h"
 
 CircleOptions::CircleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -47,11 +50,11 @@ CircleOptions::~CircleOptions()
 	settings.endGroup();
 }
 
-void CircleOptions::setAction(RS_ActionInterface * a, bool update)
+void CircleOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionDrawCircleCR)
 	{
-		action = (RS_ActionDrawCircleCR *)a;
+		action = (ActionDrawCircleCR *)a;
 
 		QString sr;
 
@@ -69,7 +72,7 @@ void CircleOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR,
+		DEBUG->print(Debug::D_ERROR,
 			"CircleOptions::setAction: wrong action type");
 		action = NULL;
 	}
@@ -78,5 +81,5 @@ void CircleOptions::setAction(RS_ActionInterface * a, bool update)
 void CircleOptions::updateRadius(const QString & r)
 {
 	if (action != NULL)
-		action->setRadius(RS_Math::eval(r));
+		action->setRadius(Math::eval(r));
 }