Make Qt exception safer.

Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.

Rev-By: Harald Fernengel
Rev-By: Ralf Engels

4 files changed, 4 insertions, 9 deletions

diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
index b1c056e..86880f3 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
@@ -146,14 +146,12 @@ QString BrushManagerProxyPrivate::uniqueBrushFileName(const QString &brushName)
 
 
 BrushManagerProxy::BrushManagerProxy(QDesignerFormEditorInterface *core, QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new BrushManagerProxyPrivate(this, core))
 {
-    d_ptr = new BrushManagerProxyPrivate(this, core);
 }
 
 BrushManagerProxy::~BrushManagerProxy()
 {
-    delete d_ptr;
 }
 
 void BrushManagerProxy::setBrushManager(QtBrushManager *manager)
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h
index cbe50ae..43bcf29 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.h
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h
@@ -63,7 +63,7 @@ public:
     void setBrushManager(QtBrushManager *manager);
 
 private:
-    BrushManagerProxyPrivate *d_ptr;
+    QScopedPointer<BrushManagerProxyPrivate> d_ptr;
     Q_DECLARE_PRIVATE(BrushManagerProxy)
     Q_DISABLE_COPY(BrushManagerProxy)
     Q_PRIVATE_SLOT(d_func(), void brushAdded(const QString &, const QBrush &))
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.cpp b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
index c28c6b9..3ac9851 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.cpp
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
@@ -57,16 +57,13 @@ public:
 };
 
 QtBrushManager::QtBrushManager(QObject *parent)
-    : QDesignerBrushManagerInterface(parent)
+    : QDesignerBrushManagerInterface(parent), d_ptr(new QtBrushManagerPrivate)
 {
-    d_ptr = new QtBrushManagerPrivate;
     d_ptr->q_ptr = this;
-
 }
 
 QtBrushManager::~QtBrushManager()
 {
-    delete d_ptr;
 }
 
 QBrush QtBrushManager::brush(const QString &name) const
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index f8f1b8a..0855175 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -77,7 +77,7 @@ signals:
     void currentBrushChanged(const QString &name, const QBrush &brush);
 
 private:
-    QtBrushManagerPrivate *d_ptr;
+    QScopedPointer<QtBrushManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtBrushManager)
     Q_DISABLE_COPY(QtBrushManager)
 };