Initial phase of adding polyline functionality. DOES NOT COMPILE.

[architektonas] / src / forms / beveloptions.cpp

diff --git a/src/forms/beveloptions.cpp b/src/forms/beveloptions.cpp
index a99f7f20b1a95541bb684f954313bb5075b0023a..d022a8b4fc732acfafec103a60cc397a6cda5157 100644 (file)
--- a/src/forms/beveloptions.cpp
+++ b/src/forms/beveloptions.cpp
@@ -16,9 +16,10 @@
 
 #include "beveloptions.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "actioninterface.h"
 #include "actionmodifybevel.h"
+#include "debug.h"
 #include "settings.h"
 
 BevelOptions::BevelOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -95,7 +96,7 @@ void BevelOptions::setAction(ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "BevelOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "BevelOptions::setAction: wrong action type");
                action = NULL;
        }
 }
@@ -105,7 +106,7 @@ void BevelOptions::updateData()
        if (action != NULL)
        {
                action->setTrim(cbTrim->isChecked());
-               action->setLength1(RS_Math::eval(leLength1->text()));
-               action->setLength2(RS_Math::eval(leLength2->text()));
+               action->setLength1(Math::eval(leLength1->text()));
+               action->setLength2(Math::eval(leLength2->text()));
        }
 }