From 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885 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

Conflicts:

	src/adblock/adblockwidget.h
	src/application.h
	src/history/historymanager.h
	src/tabpreviewpopup.cpp

Backported from master branch
---
 src/tabbar.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/tabbar.cpp')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 326d8647..e3bcf3eb 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -35,6 +35,7 @@
 #include "rekonq.h"
 
 #include "application.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -52,12 +53,14 @@
 #include <KColorScheme>
 
 // Qt Includes
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QToolButton>
+#include <QLabel>
+#include <QLayout>
+#include <QMouseEvent>
+#include <QToolButton>
 #include <QPropertyAnimation>
 #include <QStyleOptionFrameV3>
+#include <QSignalMapper>
+#include <QTimer>
 
 
 static inline QByteArray highlightPropertyName(int index)
@@ -66,6 +69,9 @@ static inline QByteArray highlightPropertyName(int index)
 }
 
 
+// ----------------------------------------------
+
+
 TabBar::TabBar(QWidget *parent)
     : KTabBar(parent)
     , m_actualIndex(-1)
-- 
cgit v1.2.1