Phase two of adding polyline functionality...

[architektonas] / src / mainapp / applicationwindow.h

diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h
index 588de6d67a01b9ff162214a799534dad29ebf605..6423c2830985917481fba853f5659d84cabc9aa9 100644 (file)
--- 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();
                /**
@@ -104,8 +104,10 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                /** exits the application */
                void slotFileQuit();
 
+#if 0
                /** forces to quit QCad (demo) */
                void slotFileDemoQuit();
+#endif
 
                /** toggle the grid */
                void slotViewGrid(bool toggle);
@@ -140,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 */
@@ -177,19 +179,16 @@ 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();
 
-               //virtual QToolBar* createToolBar(const QString& name);
-               //virtual void addToolBarButton(QToolBar* tb);
-
                /**
                * @return Pointer to the qsa object.
                */
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
                QSProject * getQSAProject();
 #endif
 
@@ -257,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