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, 9 insertions, 9 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 0d28a49..4d6b982 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -91,7 +91,7 @@ public:
 
 class QGL2PaintEngineEx : public QPaintEngineEx
 {
-    Q_DECLARE_PRIVATE(QGL2PaintEngineEx)
+    Q_DECLARE_SCOPED_PRIVATE(QGL2PaintEngineEx)
 public:
     QGL2PaintEngineEx();
     ~QGL2PaintEngineEx();
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 24a4bbb..b8943f1 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -266,7 +266,7 @@ Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&);
 
 class Q_OPENGL_EXPORT QGLContext
 {
-    Q_DECLARE_PRIVATE(QGLContext)
+    Q_DECLARE_SCOPED_PRIVATE(QGLContext)
 public:
     QGLContext(const QGLFormat& format, QPaintDevice* device);
     QGLContext(const QGLFormat& format);
@@ -387,7 +387,7 @@ private:
 class Q_OPENGL_EXPORT QGLWidget : public QWidget
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QGLWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QGLWidget)
 public:
     explicit QGLWidget(QWidget* parent=0,
                        const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h
index 108bbb4..7130dec 100644
--- a/src/opengl/qglframebufferobject.h
+++ b/src/opengl/qglframebufferobject.h
@@ -56,7 +56,7 @@ class QGLFramebufferObjectFormat;
 
 class Q_OPENGL_EXPORT QGLFramebufferObject : public QPaintDevice
 {
-    Q_DECLARE_PRIVATE(QGLFramebufferObject)
+    Q_DECLARE_SCOPED_PRIVATE(QGLFramebufferObject)
 public:
     enum Attachment {
         NoAttachment,
diff --git a/src/opengl/qglpaintdevice_qws_p.h b/src/opengl/qglpaintdevice_qws_p.h
index ec7d6c8..08ad304 100644
--- a/src/opengl/qglpaintdevice_qws_p.h
+++ b/src/opengl/qglpaintdevice_qws_p.h
@@ -64,7 +64,7 @@ class QWSGLPaintDevicePrivate;
 
 class Q_OPENGL_EXPORT QWSGLPaintDevice : public QPaintDevice
 {
-    Q_DECLARE_PRIVATE(QWSGLPaintDevice)
+    Q_DECLARE_SCOPED_PRIVATE(QWSGLPaintDevice)
 public:
     QWSGLPaintDevice(QWidget *widget);
     ~QWSGLPaintDevice();
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h
index 06894c0..f8b5707 100644
--- a/src/opengl/qglpixelbuffer.h
+++ b/src/opengl/qglpixelbuffer.h
@@ -55,7 +55,7 @@ class QGLPixelBufferPrivate;
 
 class Q_OPENGL_EXPORT QGLPixelBuffer : public QPaintDevice
 {
-    Q_DECLARE_PRIVATE(QGLPixelBuffer)
+    Q_DECLARE_SCOPED_PRIVATE(QGLPixelBuffer)
 public:
     QGLPixelBuffer(const QSize &size, const QGLFormat &format = QGLFormat::defaultFormat(),
                    QGLWidget *shareWidget = 0);
diff --git a/src/opengl/qglscreen_qws.h b/src/opengl/qglscreen_qws.h
index 8f2ccb7..4caa134 100644
--- a/src/opengl/qglscreen_qws.h
+++ b/src/opengl/qglscreen_qws.h
@@ -88,7 +88,7 @@ public:
 
 class Q_OPENGL_EXPORT QGLScreen : public QScreen
 {
-    Q_DECLARE_PRIVATE(QGLScreen)
+    Q_DECLARE_SCOPED_PRIVATE(QGLScreen)
 public:
     QGLScreen(int displayId);
     virtual ~QGLScreen();
diff --git a/src/opengl/qglwindowsurface_qws_p.h b/src/opengl/qglwindowsurface_qws_p.h
index 1def568..f6d6713 100644
--- a/src/opengl/qglwindowsurface_qws_p.h
+++ b/src/opengl/qglwindowsurface_qws_p.h
@@ -70,7 +70,7 @@ class QWSGLWindowSurfacePrivate;
 
 class Q_OPENGL_EXPORT QWSGLWindowSurface : public QWSWindowSurface
 {
-    Q_DECLARE_PRIVATE(QWSGLWindowSurface)
+    Q_DECLARE_SCOPED_PRIVATE(QWSGLWindowSurface)
 
 public:
     QWSGLWindowSurface(QWidget *widget);
diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h
index 439782b..e1cd897 100644
--- a/src/opengl/qpaintengine_opengl_p.h
+++ b/src/opengl/qpaintengine_opengl_p.h
@@ -74,7 +74,7 @@ public:
 
 class QOpenGLPaintEngine : public QPaintEngineEx
 {
-    Q_DECLARE_PRIVATE(QOpenGLPaintEngine)
+    Q_DECLARE_SCOPED_PRIVATE(QOpenGLPaintEngine)
 public:
     QOpenGLPaintEngine();
     ~QOpenGLPaintEngine();