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

8 files changed, 11 insertions, 21 deletions

diff --git a/tools/designer/src/lib/shared/iconselector.cpp b/tools/designer/src/lib/shared/iconselector.cpp
index 02a3dee..302a077 100644
--- a/tools/designer/src/lib/shared/iconselector.cpp
+++ b/tools/designer/src/lib/shared/iconselector.cpp
@@ -157,7 +157,6 @@ LanguageResourceDialog::LanguageResourceDialog(QDesignerResourceBrowserInterface
 
 LanguageResourceDialog::~LanguageResourceDialog()
 {
-    delete d_ptr;
 }
 
 void LanguageResourceDialog::setCurrentPath(const QString &filePath)
@@ -427,9 +426,8 @@ void IconSelectorPrivate::slotResetAllActivated()
 
 // ------------- IconSelector
 IconSelector::IconSelector(QWidget *parent) :
-    QWidget(parent)
+    QWidget(parent), d_ptr(new IconSelectorPrivate())
 {
-    d_ptr = new IconSelectorPrivate();
     d_ptr->q_ptr = this;
 
     d_ptr->m_stateComboBox = new QComboBox(this);
@@ -500,7 +498,6 @@ IconSelector::IconSelector(QWidget *parent) :
 
 IconSelector::~IconSelector()
 {
-    delete d_ptr;
 }
 
 void IconSelector::setIcon(const PropertySheetIconValue &icon)
diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h
index 6b70cd2..de4c54f 100644
--- a/tools/designer/src/lib/shared/iconselector_p.h
+++ b/tools/designer/src/lib/shared/iconselector_p.h
@@ -87,7 +87,7 @@ public:
     QString currentPath() const;
 
 private:
-    class LanguageResourceDialogPrivate *d_ptr;
+    QScopedPointer<class LanguageResourceDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(LanguageResourceDialog)
     Q_DISABLE_COPY(LanguageResourceDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAccepted())
@@ -120,7 +120,7 @@ public:
 signals:
     void iconChanged(const PropertySheetIconValue &icon);
 private:
-    class IconSelectorPrivate *d_ptr;
+    QScopedPointer<class IconSelectorPrivate> d_ptr;
     Q_DECLARE_PRIVATE(IconSelector)
     Q_DISABLE_COPY(IconSelector)
 
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
index adddf72..bd6be95 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -1949,9 +1949,8 @@ bool QtResourceEditorDialogPrivate::saveQrcFile(const QtQrcFileData &qrcFileData
 }
 
 QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *core, QDesignerDialogGuiInterface *dlgGui, QWidget *parent)
-    : QDialog(parent)
+    : QDialog(parent), d_ptr(new QtResourceEditorDialogPrivate())
 {
-    d_ptr = new QtResourceEditorDialogPrivate();
     d_ptr->q_ptr = this;
     d_ptr->m_ui.setupUi(this);
     d_ptr->m_qrcManager = new QtQrcManager(this);
@@ -2085,8 +2084,6 @@ QtResourceEditorDialog::~QtResourceEditorDialog()
     settings->setValue(QLatin1String(SplitterPosition), d_ptr->m_ui.splitter->saveState());
     settings->setValue(QLatin1String(Geometry), geometry());
     settings->endGroup();
-
-    delete d_ptr;
 }
 
 QtResourceModel *QtResourceEditorDialog::model() const
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
index f2531d9..aa768e9 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -53,6 +53,7 @@
 #ifndef QTRESOURCEEDITOR_H
 #define QTRESOURCEEDITOR_H
 
+#include <QtCore/QScopedPointer>
 #include <QtGui/QDialog>
 
 QT_BEGIN_NAMESPACE
@@ -83,7 +84,7 @@ private:
     QtResourceEditorDialog(QDesignerFormEditorInterface *core, QDesignerDialogGuiInterface *dlgGui, QWidget *parent = 0);
     ~QtResourceEditorDialog();
 
-    class QtResourceEditorDialogPrivate *d_ptr;
+    QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceEditorDialog)
     Q_DISABLE_COPY(QtResourceEditorDialog)
 
diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp
index e6152be..89615c8 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp
@@ -141,7 +141,6 @@ QtResourceSet::QtResourceSet(QtResourceModel *model) :
 
 QtResourceSet::~QtResourceSet()
 {
-    delete d_ptr;
 }
 
 QStringList QtResourceSet::activeQrcPaths() const
@@ -489,7 +488,6 @@ QtResourceModel::~QtResourceModel()
     while (it.hasNext())
         removeResourceSet(it.next());
     blockSignals(false);
-    delete d_ptr;
 }
 
 QStringList QtResourceModel::loadedQrcFiles() const
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h
index 726db29..61d6763 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h
@@ -56,6 +56,7 @@
 #include "shared_global_p.h"
 #include <QtCore/QMap>
 #include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -87,7 +88,7 @@ private:
     ~QtResourceSet();
     friend class QtResourceModel;
 
-    class QtResourceSetPrivate *d_ptr;
+    QScopedPointer<class QtResourceSetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceSet)
     Q_DISABLE_COPY(QtResourceSet)
 };
@@ -132,7 +133,7 @@ signals:
 private:
     friend class QtResourceSet;
 
-    class QtResourceModelPrivate *d_ptr;
+    QScopedPointer<class QtResourceModelPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceModel)
     Q_DISABLE_COPY(QtResourceModel)
 
diff --git a/tools/designer/src/lib/shared/qtresourceview.cpp b/tools/designer/src/lib/shared/qtresourceview.cpp
index d956491..22439a2 100644
--- a/tools/designer/src/lib/shared/qtresourceview.cpp
+++ b/tools/designer/src/lib/shared/qtresourceview.cpp
@@ -499,8 +499,6 @@ QtResourceView::~QtResourceView()
 {
     if (!d_ptr->m_settingsKey.isEmpty())
         d_ptr->saveSettings();
-
-    delete d_ptr;
 }
 
 bool QtResourceView::event(QEvent *event)
@@ -737,8 +735,6 @@ QtResourceViewDialog::~QtResourceViewDialog()
     settings->setValue(QLatin1String(Geometry), geometry());
 
     settings->endGroup();
-
-    delete d_ptr;
 }
 
 QString QtResourceViewDialog::selectedResource() const
diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h
index 33162c5..1d3a1b0 100644
--- a/tools/designer/src/lib/shared/qtresourceview_p.h
+++ b/tools/designer/src/lib/shared/qtresourceview_p.h
@@ -102,7 +102,7 @@ protected:
 
 private:
 
-    class QtResourceViewPrivate *d_ptr;
+    QScopedPointer<class QtResourceViewPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceView)
     Q_DISABLE_COPY(QtResourceView)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *))
@@ -129,7 +129,7 @@ public:
     void setResourceEditingEnabled(bool enable);
 
 private:
-    class QtResourceViewDialogPrivate *d_ptr;
+    QScopedPointer<class QtResourceViewDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceViewDialog)
     Q_DISABLE_COPY(QtResourceViewDialog)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &))