Phase two of adding polyline functionality...

[architektonas] / src / mainapp / applicationwindow.h

diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h
index bb1b0f690a0bddfcebf1d79c2d09f12b3e805e90..6423c2830985917481fba853f5659d84cabc9aa9 100644 (file)
--- a/src/mainapp/applicationwindow.h
+++ b/src/mainapp/applicationwindow.h
@@ -3,26 +3,25 @@
 
 #include <QtGui>
 
-#include "rs_document.h"
+#include "document.h"
 #include "qc_dialogfactory.h"
-#include "qc_graphicview.h"
 #include "mdiwindow.h"
-#include "qg_actionhandler.h"
-#include "qg_blockwidget.h"
-#include "qg_layerwidget.h"
+#include "actionhandler.h"
+#include "blockwidget.h"
+#include "layerwidget.h"
 #include "qg_mainwindowinterface.h"
-#include "qg_pentoolbar.h"
+#include "pentoolbar.h"
 #include "cadtoolbar.h"
 #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;
@@ -30,7 +29,7 @@ class RecentFiles;
 /**
  * Main application window. Hold together document, view and controls.
  *
- * @author James L. Hammons
+ * @author James Hammons
  * @author Andrew Mustun
  */
 class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
@@ -71,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();
                /**
@@ -105,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);
@@ -141,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 */
@@ -178,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 QG_ActionHandler * getActionHandler();
+               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
 
@@ -217,9 +215,9 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                QC_DialogFactory * dialogFactory;
 
                /** Layer list widget */
-               QG_LayerWidget * layerWidget;
+               LayerWidget * layerWidget;
                /** Block list widget */
-               QG_BlockWidget * blockWidget;
+               BlockWidget * blockWidget;
                /** Library browser widget */
                LibraryWidget * libraryWidget;
 #ifdef RS_CAM
@@ -256,9 +254,9 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                RecentFiles * recentFiles;
 
                /** Action handler. */
-               QG_ActionHandler * actionHandler;
+               ActionHandler * actionHandler;
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
                /** Scripting interface. */
                QS_Scripter * scripter;
 #endif
@@ -275,7 +273,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                QToolBar * zoomToolBar;
 
                // Toolbar for selecting the current pen
-               QG_PenToolBar * penToolBar;
+               PenToolBar * penToolBar;
                // Toolbar for CAD tools
                CadToolBar * cadToolBar;