X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_dialogfactoryinterface.h;h=9df40defc0e17d344b722fc2bd04bc113f7283b6;hb=d774c2655ba2c3657a565f325411144452392277;hp=70215068dac3abc48bd76d4b8fe3d297fe822d1f;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/base/rs_dialogfactoryinterface.h b/src/base/rs_dialogfactoryinterface.h
index 7021506..9df40de 100644
--- a/src/base/rs_dialogfactoryinterface.h
+++ b/src/base/rs_dialogfactoryinterface.h
@@ -4,7 +4,7 @@
 #include <QtCore>
 #include "rs.h"
 
-class RS_ActionInterface;
+class ActionInterface;
 class RS_ArcData;
 class RS_AttributesData;
 class RS_BevelData;
@@ -15,10 +15,10 @@ class RS_CircleData;
 class RS_DimLinearData;
 class RS_DimensionData;
 class RS_Document;
+class Drawing;
 class RS_Entity;
 class RS_EventHandler;
-class RS_Graphic;
-class RS_GraphicView;
+class GraphicView;
 class RS_Grid;
 class RS_Hatch;
 class RS_Insert;
@@ -63,7 +63,7 @@ public:
 	 * window for the given document or for a new document if no document
 	 * is given.
 	 */
-    virtual RS_GraphicView * requestNewDocument(const QString & fileName = QString::null,
+    virtual GraphicView * requestNewDocument(const QString & fileName = QString::null,
 		RS_Document * doc = NULL) = 0;
 
 	/**
@@ -195,7 +195,7 @@ public:
 	 * @param update true: widget gets data from the action, false:
 	 *   widget gets data from config file.
      */
-    virtual void requestOptions(RS_ActionInterface * action, bool on, bool update = false) = 0;
+    virtual void requestOptions(ActionInterface * action, bool on, bool update = false) = 0;
 
     /**
      * This virtual method must be overwritten and must present
@@ -286,7 +286,7 @@ public:
      *
      * @param nextAction ID of next action to create after selecting was done.
      */
-    virtual void requestToolBarSelect(RS_ActionInterface * selectAction, RS2::ActionType nextAction) = 0;
+    virtual void requestToolBarSelect(ActionInterface * selectAction, RS2::ActionType nextAction) = 0;
 
     /**
      * This virtual method must be overwritten and must present
@@ -324,10 +324,10 @@ public:
 	 *
 	 * @param graphic Graphic document.
      */
-    virtual void requestOptionsDrawingDialog(RS_Graphic & graphic) = 0;
+    virtual void requestOptionsDrawingDialog(Drawing & graphic) = 0;
 
 #ifdef RS_CAM
-    virtual bool requestCamOptionsDialog(RS_Graphic & graphic) = 0;
+    virtual bool requestCamOptionsDialog(Drawing & graphic) = 0;
 #endif
 
     /**