Phase two of adding polyline functionality...

[architektonas] / src / forms / dimoptions.cpp

diff --git a/src/forms/dimoptions.cpp b/src/forms/dimoptions.cpp
index 6255912421909aa1c06f625c796b1f5ea21a2fdf..4859f0b14213b940cc489c7b3a50809013f05e0f 100644 (file)
--- a/src/forms/dimoptions.cpp
+++ b/src/forms/dimoptions.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 "dimoptions.h"
 
-#include "rs_actiondimension.h"
-#include "rs_actioninterface.h"
+#include "actiondimension.h"
+#include "actioninterface.h"
+#include "debug.h"
 #include "settings.h"
 
 DimOptions::DimOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -80,11 +83,11 @@ DimOptions::~DimOptions()
        settings.endGroup();
 }
 
-void DimOptions::setAction(RS_ActionInterface * a, bool update)
+void DimOptions::setAction(ActionInterface * a, bool update)
 {
-       if (a != NULL && RS_ActionDimension::isDimensionAction(a->rtti()))
+       if (a != NULL && ActionDimension::isDimensionAction(a->rtti()))
        {
-               action = (RS_ActionDimension *)a;
+               action = (ActionDimension *)a;
 
                QString st;
                QString stol1;
@@ -115,7 +118,7 @@ void DimOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "DimensionOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "DimensionOptions::setAction: wrong action type");
                action = NULL;
        }
 }