diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-12-15 17:01:04 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-12-15 17:01:04 +0100 |
commit | 1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543 (patch) | |
tree | 8897b7fd209889561a5047f4fdc9edd95f61ee38 /src/webpage.cpp | |
parent | Merge commit 'refs/merge-requests/71' of git://gitorious.org/rekonq/mainline ... (diff) | |
parent | factor out WebTab class from WebView (diff) | |
download | rekonq-1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543.tar.xz |
I tried a bit, but this is not working pretty well :(
We are actually creating two widget for request.
I'll merge it anyway to let you fix it :)
Merge commit 'refs/merge-requests/72' of git://gitorious.org/rekonq/mainline into m72
Conflicts:
src/mainview.cpp
src/webview.cpp
Diffstat (limited to 'src/webpage.cpp')
-rw-r--r-- | src/webpage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index 1f7738ea..3fc0aac4 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -39,7 +39,7 @@ #include "application.h" #include "mainwindow.h" #include "mainview.h" -#include "webview.h" +#include "webtab.h" #include "webpluginfactory.h" #include "networkaccessmanager.h" @@ -126,14 +126,14 @@ WebPage *WebPage::createWindow(QWebPage::WebWindowType type) if (type == QWebPage::WebModalDialog) kDebug() << "Modal Dialog"; - WebView *w = 0; + WebTab *w = 0; if(ReKonfig::openTabNoWindow()) { - w = Application::instance()->mainWindow()->mainView()->newWebView(!ReKonfig::openTabsBack()); + w = Application::instance()->mainWindow()->mainView()->newWebTab(!ReKonfig::openTabsBack()); } else { - w = Application::instance()->newMainWindow()->mainView()->currentWebView(); + w = Application::instance()->newMainWindow()->mainView()->currentWebTab(); } return w->page(); } |