X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Ftrimamountoptions.cpp;h=71c532916b85ef16ab795db77a6af5ad317bb6d1;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=c48283d42226884969509d125dfc407a42a676a6;hpb=0e80da8b560e09124c527f3544859e0c31157ce4;p=architektonas

diff --git a/src/forms/trimamountoptions.cpp b/src/forms/trimamountoptions.cpp
index c48283d..71c5329 100644
--- a/src/forms/trimamountoptions.cpp
+++ b/src/forms/trimamountoptions.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,10 +16,10 @@
 
 #include "trimamountoptions.h"
 
-#include "rs_actionmodifytrimamount.h"
-#include "rs_actioninterface.h"
-#include "rs_debug.h"
-#include "rs_math.h"
+#include "actionmodifytrimamount.h"
+#include "actioninterface.h"
+#include "debug.h"
+#include "mathextra.h"
 #include "settings.h"
 
 TrimAmountOptions::TrimAmountOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -48,11 +50,11 @@ TrimAmountOptions::~TrimAmountOptions()
 	settings.endGroup();
 }
 
-void TrimAmountOptions::setAction(RS_ActionInterface * a, bool update)
+void TrimAmountOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionModifyTrimAmount)
 	{
-		action = (RS_ActionModifyTrimAmount *)a;
+		action = (ActionModifyTrimAmount *)a;
 
 		QString sd;
 
@@ -71,7 +73,7 @@ void TrimAmountOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "ModifyTrimAmountOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "ModifyTrimAmountOptions::setAction: wrong action type");
 		this->action = NULL;
 	}
 }
@@ -79,5 +81,5 @@ void TrimAmountOptions::setAction(RS_ActionInterface * a, bool update)
 void TrimAmountOptions::updateDist(const QString & d)
 {
 	if (action != NULL)
-		action->setDistance(RS_Math::eval(d, 1.0));
+		action->setDistance(Math::eval(d, 1.0));
 }