summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-08-20 18:34:22 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-08-20 18:34:22 +0200
commit1d56e9dbedf4ce056308a494edc7d4254189f9bc (patch)
tree9a8f312907b22edab23916bb35135ce9e41f0550
parentFixing setting dialog dimension (diff)
downloadrekonq-1d56e9dbedf4ce056308a494edc7d4254189f9bc.tar.xz
This commit siplifies winId management and let our webviews to not detect
it. This could be dangerous thinking about what we have in mind... ;)
-rw-r--r--src/mainwindow.cpp7
-rw-r--r--src/webview.cpp6
2 files changed, 6 insertions, 7 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4ed885bc..3ac46a1b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -176,13 +176,18 @@ void MainWindow::postLaunch()
connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(slotFind(const QString &)));
// bookmarks loading
- connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
+ connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)),
+ Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
// setting up toolbars to NOT have context menu enabled
setContextMenuPolicy(Qt::DefaultContextMenu);
// accept d'n'd
setAcceptDrops(true);
+
+ const qlonglong winId = window()->winId();
+ Application::cookieJar()->setWindowId(winId);
+ Application::networkAccessManager()->metaData().insert("window-id", QString::number(winId));
}
diff --git a/src/webview.cpp b/src/webview.cpp
index 1bf04885..75dc0979 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -36,8 +36,6 @@
#include "application.h"
#include "mainwindow.h"
#include "mainview.h"
-#include "cookiejar.h"
-#include "networkaccessmanager.h"
#include "history.h"
#include "webpage.h"
@@ -66,10 +64,6 @@ WebView::WebView(QWidget* parent)
setPage(m_page);
connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
-
- const qlonglong winId = window()->winId();
- Application::cookieJar()->setWindowId(winId);
- Application::networkAccessManager()->metaData().insert("window-id", QString::number(winId));
}