Bugfixes related to removing Snapper class.

[architektonas] / src / forms / splineoptions.cpp

diff --git a/src/forms/splineoptions.cpp b/src/forms/splineoptions.cpp
index 2d1630142837a8dc4c1e0ad19245a923558f22bc..af6148b235a675c267fcd8cdb9c2fa1ffa18d5cc 100644 (file)
--- a/src/forms/splineoptions.cpp
+++ b/src/forms/splineoptions.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,8 +16,9 @@
 
 #include "splineoptions.h"
 
-#include "rs_actiondrawspline.h"
-#include "rs_actioninterface.h"
+#include "actiondrawspline.h"
+#include "actioninterface.h"
+#include "debug.h"
 #include "settings.h"
 
 SplineOptions::SplineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -57,11 +60,11 @@ SplineOptions::~SplineOptions()
        settings.endGroup();
 }
 
-void SplineOptions::setAction(RS_ActionInterface * a, bool update)
+void SplineOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionDrawSpline)
        {
-               action = (RS_ActionDrawSpline *)a;
+               action = (ActionDrawSpline *)a;
 
                int degree;
                bool closed;
@@ -86,7 +89,7 @@ void SplineOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "SplineOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "SplineOptions::setAction: wrong action type");
                action = NULL;
        }
 }