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

This reverts commit 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885.

15 files changed, 48 insertions, 60 deletions

diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index 536befb8..b36af2bc 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -41,10 +41,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index c2985759..f70fc750 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -29,7 +29,7 @@
 #define BOOKMARKWIDGET_H
 
 // Qt Includes
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // Forward Declarations
 class KBookmark;
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 92ef4fb9..f4e7220a 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -33,7 +33,7 @@
 
 // Local Includes
 #include "application.h"
-#include "listitem.h"
+#include "urlresolver.h"
 #include "searchengine.h"
 #include "urlbar.h"
 
@@ -42,12 +42,12 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QPoint>
-#include <QSize>
-#include <QEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+#include <QtCore/QEvent>
 
-#include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QKeyEvent>
 
 
 
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 92d1bd39..dc4eb3a4 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "urlresolver.h"
+#include "listitem.h"
 
 // KDE Includes
 #include <KService>
@@ -40,9 +40,6 @@
 // Qt Includes
 #include <QFrame>
 
-// Forward Declarations
-class ListItem;
-
 
 class CompletionWidget : public QFrame
 {
diff --git a/src/urlbar/favoritewidget.cpp b/src/urlbar/favoritewidget.cpp
index 6a4ffaba..f72deace 100644
--- a/src/urlbar/favoritewidget.cpp
+++ b/src/urlbar/favoritewidget.cpp
@@ -35,7 +35,6 @@
 #include "application.h"
 #include "bookmarkmanager.h"
 #include "bookmarkowner.h"
-#include "webtab.h"
 
 // KDE Includes
 #include <KLocalizedString>
@@ -43,10 +42,10 @@
 #include <KLineEdit>
 
 // Qt Includes
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent)
diff --git a/src/urlbar/favoritewidget.h b/src/urlbar/favoritewidget.h
index d0b05f14..c75d2a7e 100644
--- a/src/urlbar/favoritewidget.h
+++ b/src/urlbar/favoritewidget.h
@@ -29,11 +29,11 @@
 
 
 // Qt Includes
-#include <QMenu>
-#include <QCheckBox>
+#include <QtGui/QMenu>
+#include <QtGui/QCheckBox>
 
-// Forward Declarations
-class WebTab;
+// Local Includes
+#include "webtab.h"
 
 
 class FavoriteWidget : public QMenu
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 92552e7e..c66d3727 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -49,6 +49,7 @@
 #include <QActionGroup>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
+#include <QLabel>
 #include <QSizePolicy>
 #include <QPixmap>
 #include <QStylePainter>
@@ -56,7 +57,6 @@
 #include <QWebSettings>
 #include <QFile>
 #include <QTextDocument>
-#include <QBitArray>
 
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
@@ -392,14 +392,14 @@ ImageLabel::ImageLabel(const QString &url, int width, int height, QWidget *paren
     {
         KIO::TransferJob *job = KIO::get(KUrl(url), KIO::NoReload, KIO::HideProgressInfo);
         connect(job,  SIGNAL(data(KIO::Job*,QByteArray)),
-                this, SLOT(slotData(KJob*,QByteArray)));
+                this, SLOT(slotData(KIO::Job*,QByteArray)));
         connect(job,  SIGNAL(result(KJob*)),
                 this, SLOT(slotResult(KJob*)));
     }
 }
 
 
-void ImageLabel::slotData(KJob *job, const QByteArray &data)
+void ImageLabel::slotData(KIO::Job *job, const QByteArray &data)
 {
     Q_UNUSED(job);
     m_data.append(data);
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 84e3501b..c2f79c93 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -31,25 +31,22 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+// Local Includes
+#include "urlresolver.h"
+
 // KDE Includes
 #include <KToolBar>
 #include <KService>
-#include <KUrl>
+#include <KIcon>
 
 // Qt Includes
 #include <QWidget>
-#include <QLabel>
 #include <QStyleOptionViewItemV4>
-#include <QString>
-#include <QByteArray>
+#include <QLabel>
 
 // Forward Declarations
 class UrlSearchItem;
-
 class KAction;
-class KIcon;
-class KJob;
-
 class QActionGroup;
 
 
@@ -261,7 +258,7 @@ private:
     QByteArray m_data;
 
 private Q_SLOTS:
-    void slotData(KJob* job, const QByteArray& data);
+    void slotData(KIO::Job* job, const QByteArray& data);
     void slotResult(KJob* job);
 };
 
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 2e452fbb..d4778cf5 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -42,13 +42,13 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QDBusConnectionInterface>
-#include <QDBusInterface>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
 
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
 
 
 RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index eaa3de7d..702ea3ae 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -28,7 +28,7 @@
 #define RSSWIDGET_H
 
 // Qt Includes
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // Forward Declarations
 class KComboBox;
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 52724733..127dae86 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -34,13 +34,11 @@
 #include "sslinfodialog.h"
 
 // Qt Includes
-#include <QPointer>
-
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QTextDocument>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QTextDocument>
 
 
 SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
diff --git a/src/urlbar/sslwidget.h b/src/urlbar/sslwidget.h
index dd6f020d..bc1e2291 100644
--- a/src/urlbar/sslwidget.h
+++ b/src/urlbar/sslwidget.h
@@ -32,9 +32,8 @@
 #include "websslinfo.h"
 
 // Qt Includes
-#include <QMenu>
-
-#include <QUrl>
+#include <QtGui/QMenu>
+#include <QtCore/QUrl>
 
 
 class SSLWidget : public QMenu
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 2b4b7bf0..43109db3 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -55,12 +55,11 @@
 #include <KMenu>
 
 // Qt Includes
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPalette>
-#include <QVBoxLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QVBoxLayout>
 #include <QClipboard>
-#include <QTimer>
 
 
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 97a5e9a4..57b3e11e 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -34,7 +34,6 @@
 // Locale Includes
 #include "application.h"
 #include "opensearchmanager.h"
-#include "suggestionparser.h"
 
 // KDE Includes
 #include <KUrl>
@@ -43,6 +42,7 @@
 // Qt Includes
 #include <QString>
 #include <QList>
+#include "suggestionparser.h"
 
 
 class UrlSearchItem
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index 409d0b32..d44f6f1a 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -42,7 +42,6 @@
 #include <QDialogButtonBox>
 #include <QFormLayout>
 
-
 WebShortcutWidget::WebShortcutWidget(QWidget *parent)
     : QMenu(parent)
     , m_wsLineEdit(new QLineEdit(this))