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.

15 files changed, 16 insertions, 16 deletions

diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h
index 93815f6..0550dde 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.h
+++ b/src/corelib/kernel/qabstracteventdispatcher.h
@@ -58,7 +58,7 @@ template <typename T1, typename T2> struct QPair;
 class Q_CORE_EXPORT QAbstractEventDispatcher : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractEventDispatcher)
+    Q_DECLARE_PRIVATE(QAbstractEventDispatcher)
 
 public:
     typedef QPair<int, int> TimerInfo;
diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h
index 2503393..a6bbff4 100644
--- a/src/corelib/kernel/qabstractitemmodel.h
+++ b/src/corelib/kernel/qabstractitemmodel.h
@@ -287,7 +287,7 @@ protected:
     void setRoleNames(const QHash<int,QByteArray> &roleNames);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractItemModel)
+    Q_DECLARE_PRIVATE(QAbstractItemModel)
     Q_DISABLE_COPY(QAbstractItemModel)
 };
 
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 60b0882..48e65a7 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -76,7 +76,7 @@ class Q_CORE_EXPORT QCoreApplication : public QObject
     Q_PROPERTY(QString organizationName READ organizationName WRITE setOrganizationName)
     Q_PROPERTY(QString organizationDomain READ organizationDomain WRITE setOrganizationDomain)
 
-    Q_DECLARE_SCOPED_PRIVATE(QCoreApplication)
+    Q_DECLARE_PRIVATE(QCoreApplication)
 public:
     QCoreApplication(int &argc, char **argv);
     ~QCoreApplication();
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index bcb655b..80ec9fa 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -67,7 +67,7 @@ class QEventDispatcherGlibPrivate;
 class Q_CORE_EXPORT QEventDispatcherGlib : public QAbstractEventDispatcher
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherGlib)
+    Q_DECLARE_PRIVATE(QEventDispatcherGlib)
 
 public:
     explicit QEventDispatcherGlib(QObject *parent = 0);
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index 310d74d..ffc2c04 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -184,7 +184,7 @@ private:
 
 class QSelectThread : public QThread
 {
-    Q_DECLARE_SCOPED_PRIVATE(QThread)
+    Q_DECLARE_PRIVATE(QThread)
 
 public:
     QSelectThread();
@@ -218,7 +218,7 @@ public: // from CActiveScheduler
 
 class Q_CORE_EXPORT QEventDispatcherSymbian : public QAbstractEventDispatcher
 {
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractEventDispatcher)
+    Q_DECLARE_PRIVATE(QAbstractEventDispatcher)
 
 public:
     QEventDispatcherSymbian(QObject *parent = 0);
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index 70c287f..a52af00 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -142,7 +142,7 @@ class QEventDispatcherUNIXPrivate;
 class Q_CORE_EXPORT QEventDispatcherUNIX : public QAbstractEventDispatcher
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherUNIX)
+    Q_DECLARE_PRIVATE(QEventDispatcherUNIX)
 
 public:
     explicit QEventDispatcherUNIX(QObject *parent = 0);
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index 37578a0..ca5dbf8 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -67,7 +67,7 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
 class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherWin32)
+    Q_DECLARE_PRIVATE(QEventDispatcherWin32)
 
     void createInternalHwnd();
     friend class QGuiEventDispatcherWin32;
diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h
index e14e352..60d00df 100644
--- a/src/corelib/kernel/qeventloop.h
+++ b/src/corelib/kernel/qeventloop.h
@@ -55,7 +55,7 @@ class QEventLoopPrivate;
 class Q_CORE_EXPORT QEventLoop : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QEventLoop)
+    Q_DECLARE_PRIVATE(QEventLoop)
 
 public:
     explicit QEventLoop(QObject *parent = 0);
diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h
index 9366c5d..609528a 100644
--- a/src/corelib/kernel/qmimedata.h
+++ b/src/corelib/kernel/qmimedata.h
@@ -94,7 +94,7 @@ protected:
                                       QVariant::Type preferredType) const;
 private:
     Q_DISABLE_COPY(QMimeData)
-    Q_DECLARE_SCOPED_PRIVATE(QMimeData)
+    Q_DECLARE_PRIVATE(QMimeData)
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 200c97d..a9f005b 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -118,7 +118,7 @@ class Q_CORE_EXPORT QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString objectName READ objectName WRITE setObjectName)
-    Q_DECLARE_SCOPED_PRIVATE(QObject)
+    Q_DECLARE_PRIVATE(QObject)
 
 public:
     Q_INVOKABLE explicit QObject(QObject *parent=0);
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index 0e15ebe..4957c3e 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -57,7 +57,7 @@ class QSharedMemoryPrivate;
 class Q_CORE_EXPORT QSharedMemory : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QSharedMemory)
+    Q_DECLARE_PRIVATE(QSharedMemory)
 
 public:
     enum AccessMode
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 8c1f663..7bc5035 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -56,7 +56,7 @@ class QSignalMapperPrivate;
 class Q_CORE_EXPORT QSignalMapper : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QSignalMapper)
+    Q_DECLARE_PRIVATE(QSignalMapper)
 public:
     explicit QSignalMapper(QObject *parent = 0);
     ~QSignalMapper();
diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
index bc5d97d..96dda35 100644
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@@ -53,7 +53,7 @@ QT_MODULE(Core)
 class Q_CORE_EXPORT QSocketNotifier : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QObject)
+    Q_DECLARE_PRIVATE(QObject)
 
 public:
     enum Type { Read, Write, Exception };
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h
index 1f94210..b4cea18 100644
--- a/src/corelib/kernel/qtranslator.h
+++ b/src/corelib/kernel/qtranslator.h
@@ -86,7 +86,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QTranslator)
-    Q_DECLARE_SCOPED_PRIVATE(QTranslator)
+    Q_DECLARE_PRIVATE(QTranslator)
 };
 
 #endif // QT_NO_TRANSLATION
diff --git a/src/corelib/kernel/qwineventnotifier_p.h b/src/corelib/kernel/qwineventnotifier_p.h
index 2c8934f..07aa0ae 100644
--- a/src/corelib/kernel/qwineventnotifier_p.h
+++ b/src/corelib/kernel/qwineventnotifier_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class Q_CORE_EXPORT QWinEventNotifier : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QObject)
+    Q_DECLARE_PRIVATE(QObject)
 
 public:
     explicit QWinEventNotifier(QObject *parent = 0);