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.

29 files changed, 30 insertions, 30 deletions

diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h
index ef32a33..68f88c5 100644
--- a/src/gui/kernel/qaction.h
+++ b/src/gui/kernel/qaction.h
@@ -64,7 +64,7 @@ class QGraphicsWidget;
 class Q_GUI_EXPORT QAction : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QAction)
+    Q_DECLARE_PRIVATE(QAction)
 
     Q_ENUMS(MenuRole)
     Q_ENUMS(SoftKeyRole)
diff --git a/src/gui/kernel/qactiongroup.h b/src/gui/kernel/qactiongroup.h
index 07bdbda..e42c2e5 100644
--- a/src/gui/kernel/qactiongroup.h
+++ b/src/gui/kernel/qactiongroup.h
@@ -57,7 +57,7 @@ class QActionGroupPrivate;
 class Q_GUI_EXPORT QActionGroup : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QActionGroup)
+    Q_DECLARE_PRIVATE(QActionGroup)
 
     Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 88a01fe..fcb3a7c 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -363,7 +363,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QApplication)
-    Q_DECLARE_SCOPED_PRIVATE(QApplication)
+    Q_DECLARE_PRIVATE(QApplication)
 
     friend class QGraphicsWidget;
     friend class QGraphicsScene;
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 0a38870..2bded5c 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -1098,7 +1098,7 @@ static void qWinProcessConfigRequests()                // perform requests in qu
 
 class QGuiEventDispatcherWin32 : public QEventDispatcherWin32
 {
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherWin32)
+    Q_DECLARE_PRIVATE(QEventDispatcherWin32)
 public:
     QGuiEventDispatcherWin32(QObject *parent = 0);
     bool processEvents(QEventLoop::ProcessEventsFlags flags);
diff --git a/src/gui/kernel/qboxlayout.h b/src/gui/kernel/qboxlayout.h
index c399b8d..f463c31 100644
--- a/src/gui/kernel/qboxlayout.h
+++ b/src/gui/kernel/qboxlayout.h
@@ -60,7 +60,7 @@ class QBoxLayoutPrivate;
 class Q_GUI_EXPORT QBoxLayout : public QLayout
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QBoxLayout)
+    Q_DECLARE_PRIVATE(QBoxLayout)
 public:
     enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop,
                      Down = TopToBottom, Up = BottomToTop };
diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h
index 68fbf33..8241812 100644
--- a/src/gui/kernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
@@ -62,7 +62,7 @@ class QClipboardPrivate;
 class Q_GUI_EXPORT QClipboard : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QClipboard)
+    Q_DECLARE_PRIVATE(QClipboard)
 private:
     QClipboard(QObject *parent);
     ~QClipboard();
diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h
index 785f6c4..a21ae9d 100644
--- a/src/gui/kernel/qdesktopwidget.h
+++ b/src/gui/kernel/qdesktopwidget.h
@@ -96,7 +96,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QDesktopWidget)
-    Q_DECLARE_SCOPED_PRIVATE(QDesktopWidget)
+    Q_DECLARE_PRIVATE(QDesktopWidget)
 
     friend class QApplication;
     friend class QApplicationPrivate;
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 410d1a9..7b445ea 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -316,7 +316,7 @@ static XdndData xdnd_data = { 0, 0 };
 
 class QExtraWidget : public QWidget
 {
-    Q_DECLARE_SCOPED_PRIVATE(QWidget)
+    Q_DECLARE_PRIVATE(QWidget)
 public:
     inline QWExtra* extraData();
     inline QTLWExtra* topData();
diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h
index 7e54b51..b49d82a 100644
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@@ -61,7 +61,7 @@ class QDragManager;
 class Q_GUI_EXPORT QDrag : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QDrag)
+    Q_DECLARE_PRIVATE(QDrag)
 public:
     explicit QDrag(QWidget *dragSource);
     ~QDrag();
diff --git a/src/gui/kernel/qeventdispatcher_glib_qws_p.h b/src/gui/kernel/qeventdispatcher_glib_qws_p.h
index f0751be..826661e 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qws_p.h
+++ b/src/gui/kernel/qeventdispatcher_glib_qws_p.h
@@ -62,7 +62,7 @@ class QWSEventDispatcherGlibPrivate;
 class QWSEventDispatcherGlib : public QEventDispatcherGlib
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWSEventDispatcherGlib)
+    Q_DECLARE_PRIVATE(QWSEventDispatcherGlib)
 
 public:
     explicit QWSEventDispatcherGlib(QObject *parent = 0);
diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/kernel/qeventdispatcher_mac_p.h
index 1986c4c..88663c6 100644
--- a/src/gui/kernel/qeventdispatcher_mac_p.h
+++ b/src/gui/kernel/qeventdispatcher_mac_p.h
@@ -108,7 +108,7 @@ class QEventDispatcherMacPrivate;
 class QEventDispatcherMac : public QAbstractEventDispatcher
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherMac)
+    Q_DECLARE_PRIVATE(QEventDispatcherMac)
 
 public:
     explicit QEventDispatcherMac(QObject *parent = 0);
diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h
index 982ed58..b83fa10 100644
--- a/src/gui/kernel/qeventdispatcher_qws_p.h
+++ b/src/gui/kernel/qeventdispatcher_qws_p.h
@@ -62,7 +62,7 @@ class QEventDispatcherQWSPrivate;
 class QEventDispatcherQWS : public QEventDispatcherUNIX
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherQWS)
+    Q_DECLARE_PRIVATE(QEventDispatcherQWS)
 
 public:
     explicit QEventDispatcherQWS(QObject *parent = 0);
diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/kernel/qeventdispatcher_x11_p.h
index b4c553d..9a54c36 100644
--- a/src/gui/kernel/qeventdispatcher_x11_p.h
+++ b/src/gui/kernel/qeventdispatcher_x11_p.h
@@ -62,7 +62,7 @@ class QEventDispatcherX11Private;
 class QEventDispatcherX11 : public QEventDispatcherUNIX
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherX11)
+    Q_DECLARE_PRIVATE(QEventDispatcherX11)
 
 public:
     explicit QEventDispatcherX11(QObject *parent = 0);
diff --git a/src/gui/kernel/qformlayout.h b/src/gui/kernel/qformlayout.h
index 0143711..b560e85 100644
--- a/src/gui/kernel/qformlayout.h
+++ b/src/gui/kernel/qformlayout.h
@@ -56,7 +56,7 @@ class Q_GUI_EXPORT QFormLayout : public QLayout
 {
     Q_OBJECT
     Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole)
-    Q_DECLARE_SCOPED_PRIVATE(QFormLayout)
+    Q_DECLARE_PRIVATE(QFormLayout)
     Q_PROPERTY(FieldGrowthPolicy fieldGrowthPolicy READ fieldGrowthPolicy WRITE setFieldGrowthPolicy RESET resetFieldGrowthPolicy)
     Q_PROPERTY(RowWrapPolicy rowWrapPolicy READ rowWrapPolicy WRITE setRowWrapPolicy RESET resetRowWrapPolicy)
     Q_PROPERTY(Qt::Alignment labelAlignment READ labelAlignment WRITE setLabelAlignment RESET resetLabelAlignment)
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index a4bd2c2..0735160 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -60,7 +60,7 @@ class QGesturePrivate;
 class Q_GUI_EXPORT QGesture : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QGesture)
+    Q_DECLARE_PRIVATE(QGesture)
 
     Q_PROPERTY(Qt::GestureState state READ state)
 
diff --git a/src/gui/kernel/qgridlayout.h b/src/gui/kernel/qgridlayout.h
index 2b5299e..89a04a4 100644
--- a/src/gui/kernel/qgridlayout.h
+++ b/src/gui/kernel/qgridlayout.h
@@ -60,7 +60,7 @@ class QGridLayoutPrivate;
 class Q_GUI_EXPORT QGridLayout : public QLayout
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QGridLayout)
+    Q_DECLARE_PRIVATE(QGridLayout)
     QDOC_PROPERTY(int horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
     QDOC_PROPERTY(int verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
 
diff --git a/src/gui/kernel/qguieventdispatcher_glib_p.h b/src/gui/kernel/qguieventdispatcher_glib_p.h
index 8543836..65d233e 100644
--- a/src/gui/kernel/qguieventdispatcher_glib_p.h
+++ b/src/gui/kernel/qguieventdispatcher_glib_p.h
@@ -62,7 +62,7 @@ class QGuiEventDispatcherGlibPrivate;
 class QGuiEventDispatcherGlib : public QEventDispatcherGlib
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QGuiEventDispatcherGlib)
+    Q_DECLARE_PRIVATE(QGuiEventDispatcherGlib)
 
 public:
     explicit QGuiEventDispatcherGlib(QObject *parent = 0);
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 6c12b0f..5f3d22f 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -85,7 +85,7 @@ public:
 
 private:
     friend QKeyMapperPrivate *qt_keymapper_private();
-    Q_DECLARE_SCOPED_PRIVATE(QKeyMapper)
+    Q_DECLARE_PRIVATE(QKeyMapper)
     Q_DISABLE_COPY(QKeyMapper)
 };
 
diff --git a/src/gui/kernel/qlayout.h b/src/gui/kernel/qlayout.h
index ec95ca8..4f46c1d 100644
--- a/src/gui/kernel/qlayout.h
+++ b/src/gui/kernel/qlayout.h
@@ -89,7 +89,7 @@ class QLayoutPrivate;
 class Q_GUI_EXPORT QLayout : public QObject, public QLayoutItem
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QLayout)
+    Q_DECLARE_PRIVATE(QLayout)
 
     Q_ENUMS(SizeConstraint)
     Q_PROPERTY(int margin READ margin WRITE setMargin)
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h
index 0a55d0c..f27dbaa 100644
--- a/src/gui/kernel/qsessionmanager.h
+++ b/src/gui/kernel/qsessionmanager.h
@@ -60,7 +60,7 @@ class QSessionManagerPrivate;
 class Q_GUI_EXPORT  QSessionManager : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QSessionManager)
+    Q_DECLARE_PRIVATE(QSessionManager)
     QSessionManager(QApplication *app, QString &id, QString &key);
     ~QSessionManager();
 public:
diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h
index 7b79faa..c81ce7c 100644
--- a/src/gui/kernel/qshortcut.h
+++ b/src/gui/kernel/qshortcut.h
@@ -57,7 +57,7 @@ class QShortcutPrivate;
 class Q_GUI_EXPORT QShortcut : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QShortcut)
+    Q_DECLARE_PRIVATE(QShortcut)
     Q_PROPERTY(QKeySequence key READ key WRITE setKey)
     Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 53a39ec..8962ac7 100644
--- a/src/gui/kernel/qshortcutmap_p.h
+++ b/src/gui/kernel/qshortcutmap_p.h
@@ -74,7 +74,7 @@ class QObject;
 
 class QShortcutMap
 {
-    Q_DECLARE_SCOPED_PRIVATE(QShortcutMap)
+    Q_DECLARE_PRIVATE(QShortcutMap)
 public:
     QShortcutMap();
     ~QShortcutMap();
diff --git a/src/gui/kernel/qsound.h b/src/gui/kernel/qsound.h
index eeef047..22cfdde 100644
--- a/src/gui/kernel/qsound.h
+++ b/src/gui/kernel/qsound.h
@@ -82,7 +82,7 @@ public:
     static inline QT3_SUPPORT bool available() { return isAvailable(); }
 #endif
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QSound)
+    Q_DECLARE_PRIVATE(QSound)
     friend class QAuServer;
 };
 
diff --git a/src/gui/kernel/qstackedlayout.h b/src/gui/kernel/qstackedlayout.h
index ab215fa..d14b2ab 100644
--- a/src/gui/kernel/qstackedlayout.h
+++ b/src/gui/kernel/qstackedlayout.h
@@ -55,7 +55,7 @@ class QStackedLayoutPrivate;
 class Q_GUI_EXPORT QStackedLayout : public QLayout
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QStackedLayout)
+    Q_DECLARE_PRIVATE(QStackedLayout)
     Q_ENUMS(StackingMode)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged)
     Q_PROPERTY(StackingMode stackingMode READ stackingMode WRITE setStackingMode)
diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h
index fc7cb00..c734fba 100644
--- a/src/gui/kernel/qstandardgestures.h
+++ b/src/gui/kernel/qstandardgestures.h
@@ -57,7 +57,7 @@ class QPanGesturePrivate;
 class Q_GUI_EXPORT QPanGesture : public QGesture
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QPanGesture)
+    Q_DECLARE_PRIVATE(QPanGesture)
 
     Q_PROPERTY(QSize totalOffset READ totalOffset)
     Q_PROPERTY(QSize lastOffset READ lastOffset)
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index c5c10b6..c73f633 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -142,7 +142,7 @@ class QWidgetPrivate;
 class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWidget)
+    Q_DECLARE_PRIVATE(QWidget)
 
     Q_PROPERTY(bool modal READ isModal)
     Q_PROPERTY(Qt::WindowModality windowModality READ windowModality WRITE setWindowModality)
diff --git a/src/gui/kernel/qwidgetaction.h b/src/gui/kernel/qwidgetaction.h
index a39b281..4ec489e 100644
--- a/src/gui/kernel/qwidgetaction.h
+++ b/src/gui/kernel/qwidgetaction.h
@@ -57,7 +57,7 @@ class QWidgetActionPrivate;
 class Q_GUI_EXPORT QWidgetAction : public QAction
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWidgetAction)
+    Q_DECLARE_PRIVATE(QWidgetAction)
 
 public:
     explicit QWidgetAction(QObject *parent);
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index cce28c4..359434e 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -270,7 +270,7 @@ const int XButtonRelease = ButtonRelease;
 // need to to inspect window()'s embedded state.
 class QHackWidget : public QWidget
 {
-    Q_DECLARE_SCOPED_PRIVATE(QWidget)
+    Q_DECLARE_PRIVATE(QWidget)
 public:
     QTLWExtra* topData() { return d_func()->topData(); }
 };
diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/kernel/qx11embed_x11.h
index 0d67c23..8659ed6 100644
--- a/src/gui/kernel/qx11embed_x11.h
+++ b/src/gui/kernel/qx11embed_x11.h
@@ -80,7 +80,7 @@ protected:
     void resizeEvent(QResizeEvent *);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QX11EmbedWidget)
+    Q_DECLARE_PRIVATE(QX11EmbedWidget)
     Q_DISABLE_COPY(QX11EmbedWidget)
 };
 
@@ -121,7 +121,7 @@ protected:
     bool event(QEvent *);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QX11EmbedContainer)
+    Q_DECLARE_PRIVATE(QX11EmbedContainer)
     Q_DISABLE_COPY(QX11EmbedContainer)
 };