diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
| commit | a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch) | |
| tree | 0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /src/mainwindow.cpp | |
| parent | Merge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | KIO download system (diff) | |
| download | rekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz | |
FIxing conflicts
Merge branch 'rekonq04' into dev04try
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 52ea6068..9b95f052 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -35,10 +35,8 @@ // Local Includes #include "application.h" -#include "settings.h" +#include "settingsdialog.h" #include "history.h" -#include "cookiejar.h" -#include "networkaccessmanager.h" #include "bookmarks.h" #include "webview.h" #include "mainview.h" @@ -90,6 +88,9 @@ #include <QtGui/QPrintPreviewDialog> #include <QtGui/QFontMetrics> +#include <QtDBus/QDBusInterface> +#include <QtDBus/QDBusReply> + #include <QtWebKit/QWebHistory> @@ -1067,12 +1068,13 @@ void MainWindow::clearPrivateData() if(clearWidget.clearCookies->isChecked()) { - Application::cookieJar()->clear(); + QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer"); + QDBusReply<void> reply = kcookiejar.call( "deleteAllCookies" ); } if(clearWidget.clearCachedPages->isChecked()) { - Application::networkAccessManager()->resetDiskCache(); + // TODO implement me! } if(clearWidget.clearWebIcons->isChecked()) |