X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Froundoptions.cpp;h=1084835ba7961d3e0f4eec16158d6a5ef5a75542;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=8c72258ec23e9f0b3c555b54a331e393ba209c0f;hpb=95a6dd28327cbd80f9221b1457e7edd4e7230169;p=architektonas

diff --git a/src/forms/roundoptions.cpp b/src/forms/roundoptions.cpp
index 8c72258..1084835 100644
--- a/src/forms/roundoptions.cpp
+++ b/src/forms/roundoptions.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 "roundoptions.h"
 
-#include "rs_actionmodifyround.h"
+#include "actionmodifyround.h"
+#include "debug.h"
 #include "settings.h"
 
 RoundOptions::RoundOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -53,11 +56,11 @@ RoundOptions::~RoundOptions()
 	settings.endGroup();
 }
 
-void RoundOptions::setAction(RS_ActionInterface * a, bool update)
+void RoundOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionModifyRound)
 	{
-		action = (RS_ActionModifyRound *)a;
+		action = (ActionModifyRound *)a;
 
 		QString sr;
 		bool st;
@@ -80,7 +83,7 @@ void RoundOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "LineParallelOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "LineParallelOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -90,7 +93,7 @@ void RoundOptions::updateData()
 	if (action != NULL)
 	{
 		action->setTrim(cbTrim->isChecked());
-		action->setRadius(RS_Math::eval(leRadius->text()));
+		action->setRadius(Math::eval(leRadius->text()));
 	}
 }