X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.h;h=4203216f31ee4200c9a0fd5c03e3f9fdc82f3c55;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=c2d08c64d20092be9594ead5c50192201e81bdfe;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h
index c2d08c6..4203216 100644
--- a/src/widgets/qg_dialogfactory.h
+++ b/src/widgets/qg_dialogfactory.h
@@ -2,28 +2,28 @@
 #define QG_DIALOGFACTORY_H
 
 #include <QtGui>
-#include "rs_dialogfactoryinterface.h"
+#include "dialogfactoryinterface.h"
 #include "vector.h"
-#include "rs_debug.h"
+#include "debug.h"
 
 class ActionInterface;
 class CadToolBar;
 class CommandWidget;
 class CoordinateWidget;
-class RS_Document;
+class 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)
+#define QG_DIALOGFACTORY (DialogFactory::instance()->getFactoryObject()->isAdapter() == false ? ((QG_DialogFactory *)DialogFactory::instance()->getFactoryObject()) : NULL)
 
 // !A_WIDGET
 /**
  * This is the Qt implementation of a widget which can create and
  * show dialogs.
  */
-class QG_DialogFactory: public RS_DialogFactoryInterface
+class QG_DialogFactory: public DialogFactoryInterface
 {
 	public:
 		QG_DialogFactory(QWidget * parent, QToolBar * ow);
@@ -44,18 +44,18 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		virtual void requestWarningDialog(const QString& warning);
 
 		virtual GraphicView * requestNewDocument(const QString & fileName = QString::null,
-			RS_Document * doc = NULL);
+			Document * doc = NULL);
 		virtual void requestSimulationControls();
 
-		virtual RS_Layer * requestNewLayerDialog(RS_LayerList * layerList = NULL);
-		virtual RS_Layer * requestLayerRemovalDialog(RS_LayerList * layerList = NULL);
-		virtual RS_Layer * requestEditLayerDialog(RS_LayerList * layerList = NULL);
+		virtual Layer * requestNewLayerDialog(LayerList * layerList = NULL);
+		virtual Layer * requestLayerRemovalDialog(LayerList * layerList = NULL);
+		virtual Layer * requestEditLayerDialog(LayerList * layerList = NULL);
 
-		virtual RS_BlockData requestNewBlockDialog(RS_BlockList * blockList);
-		virtual RS_Block * requestBlockRemovalDialog(RS_BlockList * blockList);
-		virtual RS_BlockData requestBlockAttributesDialog(RS_BlockList * blockList);
-		virtual void requestEditBlockWindow(RS_BlockList * /*blockList*/);
-		virtual void closeEditBlockWindow(RS_Block * /*blockList*/);
+		virtual BlockData requestNewBlockDialog(BlockList * blockList);
+		virtual Block * requestBlockRemovalDialog(BlockList * blockList);
+		virtual BlockData requestBlockAttributesDialog(BlockList * blockList);
+		virtual void requestEditBlockWindow(BlockList * /*blockList*/);
+		virtual void closeEditBlockWindow(Block * /*blockList*/);
 		//virtual QString requestFileSaveAsDialog();
 		//virtual QString requestFileOpenDialog();
 
@@ -95,17 +95,17 @@ class QG_DialogFactory: public RS_DialogFactoryInterface
 		virtual void requestToolBar(RS2::ToolBarId id);
 		virtual void requestToolBarSelect(ActionInterface * selectAction, RS2::ActionType nextAction);
 
-		virtual bool requestAttributesDialog(RS_AttributesData & data, RS_LayerList & layerList);
-		virtual bool requestMoveDialog(RS_MoveData & data);
-		virtual bool requestRotateDialog(RS_RotateData & data);
-		virtual bool requestScaleDialog(RS_ScaleData & data);
-		virtual bool requestMirrorDialog(RS_MirrorData & data);
-		virtual bool requestMoveRotateDialog(RS_MoveRotateData & data);
-		virtual bool requestRotate2Dialog(RS_Rotate2Data & data);
-
-		virtual bool requestModifyEntityDialog(RS_Entity * entity);
-		virtual bool requestTextDialog(RS_Text * text);
-		virtual bool requestHatchDialog(RS_Hatch * hatch);
+		virtual bool requestAttributesDialog(AttributesData & data, LayerList & layerList);
+		virtual bool requestMoveDialog(MoveData & data);
+		virtual bool requestRotateDialog(RotateData & data);
+		virtual bool requestScaleDialog(ScaleData & data);
+		virtual bool requestMirrorDialog(MirrorData & data);
+		virtual bool requestMoveRotateDialog(MoveRotateData & data);
+		virtual bool requestRotate2Dialog(Rotate2Data & data);
+
+		virtual bool requestModifyEntityDialog(Entity * entity);
+		virtual bool requestTextDialog(Text * text);
+		virtual bool requestHatchDialog(Hatch * hatch);
 
 #ifdef RS_CAM
 		virtual bool requestCamOptionsDialog(Drawing & graphic);