Squashed commit of the topic/exceptions branch.

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

5 files changed, 5 insertions, 5 deletions

diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index e7ef4b316f..9a41e9b542 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -87,7 +87,7 @@ public:
 private:
     Q_DISABLE_COPY(QGraphicsSvgItem)
 
-    // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject)
+    // Q_DECLARE_SCOPED_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject)
     inline QGraphicsSvgItemPrivate *d_func()
     { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
     inline const QGraphicsSvgItemPrivate *d_func() const
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 948647962b..b5c56cd5ad 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -155,7 +155,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
 
 class QSvgPaintEngine : public QPaintEngine
 {
-    Q_DECLARE_PRIVATE(QSvgPaintEngine)
+    Q_DECLARE_SCOPED_PRIVATE(QSvgPaintEngine)
 public:
 
     QSvgPaintEngine()
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 5b60a05b31..951cee1b29 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -61,7 +61,7 @@ class QSvgGeneratorPrivate;
 
 class Q_SVG_EXPORT QSvgGenerator : public QPaintDevice
 {
-    Q_DECLARE_PRIVATE(QSvgGenerator)
+    Q_DECLARE_SCOPED_PRIVATE(QSvgGenerator)
 
     Q_PROPERTY(QSize size READ size WRITE setSize)
     Q_PROPERTY(QRectF viewBox READ viewBoxF WRITE setViewBox)
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 78e8a7e643..2b9a4f7dfe 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -109,7 +109,7 @@ Q_SIGNALS:
     void repaintNeeded();
 
 private:
-    Q_DECLARE_PRIVATE(QSvgRenderer)
+    Q_DECLARE_SCOPED_PRIVATE(QSvgRenderer)
 };
 
 QT_END_NAMESPACE
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index ccf66bb158..1a2cdd1989 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -74,7 +74,7 @@ protected:
     void paintEvent(QPaintEvent *event);
 private:
     Q_DISABLE_COPY(QSvgWidget)
-    Q_DECLARE_PRIVATE(QSvgWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QSvgWidget)
 };
 
 QT_END_NAMESPACE