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.

54 files changed, 62 insertions, 62 deletions

diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h
index 8da0935..e4b1fcc 100644
--- a/src/corelib/animation/qabstractanimation.h
+++ b/src/corelib/animation/qabstractanimation.h
@@ -125,7 +125,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QAbstractAnimation)
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractAnimation)
+    Q_DECLARE_PRIVATE(QAbstractAnimation)
 };
 
 #endif //QT_NO_ANIMATION
diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h
index 5b07524..93c6fb1 100644
--- a/src/corelib/animation/qanimationgroup.h
+++ b/src/corelib/animation/qanimationgroup.h
@@ -76,7 +76,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QAnimationGroup)
-    Q_DECLARE_SCOPED_PRIVATE(QAnimationGroup)
+    Q_DECLARE_PRIVATE(QAnimationGroup)
 };
 
 #endif //QT_NO_ANIMATION
diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h
index 8422102..07808f1 100644
--- a/src/corelib/animation/qparallelanimationgroup.h
+++ b/src/corelib/animation/qparallelanimationgroup.h
@@ -73,7 +73,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QParallelAnimationGroup)
-    Q_DECLARE_SCOPED_PRIVATE(QParallelAnimationGroup)
+    Q_DECLARE_PRIVATE(QParallelAnimationGroup)
     Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished())
 };
 
diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h
index b84e940..6907d0a 100644
--- a/src/corelib/animation/qpauseanimation.h
+++ b/src/corelib/animation/qpauseanimation.h
@@ -72,7 +72,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QPauseAnimation)
-    Q_DECLARE_SCOPED_PRIVATE(QPauseAnimation)
+    Q_DECLARE_PRIVATE(QPauseAnimation)
 };
 
 #endif //QT_NO_ANIMATION
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index 6631f67..e07444c 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -78,7 +78,7 @@ protected:
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed())
     Q_DISABLE_COPY(QPropertyAnimation)
-    Q_DECLARE_SCOPED_PRIVATE(QPropertyAnimation)
+    Q_DECLARE_PRIVATE(QPropertyAnimation)
 };
 
 #endif //QT_NO_ANIMATION
diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h
index 81a7ff5..5d43356 100644
--- a/src/corelib/animation/qsequentialanimationgroup.h
+++ b/src/corelib/animation/qsequentialanimationgroup.h
@@ -83,7 +83,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QSequentialAnimationGroup)
-    Q_DECLARE_SCOPED_PRIVATE(QSequentialAnimationGroup)
+    Q_DECLARE_PRIVATE(QSequentialAnimationGroup)
     Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished())
 };
 
diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h
index 8c75fc1..3e397ca 100644
--- a/src/corelib/animation/qvariantanimation.h
+++ b/src/corelib/animation/qvariantanimation.h
@@ -113,7 +113,7 @@ private:
     static void registerInterpolator(Interpolator func, int interpolationType);
 
     Q_DISABLE_COPY(QVariantAnimation)
-    Q_DECLARE_SCOPED_PRIVATE(QVariantAnimation)
+    Q_DECLARE_PRIVATE(QVariantAnimation)
 };
 
 template <typename T>
diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h
index 948ecca..04d5680 100644
--- a/src/corelib/concurrent/qfuturewatcher.h
+++ b/src/corelib/concurrent/qfuturewatcher.h
@@ -59,7 +59,7 @@ class QFutureWatcherBasePrivate;
 class Q_CORE_EXPORT QFutureWatcherBase : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QFutureWatcherBase)
+    Q_DECLARE_PRIVATE(QFutureWatcherBase)
 
 public:
     QFutureWatcherBase(QObject *parent = 0);
diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h
index dddf962..0ddefd1 100644
--- a/src/corelib/concurrent/qthreadpool.h
+++ b/src/corelib/concurrent/qthreadpool.h
@@ -58,7 +58,7 @@ class QThreadPoolPrivate;
 class Q_CORE_EXPORT QThreadPool : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QThreadPool)
+    Q_DECLARE_PRIVATE(QThreadPool)
     Q_PROPERTY(int expiryTimeout READ expiryTimeout WRITE setExpiryTimeout)
     Q_PROPERTY(int maxThreadCount READ maxThreadCount WRITE setMaxThreadCount)
     Q_PROPERTY(int activeThreadCount READ activeThreadCount)
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 86f0757..9b93306 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2290,14 +2290,12 @@ inline const QForeachContainer<T> *qForeachContainer(const QForeachContainerBase
 #endif
 #endif
 
-#define Q_DECLARE_PRIVATE(Class) \
-    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr); } \
-    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr); } \
-    friend class Class##Private;
+template <typename T> static inline T *qGetPtrHelper(T *ptr) { return ptr; }
+template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelper(const Wrapper &p) { return p.data(); }
 
-#define Q_DECLARE_SCOPED_PRIVATE(Class) \
-    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
-    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.data()); } \
+#define Q_DECLARE_PRIVATE(Class) \
+    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(qGetPtrHelper(d_ptr)); } \
+    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(qGetPtrHelper(d_ptr)); } \
     friend class Class##Private;
 
 #define Q_DECLARE_PRIVATE_D(Dptr, Class) \
diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h
index 07c92d2..54eb6de 100644
--- a/src/corelib/io/qabstractfileengine.h
+++ b/src/corelib/io/qabstractfileengine.h
@@ -196,7 +196,7 @@ protected:
 
     QScopedPointer<QAbstractFileEnginePrivate> d_ptr;
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractFileEngine)
+    Q_DECLARE_PRIVATE(QAbstractFileEngine)
     Q_DISABLE_COPY(QAbstractFileEngine)
 };
 
diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h
index ce5f605..e078d05 100644
--- a/src/corelib/io/qbuffer.h
+++ b/src/corelib/io/qbuffer.h
@@ -96,7 +96,7 @@ protected:
     qint64 writeData(const char *data, qint64 len);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QBuffer)
+    Q_DECLARE_PRIVATE(QBuffer)
     Q_DISABLE_COPY(QBuffer)
 
     Q_PRIVATE_SLOT(d_func(), void _q_emitSignals())
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 5ef4356..f54fbdc 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -60,7 +60,7 @@ class Q_CORE_EXPORT QDir
 protected:
     QScopedPointer<QDirPrivate> d_ptr;
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QDir)
+    Q_DECLARE_PRIVATE(QDir)
 public:
     enum Filter { Dirs        = 0x001,
                   Files       = 0x002,
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h
index 24ce617..f448609 100644
--- a/src/corelib/io/qfile.h
+++ b/src/corelib/io/qfile.h
@@ -64,7 +64,7 @@ class Q_CORE_EXPORT QFile : public QIODevice
 #ifndef QT_NO_QOBJECT
     Q_OBJECT
 #endif
-    Q_DECLARE_SCOPED_PRIVATE(QFile)
+    Q_DECLARE_PRIVATE(QFile)
 
 public:
 
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index c73823a..5295b16 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -168,7 +168,7 @@ public:
 protected:
     QScopedPointer<QFileInfoPrivate> d_ptr;
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QFileInfo)
+    Q_DECLARE_PRIVATE(QFileInfo)
 };
 Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE);
 
diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h
index 76a6c60..60458e5 100644
--- a/src/corelib/io/qfilesystemwatcher.h
+++ b/src/corelib/io/qfilesystemwatcher.h
@@ -57,7 +57,7 @@ class QFileSystemWatcherPrivate;
 class Q_CORE_EXPORT QFileSystemWatcher : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QFileSystemWatcher)
+    Q_DECLARE_PRIVATE(QFileSystemWatcher)
 
 public:
     QFileSystemWatcher(QObject *parent = 0);
diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h
index 0fd87a4..feca09b 100644
--- a/src/corelib/io/qfsfileengine.h
+++ b/src/corelib/io/qfsfileengine.h
@@ -56,7 +56,7 @@ class QFSFileEnginePrivate;
 
 class Q_CORE_EXPORT QFSFileEngine : public QAbstractFileEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QFSFileEngine)
+    Q_DECLARE_PRIVATE(QFSFileEngine)
 public:
     QFSFileEngine();
     explicit QFSFileEngine(const QString &file);
diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index d8237a7..866fa72 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -165,7 +165,7 @@ protected:
 #endif
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QIODevice)
+    Q_DECLARE_PRIVATE(QIODevice)
     Q_DISABLE_COPY(QIODevice)
 
 #ifdef QT3_SUPPORT
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index a4025a1..bff5f7e 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -191,7 +191,7 @@ protected:
     qint64 writeData(const char *data, qint64 len);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QProcess)
+    Q_DECLARE_PRIVATE(QProcess)
     Q_DISABLE_COPY(QProcess)
 
     Q_PRIVATE_SLOT(d_func(), bool _q_canReadStandardOutput())
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index 49dacea..0bf9660 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -94,7 +94,7 @@ protected:
     QScopedPointer<QResourcePrivate> d_ptr;
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QResource)
+    Q_DECLARE_PRIVATE(QResource)
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index 452d8e1..f58f9a2 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -61,7 +61,7 @@ class QResourceFileEnginePrivate;
 class QResourceFileEngine : public QAbstractFileEngine
 {
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QResourceFileEngine)
+    Q_DECLARE_PRIVATE(QResourceFileEngine)
 public:
     explicit QResourceFileEngine(const QString &path);
     ~QResourceFileEngine();
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index a082d6a..0d382b66 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -80,7 +80,7 @@ class Q_CORE_EXPORT QSettings
 #else
     QScopedPointer<QSettingsPrivate> d_ptr;
 #endif
-    Q_DECLARE_SCOPED_PRIVATE(QSettings)
+    Q_DECLARE_PRIVATE(QSettings)
 
 public:
     enum Status {
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 235b4f5..ccc753a 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -289,7 +289,7 @@ static int qt_mkstemps(char *path, int slen)
 //************* QTemporaryFileEngine
 class QTemporaryFileEngine : public QFSFileEngine
 {
-    Q_DECLARE_SCOPED_PRIVATE(QFSFileEngine)
+    Q_DECLARE_PRIVATE(QFSFileEngine)
 public:
     QTemporaryFileEngine(const QString &file, bool fileIsTemplate = true)
         : QFSFileEngine(file), filePathIsTemplate(fileIsTemplate)
diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h
index c0b41bb..a597a93 100644
--- a/src/corelib/io/qtemporaryfile.h
+++ b/src/corelib/io/qtemporaryfile.h
@@ -64,7 +64,7 @@ class Q_CORE_EXPORT QTemporaryFile : public QFile
 #ifndef QT_NO_QOBJECT
     Q_OBJECT
 #endif
-    Q_DECLARE_SCOPED_PRIVATE(QTemporaryFile)
+    Q_DECLARE_PRIVATE(QTemporaryFile)
 
 public:
     QTemporaryFile();
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h
index 9d4b3d0..fc4794e 100644
--- a/src/corelib/io/qtextstream.h
+++ b/src/corelib/io/qtextstream.h
@@ -72,7 +72,7 @@ class QTextDecoder;
 class QTextStreamPrivate;
 class Q_CORE_EXPORT QTextStream                                // text stream class
 {
-    Q_DECLARE_SCOPED_PRIVATE(QTextStream)
+    Q_DECLARE_PRIVATE(QTextStream)
 
 public:
     enum RealNumberNotation {
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);
diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h
index b646b4d..1717ac0 100644
--- a/src/corelib/plugin/qfactoryloader_p.h
+++ b/src/corelib/plugin/qfactoryloader_p.h
@@ -66,7 +66,7 @@ class QFactoryLoaderPrivate;
 class Q_CORE_EXPORT QFactoryLoader : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QFactoryLoader)
+    Q_DECLARE_PRIVATE(QFactoryLoader)
 
 public:
     QFactoryLoader(const char *iid,
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index 3229ab7..5355ac2 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -85,7 +85,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QAbstractState)
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractState)
+    Q_DECLARE_PRIVATE(QAbstractState)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index bfd2849..8ff3a6e 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -106,7 +106,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QAbstractTransition)
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractTransition)
+    Q_DECLARE_PRIVATE(QAbstractTransition)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index 08887f0..0ebca19 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -83,7 +83,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QEventTransition)
-    Q_DECLARE_SCOPED_PRIVATE(QEventTransition)
+    Q_DECLARE_PRIVATE(QEventTransition)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h
index 7b77b2b..e37ef36 100644
--- a/src/corelib/statemachine/qfinalstate.h
+++ b/src/corelib/statemachine/qfinalstate.h
@@ -68,7 +68,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFinalState)
-    Q_DECLARE_SCOPED_PRIVATE(QFinalState)
+    Q_DECLARE_PRIVATE(QFinalState)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index 889308d..395bb98 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -83,7 +83,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QHistoryState)
-    Q_DECLARE_SCOPED_PRIVATE(QHistoryState)
+    Q_DECLARE_PRIVATE(QHistoryState)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index c823c2b..415751e 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -78,7 +78,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QSignalTransition)
-    Q_DECLARE_SCOPED_PRIVATE(QSignalTransition)
+    Q_DECLARE_PRIVATE(QSignalTransition)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 05d394b..ce88b25 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -107,7 +107,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QState)
-    Q_DECLARE_SCOPED_PRIVATE(QState)
+    Q_DECLARE_PRIVATE(QState)
 };
 
 #endif //QT_NO_STATEMACHINE
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index 1b1caa1..230d852 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -141,7 +141,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QStateMachine)
-    Q_DECLARE_SCOPED_PRIVATE(QStateMachine)
+    Q_DECLARE_PRIVATE(QStateMachine)
     Q_PRIVATE_SLOT(d_func(), void _q_start())
     Q_PRIVATE_SLOT(d_func(), void _q_process())
 #ifndef QT_NO_ANIMATION
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 0d8aa8b..c784352 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -127,7 +127,7 @@ protected:
 
 private:
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QThread)
+    Q_DECLARE_PRIVATE(QThread)
 
     static void initialize();
     static void cleanup();
@@ -154,7 +154,7 @@ private:
     friend class QCoreApplication;
     friend class QThreadData;
     friend class QAdoptedThread;
-    Q_DECLARE_SCOPED_PRIVATE(QThread)
+    Q_DECLARE_PRIVATE(QThread)
 };
 
 #endif // QT_NO_THREAD
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 752796b..a67ae33 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -214,7 +214,7 @@ public:
 // thread wrapper for the main() thread
 class QAdoptedThread : public QThread
 {
-    Q_DECLARE_SCOPED_PRIVATE(QThread)
+    Q_DECLARE_PRIVATE(QThread)
 
 public:
     QAdoptedThread(QThreadData *data = 0);
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index 62daacb..cbd9309 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -161,6 +161,8 @@ public:
         return oldD;
     }
 
+    typedef T *pointer;
+
 protected:
     T *d;
 
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 2a1c2c2..2d1ad42 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -136,7 +136,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QTimeLine)
-    Q_DECLARE_SCOPED_PRIVATE(QTimeLine)
+    Q_DECLARE_PRIVATE(QTimeLine)
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 3215624..7be7138 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -392,7 +392,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QXmlStreamReader)
-    Q_DECLARE_SCOPED_PRIVATE(QXmlStreamReader)
+    Q_DECLARE_PRIVATE(QXmlStreamReader)
     QScopedPointer<QXmlStreamReaderPrivate> d_ptr;
 
 };
@@ -465,7 +465,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QXmlStreamWriter)
-    Q_DECLARE_SCOPED_PRIVATE(QXmlStreamWriter)
+    Q_DECLARE_PRIVATE(QXmlStreamWriter)
     QScopedPointer<QXmlStreamWriterPrivate> d_ptr;
 };
 #endif // QT_NO_XMLSTREAMWRITER