Refactored CAD tool bars to use predefined actions.

[architektonas] / src / widgets / qg_dialogfactory.h

diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h
index 5fff2cf87fc3b307ca418cde77d05fa5645622a7..8696e997811fbe64b53836fbfec1a381cd478c2a 100644 (file)
--- a/src/widgets/qg_dialogfactory.h
+++ b/src/widgets/qg_dialogfactory.h
@@ -7,12 +7,13 @@
 #include "rs_debug.h"
 
 class CadToolBar;
-class CoordinateWidget;
-class SelectionWidget;
-class MouseWidget;
 class CommandWidget;
-class QG_MainWindowInterface;
+class CoordinateWidget;
 class RS_Document;
+class GraphicView;
+class QG_MainWindowInterface;
+class MouseWidget;
+class SelectionWidget;
 
 #define QG_DIALOGFACTORY (RS_DialogFactory::instance()->getFactoryObject()->isAdapter()==false ? ((QG_DialogFactory*)RS_DialogFactory::instance()->getFactoryObject()) : NULL)
 
@@ -24,11 +25,11 @@ class RS_Document;
 class QG_DialogFactory: public RS_DialogFactoryInterface
 {
        public:
-               QG_DialogFactory(QWidget * parent, QWidget * ow);
+               QG_DialogFactory(QWidget * parent, QToolBar * ow);
                virtual ~QG_DialogFactory();
 
        protected:
-               virtual void setOptionWidget(QWidget * ow);
+               virtual void setOptionWidget(QToolBar * ow);
 
        public:
                virtual void setCoordinateWidget(CoordinateWidget * cw);
@@ -41,7 +42,7 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
                virtual void setMainWindow(QG_MainWindowInterface * mw);
                virtual void requestWarningDialog(const QString& warning);
 
-               virtual RS_GraphicView * requestNewDocument(const QString& fileName = QString::null,
+               virtual GraphicView * requestNewDocument(const QString & fileName = QString::null,
                        RS_Document * doc = NULL);
                virtual void requestSimulationControls();
 
@@ -106,11 +107,11 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
                virtual bool requestHatchDialog(RS_Hatch * hatch);
 
 #ifdef RS_CAM
-               virtual bool requestCamOptionsDialog(RS_Graphic & graphic);
+               virtual bool requestCamOptionsDialog(Drawing & graphic);
 #endif
 
                virtual void requestOptionsGeneralDialog();
-               virtual void requestOptionsDrawingDialog(RS_Graphic & graphic);
+               virtual void requestOptionsDrawingDialog(Drawing & graphic);
 
                virtual void requestPreviousMenu();
 
@@ -127,7 +128,7 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
                //! Pointer to the widget which can host dialogs
                QWidget * parent;
                //! Pointer to the widget which can host individual tool options
-               QWidget * optionWidget;
+               QToolBar * optionWidget;
                //! Pointer to the coordinate widget.
                CoordinateWidget * coordinateWidget;
                //! Pointer to the mouse widget.