Bugfixes related to removing Snapper class.

[architektonas] / src / forms / trimamountoptions.cpp

diff --git a/src/forms/trimamountoptions.cpp b/src/forms/trimamountoptions.cpp
index dde64764687063c00eeb9b184440aa907b739443..71c532916b85ef16ab795db77a6af5ad317bb6d1 100644 (file)
--- 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>
 //
@@ -16,8 +18,8 @@
 
 #include "actionmodifytrimamount.h"
 #include "actioninterface.h"
-#include "rs_debug.h"
-#include "rs_math.h"
+#include "debug.h"
+#include "mathextra.h"
 #include "settings.h"
 
 TrimAmountOptions::TrimAmountOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -71,7 +73,7 @@ void TrimAmountOptions::setAction(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(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));
 }