X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Ftrimamountoptions.cpp;h=71c532916b85ef16ab795db77a6af5ad317bb6d1;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=5d6cb54df54bf92ae5d289311230b0c6363f1d6a;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas diff --git a/src/forms/trimamountoptions.cpp b/src/forms/trimamountoptions.cpp index 5d6cb54..71c5329 100644 --- a/src/forms/trimamountoptions.cpp +++ b/src/forms/trimamountoptions.cpp @@ -18,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*/): @@ -73,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; } } @@ -81,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)); }