X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flineangleoptions.cpp;h=7e80f02e9802e6aaa19471593160c3dda5015fc6;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=626d0a4395c0cdefa17f72e8fee1778a3d974d90;hpb=1f0d096a7fc370ff02477f3860beae2669bf8903;p=architektonas diff --git a/src/forms/lineangleoptions.cpp b/src/forms/lineangleoptions.cpp index 626d0a4..7e80f02 100644 --- a/src/forms/lineangleoptions.cpp +++ b/src/forms/lineangleoptions.cpp @@ -17,7 +17,7 @@ #include "lineangleoptions.h" #include "actiondrawlineangle.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineAngleOptions::LineAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): @@ -63,7 +63,7 @@ LineAngleOptions::~LineAngleOptions() settings.beginGroup("Draw"); if (!action->hasFixedAngle()) - settings.setValue("LineAngleAngle", RS_Math::rad2deg(action->getAngle())); + settings.setValue("LineAngleAngle", Math::rad2deg(action->getAngle())); settings.setValue("LineAngleLength", action->getLength()); settings.setValue("LineAngleSnapPoint", action->getSnapPoint()); @@ -89,7 +89,7 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update) // settings from action: if (update) { - sa = QString("%1").arg(RS_Math::rad2deg(action->getAngle())); + sa = QString("%1").arg(Math::rad2deg(action->getAngle())); sl = QString("%1").arg(action->getLength()); sp = action->getSnapPoint(); } @@ -115,7 +115,7 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update) } else { - RS_DEBUG->print(RS_Debug::D_ERROR, "LineAngleOptions::setAction: wrong action type"); + DEBUG->print(Debug::D_ERROR, "LineAngleOptions::setAction: wrong action type"); this->action = NULL; } } @@ -123,13 +123,13 @@ void LineAngleOptions::setAction(ActionInterface * a, bool update) void LineAngleOptions::updateAngle(const QString & a) { if (action && !action->hasFixedAngle()) - action->setAngle(RS_Math::deg2rad(RS_Math::eval(a))); + action->setAngle(Math::deg2rad(Math::eval(a))); } void LineAngleOptions::updateLength(const QString & l) { if (action) - action->setLength(RS_Math::eval(l)); + action->setLength(Math::eval(l)); } void LineAngleOptions::updateSnapPoint(int sp)