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.

10 files changed, 10 insertions, 10 deletions

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 42e3ffd..50a38bb 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -209,7 +209,7 @@ protected:
     QAbstractSocket(SocketType socketType, QAbstractSocketPrivate &dd, QObject *parent = 0);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractSocket)
+    Q_DECLARE_PRIVATE(QAbstractSocket)
     Q_DISABLE_COPY(QAbstractSocket)
 
     Q_PRIVATE_SLOT(d_func(), void _q_connectToNextAddress())
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index 3a6aa62..39c00cc 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -177,7 +177,7 @@ protected:
     void setPeerPort(quint16 port);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractSocketEngine)
+    Q_DECLARE_PRIVATE(QAbstractSocketEngine)
     Q_DISABLE_COPY(QAbstractSocketEngine)
 };
 
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index f4d29cf..bc7e47a 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -144,7 +144,7 @@ private:
     void emitWriteNotification();
     void emitConnectionNotification();
 
-    Q_DECLARE_SCOPED_PRIVATE(QHttpSocketEngine)
+    Q_DECLARE_PRIVATE(QHttpSocketEngine)
     Q_DISABLE_COPY(QHttpSocketEngine)
 
 };
diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h
index 10dd62f..24b69a8 100644
--- a/src/network/socket/qlocalserver.h
+++ b/src/network/socket/qlocalserver.h
@@ -58,7 +58,7 @@ class QLocalServerPrivate;
 class Q_NETWORK_EXPORT QLocalServer : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QLocalServer)
+    Q_DECLARE_PRIVATE(QLocalServer)
 
 Q_SIGNALS:
     void newConnection();
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index 6a07d74..4bff62e 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -58,7 +58,7 @@ class QLocalSocketPrivate;
 class Q_NETWORK_EXPORT QLocalSocket : public QIODevice
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QLocalSocket)
+    Q_DECLARE_PRIVATE(QLocalSocket)
 
 public:
     enum LocalSocketError
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index e26e9cb..f522aff 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -288,7 +288,7 @@ public Q_SLOTS:
     void connectionNotification();
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QNativeSocketEngine)
+    Q_DECLARE_PRIVATE(QNativeSocketEngine)
     Q_DISABLE_COPY(QNativeSocketEngine)
 };
 
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index 04c6280..19560f0 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -117,7 +117,7 @@ public:
     void setExceptionNotificationEnabled(bool enable);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QSocks5SocketEngine)
+    Q_DECLARE_PRIVATE(QSocks5SocketEngine)
     Q_DISABLE_COPY(QSocks5SocketEngine)
     Q_PRIVATE_SLOT(d_func(), void _q_controlSocketConnected())
     Q_PRIVATE_SLOT(d_func(), void _q_controlSocketReadNotification())
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h
index 697f998..19f2a45 100644
--- a/src/network/socket/qtcpserver.h
+++ b/src/network/socket/qtcpserver.h
@@ -99,7 +99,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QTcpServer)
-    Q_DECLARE_SCOPED_PRIVATE(QTcpServer)
+    Q_DECLARE_PRIVATE(QTcpServer)
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index b0bb80f..4e1003a 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -65,7 +65,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QTcpSocket)
-    Q_DECLARE_SCOPED_PRIVATE(QTcpSocket)
+    Q_DECLARE_PRIVATE(QTcpSocket)
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h
index ea0c42c..078b8ad 100644
--- a/src/network/socket/qudpsocket.h
+++ b/src/network/socket/qudpsocket.h
@@ -85,7 +85,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QUdpSocket)
-    Q_DECLARE_SCOPED_PRIVATE(QUdpSocket)
+    Q_DECLARE_PRIVATE(QUdpSocket)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QUdpSocket::BindMode)