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/adblock/adblockmanager.cpp | 2 ++
 src/adblock/adblockmanager.h   | 2 +-
 src/adblock/adblockwidget.h    | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/adblock')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 5078f215..a9ac0612 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -44,6 +44,8 @@
 // Qt Includes
 #include <QUrl>
 #include <QWebElement>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 
 
 AdBlockManager::AdBlockManager(QObject *parent)
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 9d746e18..07bed803 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -133,11 +133,11 @@
 
 // Qt Includes
 #include <QObject>
-#include <QNetworkReply>
 #include <QStringList>
 #include <QByteArray>
 
 // Forward Includes
+class QNetworkReply;
 class QNetworkRequest;
 class WebPage;
 
diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h
index 3c7c667b..b54134e0 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -32,8 +32,7 @@
 #include "ui_settings_adblock.h"
 
 // Qt Includes
-#include <QtGui/QWidget>
-#include <QtGui/QTreeWidgetItem>
+#include <QWidget>
 
 
 class AdBlockWidget : public QWidget, private Ui::adblock
-- 
cgit v1.2.1