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

diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h
index 79ca2c1..3e2a134 100644
--- a/src/mainapp/applicationwindow.h
+++ b/src/mainapp/applicationwindow.h
@@ -5,14 +5,12 @@
 
 #include "rs_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_recentfiles.h"
-#include "qg_pentoolbar.h"
+#include "pentoolbar.h"
 #include "cadtoolbar.h"
 #include "commandwidget.h"
 #include "librarywidget.h"
@@ -26,10 +24,12 @@
 #include "rs_simulationcontrols.h"
 #endif
 
+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
@@ -46,7 +46,6 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		void initStatusBar();
 		void initSettings();
 		void storeSettings();
-		void updateRecentFilesMenu();
 		void initMDI();
 		void initView();
 		bool queryExit(bool force);
@@ -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);
@@ -177,16 +178,13 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		static ApplicationWindow * getAppWindow();
 		QMdiArea * getWorkspace();
 		MDIWindow * getMDIWindow();
-		virtual RS_GraphicView * getGraphicView();
+		virtual GraphicView * getGraphicView();
 		virtual RS_Document * getDocument();
 		virtual void createNewDocument(const QString & fileName = QString::null, RS_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.
 		*/
@@ -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
@@ -253,10 +251,10 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
 		QToolBar * optionWidget;
 
 		/** Recent files list */
-		QG_RecentFiles * recentFiles;
+		RecentFiles * recentFiles;
 
 		/** Action handler. */
-		QG_ActionHandler * actionHandler;
+		ActionHandler * actionHandler;
 
 #ifdef RS_SCRIPTING
 		/** Scripting interface. */
@@ -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;