Mac OS changes and switched to c++11.

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

diff --git a/src/plugins/SdiWindow/sdiwindow.h b/src/plugins/SdiWindow/sdiwindow.h
index 4c46eea83617e083813905eae322f5e80cbcbe63..40c72111d003ab4d3ab1caf72a1c2f1eccd04684 100644 (file)
--- a/src/plugins/SdiWindow/sdiwindow.h
+++ b/src/plugins/SdiWindow/sdiwindow.h
@@ -3,7 +3,7 @@
  * @brief SdiWindow module's implementation
  * @author Enar Vaikene
  *
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
@@ -31,6 +31,7 @@
 #include <QList>
 #include <QVector>
 #include <QHash>
+#include <QScopedPointer>
 
 class QVBoxLayout;
 
@@ -48,7 +49,7 @@ class MainWindow : public QWidget, public iSdiWindow
 
 public:
 
-    MainWindow(QWidget * parent = 0, Qt::WindowFlags flags = 0);
+    MainWindow(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
 
     virtual ~MainWindow();
 
@@ -115,7 +116,7 @@ private slots:
 
     /// Panel destroyed signal. We need to remove the panel from all the
     /// lists.
-    void panelDestroyed(QObject * obj = 0);
+    void panelDestroyed(QObject * obj = nullptr);
 
 };
 
@@ -137,13 +138,13 @@ public:
 
     virtual void done();
 
-    virtual bool isReady() const { return mWindow != 0 && mWindow->isReady(); }
+    virtual bool isReady() const { return mWindow != nullptr && mWindow->isReady(); }
 
 
 private:
 
     /// iSdiWindow interface implementation
-    MainWindow * mWindow;
+    QScopedPointer<MainWindow> mWindow;
 };
 
 } // namespace eVaf::SdiWindow::Internal