Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

7 files changed, 10 insertions, 10 deletions

diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h
index bfd95e5..9314120 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.h
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h
@@ -64,7 +64,7 @@ public:
 
 private:
     QScopedPointer<BrushManagerProxyPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(BrushManagerProxy)
+    Q_DECLARE_SCOPED_PRIVATE(BrushManagerProxy)
     Q_DISABLE_COPY(BrushManagerProxy)
     Q_PRIVATE_SLOT(d_func(), void brushAdded(const QString &, const QBrush &))
     Q_PRIVATE_SLOT(d_func(), void brushRemoved(const QString &name))
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index 4884c577..e6ced60 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -78,7 +78,7 @@ signals:
 
 private:
     QScopedPointer<QtBrushManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtBrushManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtBrushManager)
     Q_DISABLE_COPY(QtBrushManager)
 };
 
diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h
index 9190d54..e91a21e 100644
--- a/tools/designer/src/lib/shared/iconselector_p.h
+++ b/tools/designer/src/lib/shared/iconselector_p.h
@@ -88,7 +88,7 @@ public:
 
 private:
     QScopedPointer<class LanguageResourceDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(LanguageResourceDialog)
+    Q_DECLARE_SCOPED_PRIVATE(LanguageResourceDialog)
     Q_DISABLE_COPY(LanguageResourceDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAccepted())
     Q_PRIVATE_SLOT(d_func(), void slotPathChanged(QString))
@@ -121,7 +121,7 @@ signals:
     void iconChanged(const PropertySheetIconValue &icon);
 private:
     QScopedPointer<class IconSelectorPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(IconSelector)
+    Q_DECLARE_SCOPED_PRIVATE(IconSelector)
     Q_DISABLE_COPY(IconSelector)
 
     Q_PRIVATE_SLOT(d_func(), void slotStateActivated())
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
index 6eac2b8..59c5ca6 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -85,7 +85,7 @@ private:
     ~QtResourceEditorDialog();
 
     QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceEditorDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceEditorDialog)
     Q_DISABLE_COPY(QtResourceEditorDialog)
 
     Q_PRIVATE_SLOT(d_func(), void slotQrcFileInserted(QtQrcFile *))
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h
index e9f1c93..22e98bb 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h
@@ -89,7 +89,7 @@ private:
     friend class QtResourceModel;
 
     QScopedPointer<class QtResourceSetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceSet)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceSet)
     Q_DISABLE_COPY(QtResourceSet)
 };
 
@@ -134,7 +134,7 @@ private:
     friend class QtResourceSet;
 
     QScopedPointer<class QtResourceModelPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceModel)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceModel)
     Q_DISABLE_COPY(QtResourceModel)
 
     Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &))
diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h
index 0484686..82bb8d8 100644
--- a/tools/designer/src/lib/shared/qtresourceview_p.h
+++ b/tools/designer/src/lib/shared/qtresourceview_p.h
@@ -103,7 +103,7 @@ protected:
 private:
 
     QScopedPointer<class QtResourceViewPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceView)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceView)
     Q_DISABLE_COPY(QtResourceView)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *))
     Q_PRIVATE_SLOT(d_func(), void slotCurrentPathChanged(QTreeWidgetItem *))
@@ -131,7 +131,7 @@ public:
 
 private:
     QScopedPointer<class QtResourceViewDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceViewDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceViewDialog)
     Q_DISABLE_COPY(QtResourceViewDialog)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &))
 };
diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h
index 40b5010..7f718a6 100644
--- a/tools/designer/src/uitools/quiloader.h
+++ b/tools/designer/src/uitools/quiloader.h
@@ -92,7 +92,7 @@ public:
 
 private:
     QScopedPointer<QUiLoaderPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QUiLoader)
+    Q_DECLARE_SCOPED_PRIVATE(QUiLoader)
     Q_DISABLE_COPY(QUiLoader)
 };