In the middle of major refactoring...

[architektonas] / src / forms / lineoptions.cpp

diff --git a/src/forms/lineoptions.cpp b/src/forms/lineoptions.cpp
index 0cca77d1bd2f93c3be3bc0f41d8365d8f48bb925..f4e536299efef31fc4d00a26e4eb4e80b3de1bc7 100644 (file)
--- a/src/forms/lineoptions.cpp
+++ b/src/forms/lineoptions.cpp
@@ -15,8 +15,8 @@
 #include "lineoptions.h"
 
 #include "rs.h"
-#include "rs_actiondrawline.h"
-#include "rs_actioninterface.h"
+#include "actiondrawline.h"
+#include "actioninterface.h"
 
 LineOptions::LineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QWidget(parent, flags), action(NULL),
@@ -45,11 +45,12 @@ LineOptions::~LineOptions()
 {
 }
 
-void LineOptions::setAction(RS_ActionInterface * a)
+//void LineOptions::setAction(ActionInterface * a)
+void LineOptions::setAction(ActionInterface * a)
 {
        if (a != NULL && a->rtti() == RS2::ActionDrawLine)
        {
-               action = (RS_ActionDrawLine *)a;
+               action = (ActionDrawLine *)a;
        }
        else
        {