Phase two of adding polyline functionality...

[architektonas] / src / forms / cadtoolbar.cpp

diff --git a/src/forms/cadtoolbar.cpp b/src/forms/cadtoolbar.cpp
index 5680f1da1aea518fc3f1f646c0ae6e4e293978ed..e9cdcd436667747d28cf167c0cd303bd6e40b6f4 100644 (file)
--- a/src/forms/cadtoolbar.cpp
+++ b/src/forms/cadtoolbar.cpp
@@ -29,7 +29,7 @@
 #include "cadtoolbarselect.h"
 #include "cadtoolbarsnap.h"
 #include "cadtoolbarsplines.h"
-#include "rs.h"
+#include "enums.h"
 
 CadToolBar::CadToolBar(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QWidget(parent, flags), actionHandler(NULL), currentTb(NULL), tbSplines(NULL),
@@ -59,7 +59,7 @@ CadToolBar::~CadToolBar()
 /**
  * @return Pointer to action handler or NULL.
  */
-QG_ActionHandler * CadToolBar::getActionHandler()
+ActionHandler * CadToolBar::getActionHandler()
 {
        return actionHandler;
 }
@@ -100,7 +100,7 @@ void CadToolBar::contextMenuEvent(QContextMenuEvent * e)
  *
  * @param ah Pointer to action handler which will deal with the actions in this tool bar.
  */
-void CadToolBar::createSubToolBars(QG_ActionHandler * ah)
+void CadToolBar::createSubToolBars(ActionHandler * ah)
 {
        actionHandler = ah;
        tbMain = new CadToolBarMain(this);