Clean up headers && fix compilation with (the upcoming) qt 4.8.2

7 files changed, 46 insertions, 43 deletions

diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index bb2a7683..ee84e299 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -30,10 +30,10 @@
 #include "autosaver.moc"
 
 // Qt Includes
-#include <QtCore/QMetaObject>
-#include <QtCore/QTimerEvent>
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTime>
+#include <QMetaObject>
+#include <QTimerEvent>
+#include <QBasicTimer>
+#include <QTime>
 
 
 const int AUTOSAVE_TIME  = 1000 * 3;  // seconds
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index f165377c..4c385ed6 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
 
 // Forward Declarations
 class QBasicTimer;
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index afc2ecf0..e55e8a98 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -44,16 +44,18 @@
 #include <KCompletion>
 
 // Qt Includes
-#include <QtCore/QList>
-#include <QtCore/QUrl>
-#include <QtCore/QDate>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QDataStream>
-#include <QtCore/QBuffer>
-
-#include <QtGui/QClipboard>
+#include <QList>
+#include <QUrl>
+#include <QDate>
+#include <QDateTime>
+#include <QString>
+#include <QFile>
+#include <QDataStream>
+#include <QBuffer>
+#include <QTemporaryFile>
+#include <QTimer>
+
+#include <QClipboard>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index fc2e9abd..4e727400 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -33,9 +33,6 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "urlresolver.h"
-
 // KDE Includes
 #include <KUrl>
 
@@ -43,12 +40,18 @@
 #include <QDateTime>
 #include <QHash>
 #include <QObject>
-#include <QTimer>
-#include <QSortFilterProxyModel>
 #include <QWebHistory>
 
 #include <math.h>
 
+// Forward Declarations
+class AutoSaver;
+class HistoryFilterModel;
+class HistoryTreeModel;
+
+class QWebHistory;
+
+
 /**
  * Elements in this class represent an history item
  *
@@ -99,6 +102,7 @@ public:
 
 // ---------------------------------------------------------------------------------------------------------------
 
+
 class TabHistory
 {
 public:
@@ -132,13 +136,9 @@ public:
     QByteArray history;
 };
 
-// ---------------------------------------------------------------------------------------------------------------
 
+// ---------------------------------------------------------------------------------------------------------------
 
-// Forward Declarations
-class AutoSaver;
-class HistoryFilterModel;
-class HistoryTreeModel;
 
 /**
  * THE History Manager:
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index d50d28a0..90886cac 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -35,6 +35,7 @@
 
 // Local Includes
 #include "application.h"
+#include "historymanager.h"
 #include "iconmanager.h"
 
 // KDE Includes
@@ -43,16 +44,17 @@
 #include <KIcon>
 
 // Qt Includes
-#include <QtCore/QList>
-#include <QtCore/QUrl>
-#include <QtCore/QDate>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QDataStream>
-#include <QtCore/QBuffer>
-
-#include <QtGui/QClipboard>
+#include <QList>
+#include <QUrl>
+#include <QDate>
+#include <QDateTime>
+#include <QString>
+#include <QFile>
+#include <QDataStream>
+#include <QBuffer>
+
+#include <QClipboard>
+#include <QFileInfo>
 
 // generic algorithms
 #include <QtAlgorithms>
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 4f4f30b5..d8f20818 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -33,17 +33,16 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "historymanager.h"
-
 // KDE Includes
 #include <KUrl>
 
 // Qt Includes
 #include <QHash>
-#include <QObject>
-#include <QSortFilterProxyModel>
-#include <QWebHistoryInterface>
+#include <QAbstractTableModel>
+#include <QAbstractProxyModel>
+
+// Forward Declarations
+class HistoryManager;
 
 
 class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel
@@ -174,7 +173,6 @@ private Q_SLOTS:
 private:
     int sourceDateRow(int row) const;
     mutable QList<int> m_sourceRowCache;
-
 };
 
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index e09b4f48..5037a4d1 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -35,6 +35,7 @@
 // Local Includes
 #include "application.h"
 #include "paneltreeview.h"
+#include "historymanager.h"
 #include "historymodels.h"
 #include "urlfilterproxymodel.h"
 
@@ -45,7 +46,7 @@
 #include <KMessageBox>
 
 // Qt Includes
-#include <QtGui/QHeaderView>
+#include <QHeaderView>
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)