Fixed problem with MDI activation.

[architektonas] / src / mainapp / mdiwindow.h

diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h
index 31c03e4aa606f800d2a75022bfb558012fb2aa4d..e532cc4474642ca088cb49dfc9679623484eaa06 100644 (file)
--- a/src/mainapp/mdiwindow.h
+++ b/src/mainapp/mdiwindow.h
@@ -1,10 +1,11 @@
-#ifndef QC_MDIWINDOW_H
-#define QC_MDIWINDOW_H
+#ifndef __MDIWINDOW_H__
+#define __MDIWINDOW_H__
 
 #include <QtGui>
 #include "document.h"
 #include "layerwidget.h"
 #include "pentoolbar.h"
+//#include "qg_graphicview.h"
 
 class EventHandler;
 class QG_GraphicView;
@@ -15,6 +16,7 @@ class QG_GraphicView;
  * @author Andrew Mustun
  */
 class MDIWindow: public QMdiSubWindow
+//class MDIWindow: public QG_GraphicView
 {
        Q_OBJECT
 
@@ -24,7 +26,6 @@ class MDIWindow: public QMdiSubWindow
                ~MDIWindow();
 
                void initDoc(Document * doc = NULL);
-               void initView();
 
        public slots:
                void slotPenChanged(Pen p);
@@ -32,7 +33,6 @@ class MDIWindow: public QMdiSubWindow
                bool slotFileOpen(const QString & fileName, RS2::FormatType type);
                bool slotFileSave(bool & cancelled);
                bool slotFileSaveAs(bool & cancelled);
-//WAS:         bool slotFileClose(bool force);
                bool slotFileClose(void);
                void slotFilePrint(void);
 
@@ -46,9 +46,7 @@ class MDIWindow: public QMdiSubWindow
                MDIWindow * getPrintPreview();
                void setParentWindow(MDIWindow * p);
                int getId();
-//WAS:         bool closeMDI(bool force, bool ask = true);
                bool CloseMDI(void);
-//             void setForceClosing(bool on);
 
                friend std::ostream & operator<<(std::ostream & os, MDIWindow & w);
 
@@ -70,19 +68,13 @@ class MDIWindow: public QMdiSubWindow
                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__