Removing windowID settings, unuseful (for me) in a

ONE window application :)

1 files changed, 11 insertions, 15 deletions

diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index df3140f5..6aceaf6a 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -2,9 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -46,15 +45,12 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QString>
 
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QCompleter>
-
-#include <QtDBus>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusReply>
 
 
 CookieJar::CookieJar(QObject* parent) 
-    : QNetworkCookieJar(parent)
-    , m_windowId(-1) 
+    : QNetworkCookieJar(parent) 
 {
 }
 
@@ -71,7 +67,7 @@ QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl & url) const
     if ( true ) // FIXME WebKitSettings::self()->isCookieJarEnabled()) 
     {
         QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer");
-        QDBusReply<QString> reply = kcookiejar.call("findCookies", url.toString(), m_windowId);
+        QDBusReply<QString> reply = kcookiejar.call("findCookies", url.toString() ); // , m_windowId);
 
         if (reply.isValid()) 
         {
@@ -100,7 +96,7 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> & cookieList, cons
         {
             cookieHeader = "Set-Cookie: ";
             cookieHeader += cookie.toRawForm();
-            kcookiejar.call("addCookies", url.toString(), cookieHeader, m_windowId);
+            kcookiejar.call("addCookies", url.toString(), cookieHeader); //, m_windowId);
             //kDebug() << "url: " << url.host() << ", cookie: " << cookieHeader;
         }
 
@@ -111,7 +107,7 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> & cookieList, cons
 }
 
 
-void CookieJar::setWindowId(qlonglong id)
-{
-    m_windowId = id;
-}
+// void CookieJar::setWindowId(qlonglong id)
+// {
+//     m_windowId = id;
+// }