Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / dialogfactoryadapter.h

diff --git a/src/base/dialogfactoryadapter.h b/src/base/dialogfactoryadapter.h
index d36e450d0ee604378966db5f1a5a1e3205e7efc5..de34601eabdc15147be3f0a31243f4f4fa10e100 100644 (file)
--- a/src/base/dialogfactoryadapter.h
+++ b/src/base/dialogfactoryadapter.h
@@ -5,46 +5,46 @@
 #include "block.h"
 #include "layer.h"
 
-class RS_BlockList;
-class RS_LayerList;
+class BlockList;
+class LayerList;
 
 /**
  * Adapter for dialog factory interface.
  * Used when no factory object was set.
  */
-class RS_DialogFactoryAdapter: public RS_DialogFactoryInterface
+class DialogFactoryAdapter: public DialogFactoryInterface
 {
        public:
-               RS_DialogFactoryAdapter() {}
-               virtual ~RS_DialogFactoryAdapter() {}
+               DialogFactoryAdapter() {}
+               virtual ~DialogFactoryAdapter() {}
                virtual void requestPreviousMenu() {}
                virtual void requestWarningDialog(const QString &) {}
                virtual GraphicView * requestNewDocument(const QString & = QString::null,
-                       RS_Document * = NULL) { return NULL; }
+                       Document * = NULL) { return NULL; }
                virtual void requestSimulationControls() {}
-               virtual RS_Layer * requestNewLayerDialog(RS_LayerList * = NULL) { return NULL; }
-               virtual RS_Layer * requestLayerRemovalDialog(RS_LayerList * = NULL) { return NULL; }
-               virtual RS_Layer * requestEditLayerDialog(RS_LayerList * = NULL) { return NULL; }
-               virtual RS_BlockData requestNewBlockDialog(RS_BlockList *) { return RS_BlockData(); }
-               virtual RS_Block * requestBlockRemovalDialog(RS_BlockList *) { return NULL; }
-               virtual RS_BlockData requestBlockAttributesDialog(RS_BlockList *) { return RS_BlockData(); }
-               virtual void requestEditBlockWindow(RS_BlockList *) {}
-               virtual void closeEditBlockWindow(RS_Block *) {}
+               virtual Layer * requestNewLayerDialog(LayerList * = NULL) { return NULL; }
+               virtual Layer * requestLayerRemovalDialog(LayerList * = NULL) { return NULL; }
+               virtual Layer * requestEditLayerDialog(LayerList * = NULL) { return NULL; }
+               virtual BlockData requestNewBlockDialog(BlockList *) { return BlockData(); }
+               virtual Block * requestBlockRemovalDialog(BlockList *) { return NULL; }
+               virtual BlockData requestBlockAttributesDialog(BlockList *) { return BlockData(); }
+               virtual void requestEditBlockWindow(BlockList *) {}
+               virtual void closeEditBlockWindow(Block *) {}
                virtual QString requestImageOpenDialog() { return ""; }
                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; }
-               virtual bool requestRotateDialog(RS_RotateData &) { return false; }
-               virtual bool requestScaleDialog(RS_ScaleData &) { return false; }
-               virtual bool requestMirrorDialog(RS_MirrorData &) { return false; }
-               virtual bool requestMoveRotateDialog(RS_MoveRotateData &) { return false; }
-               virtual bool requestRotate2Dialog(RS_Rotate2Data &) { return false; }
+               virtual bool requestAttributesDialog(AttributesData &, LayerList &) { return false; }
+               virtual bool requestMoveDialog(MoveData &) { return false; }
+               virtual bool requestRotateDialog(RotateData &) { return false; }
+               virtual bool requestScaleDialog(ScaleData &) { return false; }
+               virtual bool requestMirrorDialog(MirrorData &) { return false; }
+               virtual bool requestMoveRotateDialog(MoveRotateData &) { return false; }
+               virtual bool requestRotate2Dialog(Rotate2Data &) { return false; }
                virtual void requestToolBar(RS2::ToolBarId) {}
                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 bool requestModifyEntityDialog(Entity *) { return false; }
+               virtual bool requestTextDialog(Text *) { return false; }
+               virtual bool requestHatchDialog(Hatch *) { return false; }
                virtual void requestOptionsGeneralDialog() {}
                virtual void requestOptionsDrawingDialog(Drawing &) {}
 #ifdef RS_CAM