Phase two of adding polyline functionality...

[architektonas] / src / forms / cadtoolbar.h

diff --git a/src/forms/cadtoolbar.h b/src/forms/cadtoolbar.h
index eb7286920e4cf0e872edd01c7a30d5c4caa9987f..2810f619b228d21a478976c5fdfaf0d5c6674680 100644 (file)
--- a/src/forms/cadtoolbar.h
+++ b/src/forms/cadtoolbar.h
@@ -3,8 +3,8 @@
 
 #include <QtGui>
 
-class RS_ActionInterface;
-class QG_ActionHandler;
+class ActionInterface;
+class ActionHandler;
 class CadToolBarSplines;
 class CadToolBarInfo;
 class CadToolBarMain;
@@ -27,14 +27,14 @@ class CadToolBar: public QWidget
                CadToolBar(QWidget * parent = 0, Qt::WindowFlags flags = 0);
                ~CadToolBar();
 
-               QG_ActionHandler * getActionHandler();
+               ActionHandler * getActionHandler();
 
        public slots:
                void back();
                void forceNext();
                void mouseReleaseEvent(QMouseEvent * e);
                void contextMenuEvent(QContextMenuEvent * e);
-               void createSubToolBars(QG_ActionHandler * ah);
+               void createSubToolBars(ActionHandler * ah);
                void showToolBar(int id);
                void showToolBarMain();
                void showToolBarPoints();
@@ -49,7 +49,7 @@ class CadToolBar: public QWidget
                void showToolBarSnap();
                void showToolBarDim();
                void showToolBarSelect();
-               void showToolBarSelect(RS_ActionInterface * selectAction, int nextAction);
+               void showToolBarSelect(ActionInterface * selectAction, int nextAction);
                QToolButton * CreateBackButton(QWidget *);
                QToolButton * CreateToolButton(QAction * action);
 
@@ -58,7 +58,7 @@ class CadToolBar: public QWidget
                void signalNext();
 
        protected:
-               QG_ActionHandler * actionHandler;
+               ActionHandler * actionHandler;
                QWidget * currentTb;
                CadToolBarSplines * tbSplines;
                CadToolBarInfo * tbInfo;