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/browserapplication.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/browserapplication.cpp')
| -rw-r--r-- | src/browserapplication.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp index 52c5e670..696b2cd8 100644 --- a/src/browserapplication.cpp +++ b/src/browserapplication.cpp @@ -22,7 +22,7 @@ // Local Includes #include "browserapplication.h" -#include "browsermainwindow.h" +#include "mainwindow.h" #include "cookiejar.h" #include "downloadmanager.h" #include "history.h" @@ -173,10 +173,10 @@ void BrowserApplication::loadSettings() -QList<BrowserMainWindow*> BrowserApplication::mainWindows() +QList<MainWindow*> BrowserApplication::mainWindows() { clean(); - QList<BrowserMainWindow*> list; + QList<MainWindow*> list; for (int i = 0; i < m_mainWindows.count(); ++i) { list.append(m_mainWindows.at(i)); @@ -247,7 +247,7 @@ void BrowserApplication::restoreLastSession() } for (int i = 0; i < windows.count(); ++i) { - BrowserMainWindow *newWindow = 0; + MainWindow *newWindow = 0; if (m_mainWindows.count() == 1 && mainWindow()->tabWidget()->count() == 1 && mainWindow()->currentTab()->url() == KUrl()) @@ -277,16 +277,16 @@ void BrowserApplication::openUrl(const KUrl &url) -BrowserMainWindow *BrowserApplication::newMainWindow() +MainWindow *BrowserApplication::newMainWindow() { - BrowserMainWindow *browser = new BrowserMainWindow(); + MainWindow *browser = new MainWindow(); m_mainWindows.prepend(browser); browser->show(); return browser; } -BrowserMainWindow *BrowserApplication::mainWindow() +MainWindow *BrowserApplication::mainWindow() { clean(); if (m_mainWindows.isEmpty()) |