In the middle of removing Snapper class/fixing snapper rendering...

[architektonas] / src / mainapp / mdiwindow.h

diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h
index 0f5ddadc35b5745908bf100b9f78a4b118539278..4b6943b82932f301e7fdf4b1b87d3f779819607e 100644 (file)
--- a/src/mainapp/mdiwindow.h
+++ b/src/mainapp/mdiwindow.h
@@ -2,11 +2,12 @@
 #define QC_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"
+
+class EventHandler;
+class QG_GraphicView;
 
 /**
  * MDI document window. Contains a document and a view (window).
@@ -18,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);
@@ -36,19 +36,16 @@ class MDIWindow: public QMdiSubWindow
                void slotFilePrint();
 
        public:
-               QC_GraphicView * getGraphicView();
-               RS_Document * getDocument();
+               QG_GraphicView * getGraphicView();
+               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);
@@ -65,9 +62,10 @@ 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;
                /**