diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2008-12-30 16:56:40 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2008-12-30 16:56:40 +0100 |
commit | c0ff12b2fbfcba0f43c9cf501ff94bccaf9c7f89 (patch) | |
tree | 0627ff26b4899e5c0757bfea8fbd1248f63ef691 /src/webview.cpp | |
parent | Ignoring .ctagsdb (diff) | |
parent | Fixed FindBar crash && refactored to look like kate searchbar (diff) | |
download | rekonq-c0ff12b2fbfcba0f43c9cf501ff94bccaf9c7f89.tar.xz |
Merge branch 'xmlgui'
Diffstat (limited to 'src/webview.cpp')
-rw-r--r-- | src/webview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webview.cpp b/src/webview.cpp index edae86eb..e17a961a 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -20,7 +20,7 @@ #include "browserapplication.h" -#include "browsermainwindow.h" +#include "mainwindow.h" #include "cookiejar.h" #include "downloadmanager.h" #include "networkaccessmanager.h" @@ -48,12 +48,12 @@ WebPage::WebPage(QObject *parent) } -BrowserMainWindow *WebPage::mainWindow() +MainWindow *WebPage::mainWindow() { QObject *w = this->parent(); while (w) { - if (BrowserMainWindow *mw = qobject_cast<BrowserMainWindow*>(w)) + if (MainWindow *mw = qobject_cast<MainWindow*>(w)) return mw; w = w->parent(); } @@ -73,7 +73,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r if (newWindow) { BrowserApplication::instance()->newMainWindow(); - BrowserMainWindow *newMainWindow = BrowserApplication::instance()->mainWindow(); + MainWindow *newMainWindow = BrowserApplication::instance()->mainWindow(); webView = newMainWindow->currentTab(); newMainWindow->raise(); newMainWindow->activateWindow(); @@ -108,7 +108,7 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType type) return mainWindow()->tabWidget()->newTab()->page(); } BrowserApplication::instance()->newMainWindow(); - BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow(); + MainWindow *mainWindow = BrowserApplication::instance()->mainWindow(); return mainWindow->currentTab()->page(); } |