From 19eb738f838bf214c9178a4f02464056137b0fa5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 20 Apr 2012 23:31:41 +0200
Subject: Clean up headers && fix compilation with (the upcoming) qt 4.8.2

---
 src/sessionmanager.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/sessionmanager.cpp')

diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index b0ef1fce..02488801 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 <QtCore/QFile>
+#include <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->tabBar()->currentIndex() == tabNo)
+            if (mv->currentIndex() == tabNo)
             {
                 tab.setAttribute("currentTab", 1);
             }
@@ -188,7 +188,7 @@ bool SessionManager::restoreSessionFromScratch()
 
         int currentTab = loadViewTabs(mv, window, false);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     return true;
@@ -210,7 +210,7 @@ void SessionManager::restoreCrashedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     setSessionManagementEnabled(true);
@@ -234,7 +234,7 @@ int SessionManager::restoreSavedSession()
 
         int currentTab = loadViewTabs(mv, window, true);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
     }
 
     return winNo;
@@ -261,7 +261,7 @@ bool SessionManager::restoreMainWindow(MainWindow* window)
 
         int currentTab = loadViewTabs(mv, savedWindowElement, false);
 
-        mv->tabBar()->setCurrentIndex(currentTab);
+        mv->setCurrentIndex(currentTab);
 
         return true;
     }
-- 
cgit v1.2.1