In the middle of major refactoring...

[architektonas] / src / base / rs_dialogfactoryadapter.h

diff --git a/src/base/rs_dialogfactoryadapter.h b/src/base/rs_dialogfactoryadapter.h
index 49d3cb64182d82372ef6b7835ea9a410814dbda2..8ddb17fd63e7509af14134f8bfb0cf9771ecba83 100644 (file)
--- a/src/base/rs_dialogfactoryadapter.h
+++ b/src/base/rs_dialogfactoryadapter.h
@@ -12,14 +12,14 @@ class RS_LayerList;
  * Adapter for dialog factory interface.
  * Used when no factory object was set.
  */
-class RS_DialogFactoryAdapter : public RS_DialogFactoryInterface
+class RS_DialogFactoryAdapter: public RS_DialogFactoryInterface
 {
        public:
                RS_DialogFactoryAdapter() {}
                virtual ~RS_DialogFactoryAdapter() {}
                virtual void requestPreviousMenu() {}
                virtual void requestWarningDialog(const QString &) {}
-               virtual RS_GraphicView * requestNewDocument(const QString & = QString::null,
+               virtual GraphicView * requestNewDocument(const QString & = QString::null,
                        RS_Document * = NULL) { return NULL; }
                virtual void requestSimulationControls() {}
                virtual RS_Layer * requestNewLayerDialog(RS_LayerList * = NULL) { return NULL; }
@@ -31,7 +31,7 @@ class RS_DialogFactoryAdapter : public RS_DialogFactoryInterface
                virtual void requestEditBlockWindow(RS_BlockList *) {}
                virtual void closeEditBlockWindow(RS_Block *) {}
                virtual QString requestImageOpenDialog() { return ""; }
-               virtual void requestOptions(RS_ActionInterface *, bool, bool = false) {}
+               virtual void requestOptions(ActionInterface *, bool, bool = false) {}
                virtual void requestSnapDistOptions(double &, bool) {}
                virtual bool requestAttributesDialog(RS_AttributesData &, RS_LayerList &) { return false; }
                virtual bool requestMoveDialog(RS_MoveData &) { return false; }
@@ -41,14 +41,14 @@ class RS_DialogFactoryAdapter : public RS_DialogFactoryInterface
                virtual bool requestMoveRotateDialog(RS_MoveRotateData &) { return false; }
                virtual bool requestRotate2Dialog(RS_Rotate2Data &) { return false; }
                virtual void requestToolBar(RS2::ToolBarId) {}
-               virtual void requestToolBarSelect(RS_ActionInterface *, RS2::ActionType) {}
+               virtual void requestToolBarSelect(ActionInterface *, RS2::ActionType) {}
                virtual bool requestModifyEntityDialog(RS_Entity *) { return false; }
                virtual bool requestTextDialog(RS_Text *) { return false; }
                virtual bool requestHatchDialog(RS_Hatch *) { return false; }
                virtual void requestOptionsGeneralDialog() {}
-               virtual void requestOptionsDrawingDialog(RS_Graphic &) {}
+               virtual void requestOptionsDrawingDialog(Drawing &) {}
 #ifdef RS_CAM
-               virtual bool requestCamOptionsDialog(RS_Graphic& ) { printf("fake\n"); return false; }
+               virtual bool requestCamOptionsDialog(Drawing& ) { printf("fake\n"); return false; }
 #endif
                virtual void updateCoordinateWidget(const Vector &, const Vector &, bool = false) {}
                virtual void updateMouseWidget(const QString &, const QString &) {}