diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-12 16:28:46 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 20:54:23 +0100 |
| commit | 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 (patch) | |
| tree | 8f53d4141319ab2337ecb14ff41f59b01f2b86a8 /src/network/access | |
| parent | cba92bdb18aeadfdfc49a1408e677a061723fb80 (diff) | |
Cleaning up header includes.
QNetworkCookie doesn't need to know about QNetworkCookieJar and for
QNetworkCookieJar header a forward declared QNetworkCookie is enough.
Change-Id: I21145ce0f67a0a6bd68a46a5e757f82105cdf520
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkcookie.h | 3 | ||||
| -rw-r--r-- | src/network/access/qnetworkcookiejar.h | 5 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 1 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 32b91708ad..3a80b9ed92 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -45,6 +45,7 @@ #include "qnetworkreply.h" #include "qnetworkreply_p.h" #include "qnetworkcookie.h" +#include "qnetworkcookiejar.h" #include "qabstractnetworkcache.h" #include "QtNetwork/qnetworksession.h" diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 9c20fe4a5a..fd9c825ddc 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -113,9 +113,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QNetworkCookie &); QT_END_NAMESPACE -// ### Qt5 remove this include -#include <QtNetwork/QNetworkCookieJar> - Q_DECLARE_METATYPE(QNetworkCookie) Q_DECLARE_METATYPE(QList<QNetworkCookie>) diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index c53d45359d..4ff27d8cf0 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -45,15 +45,14 @@ #include <QtCore/QObject> #include <QtCore/QUrl> -// ### Qt5 remove this include -#include <QtNetwork/QNetworkCookie> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Network) +class QNetworkCookie; + class QNetworkCookieJarPrivate; class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 48767f5b13..cd142bfb0a 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -48,6 +48,7 @@ #include "qnetworkrequest.h" #include "qnetworkreply.h" #include "qnetworkrequest_p.h" +#include "qnetworkcookie.h" #include "qnetworkcookie_p.h" #include "QtCore/qdatetime.h" #include "QtCore/qelapsedtimer.h" diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 82579f0d54..1f9efa6ed9 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -42,6 +42,7 @@ #include "qnetworkreplyimpl_p.h" #include "qnetworkaccessbackend_p.h" #include "qnetworkcookie.h" +#include "qnetworkcookiejar.h" #include "qabstractnetworkcache.h" #include "QtCore/qcoreapplication.h" #include "QtCore/qdatetime.h" |