Changed the SdiWindow::iSdiWindow interface to be not derived from QObject.

[evaf] / src / plugins / SdiWindow / sdiwindow.h

diff --git a/src/plugins/SdiWindow/sdiwindow.h b/src/plugins/SdiWindow/sdiwindow.h
index d886cca5d842914472e0e92b939abb7e7e04e78c..a73f2eec3d85a9b52dc09ed063c87664e3f5fedf 100644 (file)
--- a/src/plugins/SdiWindow/sdiwindow.h
+++ b/src/plugins/SdiWindow/sdiwindow.h
@@ -27,17 +27,22 @@
 #include <QObject>
 #include <QString>
 #include <QWidget>
+#include <QList>
+#include <QWeakPointer>
+
+class QVBoxLayout;
 
 namespace eVaf {
 namespace SdiWindow {
 namespace Internal {
 
 /**
- * Main window widget
+ * Main window widget implementing the iSdiWindow interface
  */
-class MainWindow : public QWidget
+class MainWindow : public QWidget, public iSdiWindow
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::SdiWindow::iSdiWindow)
 
 public:
 
@@ -45,9 +50,15 @@ public:
 
     virtual ~MainWindow();
 
-    bool init();
+    virtual bool init(QString const & args);
+
+    virtual void done();
+
+    virtual bool isReady() { return mReady; }
+
+    virtual void addWidget(QWidget * widget);
 
-    void done();
+    virtual void addLayout(QLayout * layout);
 
 
 private: // Methods
@@ -57,28 +68,6 @@ private: // Methods
     void saveSettings();
 
     void restoreSettings();
-};
-
-/**
- * iSdiWindow interface implementation
- */
-class SdiWindowImpl : public iSdiWindow
-{
-    Q_OBJECT
-
-public:
-
-    SdiWindowImpl();
-
-    virtual ~SdiWindowImpl();
-
-    bool init(const QString & args);
-
-    void done();
-
-    bool isReady() const { return mReady; }
-
-    virtual QWidget * widget() const { return wWindow; }
 
 
 private: // Members
@@ -86,8 +75,12 @@ private: // Members
     /// Ready flag
     bool mReady;
 
-    /// The main window widget
-    MainWindow * wWindow;
+    /// The layout of the window
+    QVBoxLayout * mLayout;
+
+    /// Widgets and layouts added to the main window
+    QList<QWeakPointer<QObject> > mItemsAdded;
+
 };
 
 /**
@@ -113,7 +106,7 @@ public:
 private:
 
     /// iSdiWindow interface implementation
-    SdiWindowImpl * mWindow;
+    MainWindow * mWindow;
 };
 
 } // namespace eVaf::SdiWindow::Internal