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

4 files changed, 16 insertions, 14 deletions

diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp
index 099a4123..3bd17e9c 100644
--- a/src/analyzer/analyzerpanel.cpp
+++ b/src/analyzer/analyzerpanel.cpp
@@ -30,6 +30,7 @@
 #include "analyzerpanel.moc"
 
 // Local Includes
+#include "mainwindow.h"
 #include "networkanalyzer.h"
 #include "networkaccessmanager.h"
 #include "webtab.h"
diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h
index 8441a395..591e5947 100644
--- a/src/analyzer/analyzerpanel.h
+++ b/src/analyzer/analyzerpanel.h
@@ -31,13 +31,11 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "mainwindow.h"
-
 // Qt Includes
 #include <QDockWidget>
 
 // Forward Declarations
+class MainWindow;
 class NetworkAnalyzer;
 
 
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 0cf26f90..882318d4 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -37,14 +37,17 @@
 #include <KPassivePopup>
 
 // Qt Includes
-#include <QtGui/QTreeWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
+#include <QTreeWidget>
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
 #include <QApplication>
 #include <QSignalMapper>
 #include <QClipboard>
 
+#include <QNetworkReply>
+#include  <QNetworkRequest>
+
 
 NetworkAnalyzer::NetworkAnalyzer(QWidget *parent)
     : QWidget(parent)
diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h
index f5824b07..af1e1145 100644
--- a/src/analyzer/networkanalyzer.h
+++ b/src/analyzer/networkanalyzer.h
@@ -34,21 +34,21 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QMap>
-#include <QtCore/QList>
+#include <QWidget>
 
-#include <QtGui/QWidget>
+#include <QMap>
+#include <QList>
 
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QPoint>
+#include <QNetworkAccessManager>
 
 // Forward Declarations
 class QTreeWidgetItem;
 class QSignalMapper;
 class QTreeWidget;
 
+class QNetworkReply;
+class QNetworkRequest;
+
 
 class NetworkAnalyzer : public QWidget
 {