Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE

Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.

18 files changed, 18 insertions, 18 deletions

diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index 6460afa..92aa506 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -89,7 +89,7 @@ Q_DECLARE_TYPEINFO(QTextItem, Q_PRIMITIVE_TYPE);
 
 class Q_GUI_EXPORT QPaintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPaintEngine)
+    Q_DECLARE_PRIVATE(QPaintEngine)
 public:
     enum PaintEngineFeature {
         PrimitiveTransform          = 0x00000001, // Can transform primitives brushes
diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/painting/qpaintengine_alpha_p.h
index 1a0b1ac..7f45ad6 100644
--- a/src/gui/painting/qpaintengine_alpha_p.h
+++ b/src/gui/painting/qpaintengine_alpha_p.h
@@ -62,7 +62,7 @@ class QAlphaPaintEnginePrivate;
 
 class QAlphaPaintEngine : public QPaintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QAlphaPaintEngine)
+    Q_DECLARE_PRIVATE(QAlphaPaintEngine)
 public:
     ~QAlphaPaintEngine();
 
diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h
index 42a55c4..20a4a08 100644
--- a/src/gui/painting/qpaintengine_mac_p.h
+++ b/src/gui/painting/qpaintengine_mac_p.h
@@ -69,7 +69,7 @@ extern int qt_defaultDpiY();
 class QCoreGraphicsPaintEnginePrivate;
 class QCoreGraphicsPaintEngine : public QPaintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QCoreGraphicsPaintEngine)
+    Q_DECLARE_PRIVATE(QCoreGraphicsPaintEngine)
 
 public:
     QCoreGraphicsPaintEngine();
diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/painting/qpaintengine_preview_p.h
index d8e2b08..9f96d40 100644
--- a/src/gui/painting/qpaintengine_preview_p.h
+++ b/src/gui/painting/qpaintengine_preview_p.h
@@ -65,7 +65,7 @@ class QPreviewPaintEnginePrivate;
 
 class QPreviewPaintEngine : public QPaintEngine, public QPrintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPreviewPaintEngine)
+    Q_DECLARE_PRIVATE(QPreviewPaintEngine)
 public:
     QPreviewPaintEngine();
     ~QPreviewPaintEngine();
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 43f7675..53f09cc 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -134,7 +134,7 @@ Q_GUI_EXPORT
 #endif
 QRasterPaintEngine : public QPaintEngineEx
 {
-    Q_DECLARE_SCOPED_PRIVATE(QRasterPaintEngine)
+    Q_DECLARE_PRIVATE(QRasterPaintEngine)
 public:
 
     QRasterPaintEngine(QPaintDevice *device);
diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/painting/qpaintengine_x11_p.h
index 2a7894d..738a155 100644
--- a/src/gui/painting/qpaintengine_x11_p.h
+++ b/src/gui/painting/qpaintengine_x11_p.h
@@ -76,7 +76,7 @@ struct qt_float_point
 
 class QX11PaintEngine : public QPaintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QX11PaintEngine)
+    Q_DECLARE_PRIVATE(QX11PaintEngine)
 public:
     QX11PaintEngine();
     ~QX11PaintEngine();
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index aea79e8..22354bc 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -143,7 +143,7 @@ class QPixmapFilter;
 
 class Q_GUI_EXPORT QPaintEngineEx : public QPaintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPaintEngineEx)
+    Q_DECLARE_PRIVATE(QPaintEngineEx)
 public:
     QPaintEngineEx();
 
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 227c6f5..00ebd76 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -83,7 +83,7 @@ class QPainterPrivateDeleter;
 
 class Q_GUI_EXPORT QPainter
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPainter)
+    Q_DECLARE_PRIVATE(QPainter)
     Q_GADGET
     Q_FLAGS(RenderHint RenderHints)
 
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index ef92397..74a854e 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -256,7 +256,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPainterPath &);
 
 class Q_GUI_EXPORT QPainterPathStroker
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPainterPathStroker)
+    Q_DECLARE_PRIVATE(QPainterPathStroker)
 public:
     QPainterPathStroker();
     ~QPainterPathStroker();
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 26f5bd7..0e023d6 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -183,7 +183,7 @@ class QPdfBaseEnginePrivate;
 
 class QPdfBaseEngine : public QAlphaPaintEngine, public QPrintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPdfBaseEngine)
+    Q_DECLARE_PRIVATE(QPdfBaseEngine)
 public:
     QPdfBaseEngine(QPdfBaseEnginePrivate &d, PaintEngineFeatures f);
     ~QPdfBaseEngine() {}
diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/painting/qprintengine_mac_p.h
index 1fdb172..23e99cd 100644
--- a/src/gui/painting/qprintengine_mac_p.h
+++ b/src/gui/painting/qprintengine_mac_p.h
@@ -72,7 +72,7 @@ class QPrinterPrivate;
 class QMacPrintEnginePrivate;
 class QMacPrintEngine : public QPaintEngine, public QPrintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QMacPrintEngine)
+    Q_DECLARE_PRIVATE(QMacPrintEngine)
 public:
     QMacPrintEngine(QPrinter::PrinterMode mode);
 
diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h
index e130ada..6f884a9 100644
--- a/src/gui/painting/qprintengine_pdf_p.h
+++ b/src/gui/painting/qprintengine_pdf_p.h
@@ -84,7 +84,7 @@ class QPdfEnginePrivate;
 
 class QPdfEngine : public QPdfBaseEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPdfEngine)
+    Q_DECLARE_PRIVATE(QPdfEngine)
 public:
     QPdfEngine(QPrinter::PrinterMode m);
     virtual ~QPdfEngine();
diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h
index 4b8034e..986be38a 100644
--- a/src/gui/painting/qprintengine_ps_p.h
+++ b/src/gui/painting/qprintengine_ps_p.h
@@ -70,7 +70,7 @@ class QPSPrintEnginePrivate;
 
 class QPSPrintEngine : public QPdfBaseEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPSPrintEngine)
+    Q_DECLARE_PRIVATE(QPSPrintEngine)
 public:
     // QPrinter uses these
     explicit QPSPrintEngine(QPrinter::PrinterMode m);
diff --git a/src/gui/painting/qprintengine_qws_p.h b/src/gui/painting/qprintengine_qws_p.h
index 5e552fe..41cf935 100644
--- a/src/gui/painting/qprintengine_qws_p.h
+++ b/src/gui/painting/qprintengine_qws_p.h
@@ -70,7 +70,7 @@ class QImage;
 
 class QtopiaPrintEngine : public QPaintEngine, public QPrintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QtopiaPrintEngine)
+    Q_DECLARE_PRIVATE(QtopiaPrintEngine)
 public:
     QtopiaPrintEngine(QPrinter::PrinterMode mode);
 
diff --git a/src/gui/painting/qprintengine_win_p.h b/src/gui/painting/qprintengine_win_p.h
index 34fa538..36a32e8 100644
--- a/src/gui/painting/qprintengine_win_p.h
+++ b/src/gui/painting/qprintengine_win_p.h
@@ -69,7 +69,7 @@ class QPainterState;
 
 class QWin32PrintEngine : public QAlphaPaintEngine, public QPrintEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QWin32PrintEngine)
+    Q_DECLARE_PRIVATE(QWin32PrintEngine)
 public:
     QWin32PrintEngine(QPrinter::PrinterMode mode);
 
diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h
index 842845b..25c2f0c 100644
--- a/src/gui/painting/qprinter.h
+++ b/src/gui/painting/qprinter.h
@@ -65,7 +65,7 @@ class QPrinterInfo;
 
 class Q_GUI_EXPORT QPrinter : public QPaintDevice
 {
-    Q_DECLARE_SCOPED_PRIVATE(QPrinter)
+    Q_DECLARE_PRIVATE(QPrinter)
 public:
     enum PrinterMode { ScreenResolution, PrinterResolution, HighResolution };
 
diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/painting/qprinterinfo.h
index 5c0a25f..526b3b2 100644
--- a/src/gui/painting/qprinterinfo.h
+++ b/src/gui/painting/qprinterinfo.h
@@ -56,7 +56,7 @@ class QPrinterInfoPrivate;
 class QPrinterInfoPrivateDeleter;
 class Q_GUI_EXPORT QPrinterInfo
 {
-Q_DECLARE_SCOPED_PRIVATE(QPrinterInfo)
+Q_DECLARE_PRIVATE(QPrinterInfo)
 
 public:
     QPrinterInfo();
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index 4ee2047..b3256b3 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -108,7 +108,7 @@ public:
 
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
-    Q_DECLARE_SCOPED_PRIVATE(QRasterWindowSurface)
+    Q_DECLARE_PRIVATE(QRasterWindowSurface)
     QScopedPointer<QRasterWindowSurfacePrivate> d_ptr;
 };