11 files changed, 14 insertions, 14 deletions
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index 40f2313..38ebb69 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -130,7 +130,7 @@ protected:
     QAbstractNetworkCache(QAbstractNetworkCachePrivate &dd, QObject *parent);
 
 private:
-    Q_DECLARE_PRIVATE(QAbstractNetworkCache)
+    Q_DECLARE_SCOPED_PRIVATE(QAbstractNetworkCache)
     Q_DISABLE_COPY(QAbstractNetworkCache)
 };
 
diff --git a/src/network/access/qftp.h b/src/network/access/qftp.h
index c6aaea4..8e4af9f 100644
--- a/src/network/access/qftp.h
+++ b/src/network/access/qftp.h
@@ -162,7 +162,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QFtp)
-    Q_DECLARE_PRIVATE(QFtp)
+    Q_DECLARE_SCOPED_PRIVATE(QFtp)
 
     Q_PRIVATE_SLOT(d_func(), void _q_startNextCommand())
     Q_PRIVATE_SLOT(d_func(), void _q_piFinished(const QString&))
diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h
index e524350..c1fda0e 100644
--- a/src/network/access/qhttp.h
+++ b/src/network/access/qhttp.h
@@ -112,7 +112,7 @@ protected:
     QScopedPointer<QHttpHeaderPrivate> d_ptr;
 
 private:
-    Q_DECLARE_PRIVATE(QHttpHeader)
+    Q_DECLARE_SCOPED_PRIVATE(QHttpHeader)
 };
 
 class QHttpResponseHeaderPrivate;
@@ -139,7 +139,7 @@ protected:
     bool parseLine(const QString &line, int number);
 
 private:
-    Q_DECLARE_PRIVATE(QHttpResponseHeader)
+    Q_DECLARE_SCOPED_PRIVATE(QHttpResponseHeader)
     friend class QHttpPrivate;
 };
 
@@ -167,7 +167,7 @@ protected:
     bool parseLine(const QString &line, int number);
 
 private:
-    Q_DECLARE_PRIVATE(QHttpRequestHeader)
+    Q_DECLARE_SCOPED_PRIVATE(QHttpRequestHeader)
 };
 
 class Q_NETWORK_EXPORT QHttp : public QObject
@@ -282,7 +282,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QHttp)
-    Q_DECLARE_PRIVATE(QHttp)
+    Q_DECLARE_SCOPED_PRIVATE(QHttp)
 
     Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest())
     Q_PRIVATE_SLOT(d_func(), void _q_slotReadyRead())
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index db6a140..eb7a955 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -135,7 +135,7 @@ Q_SIGNALS:
     void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
 
 private:
-    Q_DECLARE_PRIVATE(QHttpNetworkConnection)
+    Q_DECLARE_SCOPED_PRIVATE(QHttpNetworkConnection)
     Q_DISABLE_COPY(QHttpNetworkConnection)
     friend class QHttpNetworkReply;
 
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 575e824..0982685 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -146,7 +146,7 @@ Q_SIGNALS:
     void dataSendProgress(qint64 done, qint64 total);
 
 private:
-    Q_DECLARE_PRIVATE(QHttpNetworkReply)
+    Q_DECLARE_SCOPED_PRIVATE(QHttpNetworkReply)
     friend class QHttpNetworkConnection;
     friend class QHttpNetworkConnectionPrivate;
 };
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index f7967f6..01f09cf 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -119,7 +119,7 @@ protected:
 
 private:
     friend class QNetworkReplyImplPrivate;
-    Q_DECLARE_PRIVATE(QNetworkAccessManager)
+    Q_DECLARE_SCOPED_PRIVATE(QNetworkAccessManager)
     Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
     Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>))
 };
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 922a6f5..35c7095 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -67,7 +67,7 @@ public:
         Full
     };
 
-    QNetworkCookie();  
+    QNetworkCookie();
     QNetworkCookie(const QByteArray &name );
     QNetworkCookie(const QByteArray &name, const QByteArray &value );
     QNetworkCookie(const QNetworkCookie &other);
diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index 2d04564..8827bfb 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -84,7 +84,7 @@ protected:
     virtual qint64 expire();
 
 private:
-    Q_DECLARE_PRIVATE(QNetworkDiskCache)
+    Q_DECLARE_SCOPED_PRIVATE(QNetworkDiskCache)
     Q_DISABLE_COPY(QNetworkDiskCache)
 };
 
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 679ab71..854111f 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -165,7 +165,7 @@ protected:
     void setAttribute(QNetworkRequest::Attribute code, const QVariant &value);
 
 private:
-    Q_DECLARE_PRIVATE(QNetworkReply)
+    Q_DECLARE_SCOPED_PRIVATE(QNetworkReply)
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index fba8d34..eb63e62 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -92,7 +92,7 @@ public:
     Q_INVOKABLE virtual void ignoreSslErrorsImplementation(const QList<QSslError> &errors);
 #endif
 
-    Q_DECLARE_PRIVATE(QNetworkReplyImpl)
+    Q_DECLARE_SCOPED_PRIVATE(QNetworkReplyImpl)
     Q_PRIVATE_SLOT(d_func(), void _q_startOperation())
     Q_PRIVATE_SLOT(d_func(), void _q_copyReadyRead())
     Q_PRIVATE_SLOT(d_func(), void _q_copyReadChannelFinished())
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index a53aed3..cf06f7c 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -89,7 +89,7 @@ public:
 
 
     explicit QNetworkRequest();
-    explicit QNetworkRequest(const QUrl &url);     
+    explicit QNetworkRequest(const QUrl &url);
     QNetworkRequest(const QNetworkRequest &other);
     ~QNetworkRequest();
     QNetworkRequest &operator=(const QNetworkRequest &other);