X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fapplicationwindow.h;h=6423c2830985917481fba853f5659d84cabc9aa9;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=3e2a1347203c37929c42ef0cc9e269177a2093f9;hpb=bd2b29c8735d83ab48df13c3efee53f63570473e;p=architektonas

diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h
index 3e2a134..6423c28 100644
--- a/src/mainapp/applicationwindow.h
+++ b/src/mainapp/applicationwindow.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#include "rs_document.h"
+#include "document.h"
 #include "qc_dialogfactory.h"
 #include "mdiwindow.h"
 #include "actionhandler.h"
@@ -15,13 +15,13 @@
 #include "commandwidget.h"
 #include "librarywidget.h"
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 #include "qs_scripter.h"
 #include <qsproject.h>
 #endif
 
 #ifdef RS_CAM
-#include "rs_simulationcontrols.h"
+#include "simulationcontrols.h"
 #endif
 
 class RecentFiles;
@@ -70,10 +70,10 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		void slotTileHorizontal();
 		void slotTileVertical();
 
-		void slotPenChanged(RS_Pen p);
+		void slotPenChanged(Pen p);
 
 		/** generates a new document for a graphic. */
-		MDIWindow * slotFileNew(RS_Document * doc = NULL);
+		MDIWindow * slotFileNew(Document * doc = NULL);
 		/** opens a document */
 		void slotFileOpen();
 		/**
@@ -142,7 +142,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		void slotHelpManual();
 
 		/** dumps entities to file */
-		void slotTestDumpEntities(RS_EntityContainer * d = NULL);
+		void slotTestDumpEntities(EntityContainer * d = NULL);
 		/** dumps undo info to stdout */
 		void slotTestDumpUndo();
 		/** updates all inserts */
@@ -179,8 +179,8 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		QMdiArea * getWorkspace();
 		MDIWindow * getMDIWindow();
 		virtual GraphicView * getGraphicView();
-		virtual RS_Document * getDocument();
-		virtual void createNewDocument(const QString & fileName = QString::null, RS_Document * doc = NULL);
+		virtual Document * getDocument();
+		virtual void createNewDocument(const QString & fileName = QString::null, Document * doc = NULL);
 		virtual QMainWindow * GetMainWindow();
 		virtual ActionHandler * getActionHandler();
 		virtual void showSimulationControls();
@@ -188,7 +188,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		/**
 		* @return Pointer to the qsa object.
 		*/
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 		QSProject * getQSAProject();
 #endif
 
@@ -256,7 +256,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		/** Action handler. */
 		ActionHandler * actionHandler;
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 		/** Scripting interface. */
 		QS_Scripter * scripter;
 #endif