diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:05:39 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:05:39 +0200 |
| commit | d735b4f8c7df87dd92a6f2c15c5b9c3aaa93765b (patch) | |
| tree | 7f503381217f59ec680f141babd4f07a878ecad1 /src/sessionmanager.cpp | |
| parent | Revert "Fix opensearch add shortcut handling" (diff) | |
| download | rekonq-d735b4f8c7df87dd92a6f2c15c5b9c3aaa93765b.tar.xz | |
Revert "Clean up headers && fix compilation with (the upcoming) qt 4.8.2"
This reverts commit 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885.
Diffstat (limited to 'src/sessionmanager.cpp')
| -rw-r--r-- | src/sessionmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp index 02488801..b0ef1fce 100644 --- a/src/sessionmanager.cpp +++ b/src/sessionmanager.cpp @@ -32,16 +32,16 @@ // Local Includes #include "application.h" -#include "historymanager.h" #include "mainview.h" #include "mainwindow.h" +#include "tabbar.h" #include "webtab.h" // KDE Includes #include <KStandardDirs> // Qt Includes -#include <QFile> +#include <QtCore/QFile> // Only used internally @@ -148,7 +148,7 @@ void SessionManager::saveSession() tab.setAttribute("title", mv->webTab(tabNo)->view()->title()); // redundant, but needed for closedSites() // as there's not way to read out the historyData tab.setAttribute("url", u.url()); - if (mv->currentIndex() == tabNo) + if (mv->tabBar()->currentIndex() == tabNo) { tab.setAttribute("currentTab", 1); } @@ -188,7 +188,7 @@ bool SessionManager::restoreSessionFromScratch() int currentTab = loadViewTabs(mv, window, false); - mv->setCurrentIndex(currentTab); + mv->tabBar()->setCurrentIndex(currentTab); } return true; @@ -210,7 +210,7 @@ void SessionManager::restoreCrashedSession() int currentTab = loadViewTabs(mv, window, true); - mv->setCurrentIndex(currentTab); + mv->tabBar()->setCurrentIndex(currentTab); } setSessionManagementEnabled(true); @@ -234,7 +234,7 @@ int SessionManager::restoreSavedSession() int currentTab = loadViewTabs(mv, window, true); - mv->setCurrentIndex(currentTab); + mv->tabBar()->setCurrentIndex(currentTab); } return winNo; @@ -261,7 +261,7 @@ bool SessionManager::restoreMainWindow(MainWindow* window) int currentTab = loadViewTabs(mv, savedWindowElement, false); - mv->setCurrentIndex(currentTab); + mv->tabBar()->setCurrentIndex(currentTab); return true; } |