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>
This commit is contained in:
parent
cba92bdb18
commit
14b929e9c4
@ -45,6 +45,7 @@
|
||||
#include "qnetworkreply.h"
|
||||
#include "qnetworkreply_p.h"
|
||||
#include "qnetworkcookie.h"
|
||||
#include "qnetworkcookiejar.h"
|
||||
#include "qabstractnetworkcache.h"
|
||||
|
||||
#include "QtNetwork/qnetworksession.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>)
|
||||
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -42,6 +42,7 @@
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
#include <QtNetwork/QNetworkCookieJar>
|
||||
#include <QtNetwork/QNetworkCookie>
|
||||
#include "private/qtldurl_p.h"
|
||||
|
||||
class tst_QNetworkCookieJar: public QObject
|
||||
|
@ -63,6 +63,7 @@
|
||||
#include <QtNetwork/qnetworkrequest.h>
|
||||
#include <QtNetwork/qnetworkreply.h>
|
||||
#include <QtNetwork/qnetworkcookie.h>
|
||||
#include <QtNetwork/QNetworkCookieJar>
|
||||
#include <QtNetwork/QHttpPart>
|
||||
#include <QtNetwork/QHttpMultiPart>
|
||||
#include <QtNetwork/QNetworkProxyQuery>
|
||||
|
Loading…
Reference in New Issue
Block a user