Squashed commit of the topic/exceptions branch.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index c81f5d4..227c6f5 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -79,11 +79,11 @@ class QTextItem;
 class QMatrix;
 class QTransform;
 
-class QPainterPrivateCleaner;
+class QPainterPrivateDeleter;
 
 class Q_GUI_EXPORT QPainter
 {
-    Q_DECLARE_PRIVATE(QPainter)
+    Q_DECLARE_SCOPED_PRIVATE(QPainter)
     Q_GADGET
     Q_FLAGS(RenderHint RenderHints)
 
@@ -500,7 +500,7 @@ private:
     Q_DISABLE_COPY(QPainter)
     friend class Q3Painter;
 
-    QScopedCustomPointer<QPainterPrivate, QPainterPrivateCleaner> d_ptr;
+    QCustomScopedPointer<QPainterPrivate> d_ptr;
 
     friend class QFontEngine;
     friend class QFontEngineBox;