X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fmdiwindow.h;h=4b6943b82932f301e7fdf4b1b87d3f779819607e;hb=bfd926cd5fd98e95b8b172fabd5340c9b1957e01;hp=fdd821514dc42896423d91afc98c0ee8b39712de;hpb=52b41ea9bcb03acb96393b36fe29f27ca0163565;p=architektonas

diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h
index fdd8215..4b6943b 100644
--- a/src/mainapp/mdiwindow.h
+++ b/src/mainapp/mdiwindow.h
@@ -2,12 +2,11 @@
 #define QC_MDIWINDOW_H
 
 #include <QtGui>
-//#include "qc_graphicview.h"
-#include "qg_layerwidget.h"
-#include "qg_pentoolbar.h"
-#include "rs_document.h"
+#include "document.h"
+#include "layerwidget.h"
+#include "pentoolbar.h"
 
-class RS_EventHandler;
+class EventHandler;
 class QG_GraphicView;
 
 /**
@@ -20,16 +19,15 @@ class MDIWindow: public QMdiSubWindow
 	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 initDoc(Document * doc = NULL);
 		void initView();
 
 	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);
@@ -38,20 +36,16 @@ class MDIWindow: public QMdiSubWindow
 		void slotFilePrint();
 
 	public:
-//		QC_GraphicView * getGraphicView();
 		QG_GraphicView * getGraphicView();
-		RS_Document * getDocument();
+		Document * getDocument();
 		Drawing * getGraphic();
-		RS_EventHandler * getEventHandler();
-
+		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);
 
 		friend std::ostream & operator<<(std::ostream & os, MDIWindow & w);
@@ -69,10 +63,9 @@ class MDIWindow: public QMdiSubWindow
 		static int idCounter;
 		/** Graphic view */
 //let's see if we can get rid of this...
-//		QC_GraphicView * graphicView;
 		QG_GraphicView * graphicView;
 		/** Document */
-		RS_Document * document;
+		Document * document;
 		/** Does the window own the document? */
 		bool owner;
 		/**