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.

5 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/embedded/qdirectpainter_qws.h b/src/gui/embedded/qdirectpainter_qws.h
index a7f82f1..eddde10 100644
--- a/src/gui/embedded/qdirectpainter_qws.h
+++ b/src/gui/embedded/qdirectpainter_qws.h
@@ -57,7 +57,7 @@ class QWSEmbedEvent;
 
 class Q_GUI_EXPORT QDirectPainter : public QObject {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QDirectPainter)
+    Q_DECLARE_PRIVATE(QDirectPainter)
 public:
 
     enum SurfaceFlag { NonReserved = 0,
diff --git a/src/gui/embedded/qtransportauth_qws.h b/src/gui/embedded/qtransportauth_qws.h
index e633a90..d8753fe 100644
--- a/src/gui/embedded/qtransportauth_qws.h
+++ b/src/gui/embedded/qtransportauth_qws.h
@@ -169,7 +169,7 @@ private:
     ~QTransportAuth();
 
     friend class QAuthDevice;
-    Q_DECLARE_SCOPED_PRIVATE(QTransportAuth)
+    Q_DECLARE_PRIVATE(QTransportAuth)
 };
 
 class Q_GUI_EXPORT RequestAnalyzer
diff --git a/src/gui/embedded/qwindowsystem_qws.h b/src/gui/embedded/qwindowsystem_qws.h
index 04cd756..3cda9f6 100644
--- a/src/gui/embedded/qwindowsystem_qws.h
+++ b/src/gui/embedded/qwindowsystem_qws.h
@@ -214,7 +214,7 @@ class Q_GUI_EXPORT QWSServer : public QObject
     friend class QWSDisplay;
     friend class QWSInputMethod;
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWSServer)
+    Q_DECLARE_PRIVATE(QWSServer)
 public:
     explicit QWSServer(int flags = 0, QObject *parent=0);
 #ifdef QT3_SUPPORT
@@ -443,7 +443,7 @@ class QWSConvertSelectionCommand;
 class Q_GUI_EXPORT QWSClient : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWSClient)
+    Q_DECLARE_PRIVATE(QWSClient)
 public:
     QWSClient(QObject* parent, QWS_SOCK_BASE *, int id);
     ~QWSClient();
diff --git a/src/gui/embedded/qwsembedwidget.h b/src/gui/embedded/qwsembedwidget.h
index d880454..8313c38 100644
--- a/src/gui/embedded/qwsembedwidget.h
+++ b/src/gui/embedded/qwsembedwidget.h
@@ -71,7 +71,7 @@ protected:
     void showEvent(QShowEvent *event);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QWSEmbedWidget)
+    Q_DECLARE_PRIVATE(QWSEmbedWidget)
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/embedded/qwsmanager_qws.h b/src/gui/embedded/qwsmanager_qws.h
index 86aadc9..5a4312c 100644
--- a/src/gui/embedded/qwsmanager_qws.h
+++ b/src/gui/embedded/qwsmanager_qws.h
@@ -66,7 +66,7 @@ class QWSManagerPrivate;
 class Q_GUI_EXPORT QWSManager : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QWSManager)
+    Q_DECLARE_PRIVATE(QWSManager)
 public:
     explicit QWSManager(QWidget *);
     ~QWSManager();