Squashed commit of the topic/exceptions branch.

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

8 files changed, 8 insertions, 8 deletions

diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h
index 0348998..5f34815 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.h
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.h
@@ -76,7 +76,7 @@ protected:
 #endif
 private:
     QScopedPointer<class QtColorButtonPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorButton)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorButton)
     Q_DISABLE_COPY(QtColorButton)
     Q_PRIVATE_SLOT(d_func(), void slotEditColor())
 };
diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h
index ffd3eea..f54ec70 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.h
+++ b/tools/shared/qtgradienteditor/qtcolorline.h
@@ -115,7 +115,7 @@ protected:
 private:
 
     QScopedPointer<class QtColorLinePrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorLine)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorLine)
     Q_DISABLE_COPY(QtColorLine)
 };
 
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h
index f293a28..6f40794 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.h
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.h
@@ -77,7 +77,7 @@ public:
 
 private:
     QScopedPointer<class QtGradientDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientDialog)
     Q_DISABLE_COPY(QtGradientDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint))
 };
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h
index 2d96515..b7dcfd3 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.h
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.h
@@ -79,7 +79,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientEditorPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientEditor)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientEditor)
     Q_DISABLE_COPY(QtGradientEditor)
     Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops))
     Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type))
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
index 7c6a660..94a5619 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
@@ -71,7 +71,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsController)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsController)
     Q_DISABLE_COPY(QtGradientStopsController)
     Q_PRIVATE_SLOT(d_func(), void slotHsvClicked())
     Q_PRIVATE_SLOT(d_func(), void slotRgbClicked())
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
index a02ebc5..8190829 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
@@ -112,7 +112,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientStopsModelPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsModel)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsModel)
     Q_DISABLE_COPY(QtGradientStopsModel)
 };
 
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
index 753d695..7c7c5fc 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -92,7 +92,7 @@ protected:
 
 private:
     QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsWidget)
     Q_DISABLE_COPY(QtGradientStopsWidget)
     Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
     Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop))
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h
index 3e23bf9..52fdcbb 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.h
@@ -111,7 +111,7 @@ protected:
 
 private:
     QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientWidget)
     Q_DISABLE_COPY(QtGradientWidget)
 };