Move the QNetworkCookieJar class out of qnetworkcookie.[h,cpp] files and into qnetworkcookiejar[h,_p.h,cpp].

one adjustment was necessary from the merge request:
The line 110 in qnetworkcookie.h needed to include
qnetworkcookiejar.h, not <QtNetwork/QNetworkCookieJar> .

Merge-request: 1015
Reviewed-by: Peter Hartmann

1 files changed, 2 insertions, 19 deletions

diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index c11b5b5..ef309a8 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -106,25 +106,8 @@ private:
 };
 Q_DECLARE_TYPEINFO(QNetworkCookie, Q_MOVABLE_TYPE);
 
-class QNetworkCookieJarPrivate;
-class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject
-{
-    Q_OBJECT
-public:
-    QNetworkCookieJar(QObject *parent = 0);
-    virtual ~QNetworkCookieJar();
-
-    virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
-    virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
-
-protected:
-    QList<QNetworkCookie> allCookies() const;
-    void setAllCookies(const QList<QNetworkCookie> &cookieList);
-
-private:
-    Q_DECLARE_PRIVATE(QNetworkCookieJar)
-    Q_DISABLE_COPY(QNetworkCookieJar)
-};
+// ### Qt5 remove this include
+#include "qnetworkcookiejar.h"
 
 #ifndef QT_NO_DEBUG_STREAM
 class QDebug;