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 94887b43332ca38677d73dcdfe17390294a7d02e..d022a8b4fc732acfafec103a60cc397a6cda5157 100644 (file)
--- a/src/forms/beveloptions.cpp
+++ b/src/forms/beveloptions.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,9 +16,10 @@
 
 #include "beveloptions.h"
 
-#include "rs.h"
-#include "rs_actioninterface.h"
-#include "rs_actionmodifybevel.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*/):
@@ -62,11 +65,11 @@ BevelOptions::~BevelOptions()
        settings.endGroup();
 }
 
-void BevelOptions::setAction(RS_ActionInterface * a, bool update)
+void BevelOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionModifyBevel)
        {
-               action = (RS_ActionModifyBevel *)a;
+               action = (ActionModifyBevel *)a;
 
                QString sd1;
                QString sd2;
@@ -93,7 +96,7 @@ void BevelOptions::setAction(RS_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;
        }
 }
@@ -103,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()));
        }
 }