X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fmdiwindow.h;h=e532cc4474642ca088cb49dfc9679623484eaa06;hb=43c13b052d069ba435277d93867380d00c04931f;hp=0f5ddadc35b5745908bf100b9f78a4b118539278;hpb=3b479913b79032e514ce8c74ba915c6c91ab0f15;p=architektonas

diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h
index 0f5ddad..e532cc4 100644
--- a/src/mainapp/mdiwindow.h
+++ b/src/mainapp/mdiwindow.h
@@ -1,12 +1,14 @@
-#ifndef QC_MDIWINDOW_H
-#define QC_MDIWINDOW_H
+#ifndef __MDIWINDOW_H__
+#define __MDIWINDOW_H__
 
 #include <QtGui>
-#include "qc_graphicview.h"
-#include "qg_layerwidget.h"
-#include "qg_recentfiles.h"
-#include "qg_pentoolbar.h"
-#include "rs_document.h"
+#include "document.h"
+#include "layerwidget.h"
+#include "pentoolbar.h"
+//#include "qg_graphicview.h"
+
+class EventHandler;
+class QG_GraphicView;
 
 /**
  * MDI document window. Contains a document and a view (window).
@@ -14,42 +16,37 @@
  * @author Andrew Mustun
  */
 class MDIWindow: public QMdiSubWindow
+//class MDIWindow: public QG_GraphicView
 {
 	Q_OBJECT
 
 	public:
-		MDIWindow(RS_Document * doc, QWidget * parent, const char * name = NULL,
-//			Qt::WindowFlags wflags = Qt::WDestructiveClose);
+		MDIWindow(Document * doc, QWidget * parent, const char * name = NULL,
 			Qt::WindowFlags wflags = Qt::SubWindow);
 		~MDIWindow();
 
-		void initDoc(RS_Document * doc = NULL);
-		void initView();
+		void initDoc(Document * doc = NULL);
 
 	public slots:
-		void slotPenChanged(RS_Pen p);
+		void slotPenChanged(Pen p);
 		void slotFileNew();
 		bool slotFileOpen(const QString & fileName, RS2::FormatType type);
 		bool slotFileSave(bool & cancelled);
 		bool slotFileSaveAs(bool & cancelled);
-		bool slotFileClose(bool force);
-		void slotFilePrint();
+		bool slotFileClose(void);
+		void slotFilePrint(void);
 
 	public:
-		QC_GraphicView * getGraphicView();
-		RS_Document * getDocument();
-		Drawing * getGraphic();
-		RS_EventHandler * getEventHandler();
-
+		QG_GraphicView * getGraphicView();
+		Document * getDocument();
+		Drawing * GetDrawing();
+		EventHandler * getEventHandler();
 		void addChildWindow(MDIWindow * w);
 		void removeChildWindow(MDIWindow * w);
 		MDIWindow * getPrintPreview();
 		void setParentWindow(MDIWindow * p);
 		int getId();
-
-		bool closeMDI(bool force, bool ask = true);
-
-		void setForceClosing(bool on);
+		bool CloseMDI(void);
 
 		friend std::ostream & operator<<(std::ostream & os, MDIWindow & w);
 
@@ -65,24 +62,19 @@ class MDIWindow: public QMdiSubWindow
 		/** ID counter (class variable) */
 		static int idCounter;
 		/** Graphic view */
-		QC_GraphicView * graphicView;
+//let's see if we can get rid of this...
+		QG_GraphicView * graphicView;
 		/** Document */
-		RS_Document * document;
+		Document * document;
 		/** Does the window own the document? */
 		bool owner;
-		/**
-		* List of known child windows that show blocks of the same drawing.
-		*/
+		/** List of known child windows that show blocks of the same drawing. */
 		QList<MDIWindow *> childWindows;
 		/**
 		* Pointer to parent window which needs to know if this window
 		* is closed or NULL.
 		*/
 		MDIWindow * parentWindow;
-		/**
-		* If flag is set, the user will not be asked about closing this file.
-		*/
-		bool forceClosing;
 };
 
-#endif
+#endif	// __MDIWINDOW_H__