Include Fixes, first bunch

34 files changed, 112 insertions, 105 deletions

diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 9396e76c..eae761e0 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -110,12 +110,14 @@
 // Local Includes
 #include "adblockrule.h"
 
+// KDE Includes
+#include <KIO/Job>
+
 // Qt Includes
 #include <QObject>
 #include <QNetworkReply>
 #include <QStringList>
 #include <QByteArray>
-#include <KIO/Job>
 
 // Forward Includes
 class QNetworkRequest;
diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp
index e0ba3b77..13677daa 100644
--- a/src/adblock/adblocknetworkreply.cpp
+++ b/src/adblock/adblocknetworkreply.cpp
@@ -58,8 +58,10 @@
 #include <klocalizedstring.h>
 
 // Qt Includes
-#include <QNetworkRequest>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtCore/QString>
+
+#include <QtNetwork/QNetworkRequest>
 
 
 AdBlockNetworkReply::AdBlockNetworkReply(const QNetworkRequest &request, const QString &urlString, QObject *parent)
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h
index 79204bcd..14a0672c 100644
--- a/src/adblock/adblocknetworkreply.h
+++ b/src/adblock/adblocknetworkreply.h
@@ -59,10 +59,10 @@
 
 // Qt Includes
 #include <QNetworkReply>
-#include <QString>
 
 // Forward Declarations
 class AdBlockRule;
+class QString;
 
 
 class REKONQ_TESTS_EXPORT AdBlockNetworkReply : public QNetworkReply
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index d69f8a9c..7c91a692 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -57,8 +57,6 @@
 
 // Qt Includes
 #include <QStringList>
-#include <QDebug>
-#include <QRegExp>
 #include <QUrl>
 
 
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index a241ee7d..6f042fe2 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -59,8 +59,8 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QRegExp>
-#include <QString>
+#include <QtCore/QRegExp>
+#include <QtCore/QString>
 
 // Forward Includes
 class QUrl;
diff --git a/src/application.cpp b/src/application.cpp
index 0302558f..02ceed4b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -51,16 +51,12 @@
 #include <KStandardDirs>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
-#include <KToolInvocation>
 #include <KUriFilter>
 #include <KMessageBox>
 #include <KUrl>
 #include <ThreadWeaver/Weaver>
 
 // Qt Includes
-#include <QRegExp>
-#include <QFile>
-#include <QFileInfo>
 #include <QtCore/QTimer>
 
 
diff --git a/src/application.h b/src/application.h
index 44d94e5c..7b58ab18 100644
--- a/src/application.h
+++ b/src/application.h
@@ -36,8 +36,6 @@
 // KDE Includes
 #include <KUniqueApplication>
 #include <KIcon>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
 #include <ThreadWeaver/Job>
 
 // Qt Includes
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 40e4f27d..e3e86f8c 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -41,7 +41,7 @@
 
 
 
-ClickToFlash::ClickToFlash(QUrl pluginUrl, QWidget *parent)
+ClickToFlash::ClickToFlash(const QUrl &pluginUrl, QWidget *parent)
         : QWidget(parent)
         , m_url(pluginUrl)
 {
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 1fd9f9c6..87c53587 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -35,10 +35,9 @@
 // Qt Includes
 #include <QWidget>
 #include <QUrl>
-#include <QWebElement>
 
 // Forward Declarations
-class WebPluginFactory;
+class QWebElement;
 
 
 class REKONQ_TESTS_EXPORT ClickToFlash : public QWidget
@@ -46,7 +45,7 @@ class REKONQ_TESTS_EXPORT ClickToFlash : public QWidget
     Q_OBJECT
 
 public:
-    explicit ClickToFlash(QUrl pluginUrl, QWidget *parent = 0);
+    explicit ClickToFlash(const QUrl &pluginUrl, QWidget *parent = 0);
 
 signals:
     void signalLoadClickToFlash(bool);
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 01d345b8..78691694 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -40,10 +40,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QDateTime>
 #include <QHash>
 #include <QObject>
-#include <QTimer>
 #include <QSortFilterProxyModel>
 #include <QWebHistoryInterface>
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index bcb1d496..03ba27f0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -52,7 +52,6 @@
 #include "ui_cleardata.h"
 
 // KDE Includes
-#include <KUrl>
 #include <KShortcut>
 #include <KStandardAction>
 #include <KAction>
@@ -65,7 +64,6 @@
 #include <KTemporaryFile>
 #include <KPassivePopup>
 #include <KMenuBar>
-#include <KToolBar>
 #include <KJobUiDelegate>
 #include <kdeprintdialog.h>
 #include <KToggleAction>
@@ -80,9 +78,7 @@
 #include <QtCore/QList>
 #include <QtCore/QWeakPointer>
 
-#include <QtGui/QWidget>
 #include <QtGui/QVBoxLayout>
-#include <QtGui/QAction>
 #include <QtGui/QFont>
 #include <QtGui/QDesktopWidget>
 #include <QtGui/QPrinter>
diff --git a/src/mainwindow.h b/src/mainwindow.h
index d6357984..0f0fea96 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -41,12 +41,6 @@
 #include <KUrl>
 
 // Forward Declarations
-class QWebFrame;
-class QSlider;
-
-class KAction;
-class KPassivePopup;
-
 class FindBar;
 class HistoryPanel;
 class BookmarksPanel;
@@ -54,6 +48,13 @@ class WebInspectorPanel;
 class WebTab;
 class MainView;
 
+class KAction;
+class KPassivePopup;
+
+class QWebFrame;
+class QSlider;
+
+
 
 /**
  * This class serves as the main window for rekonq.
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 5e76313c..f177cbf3 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -46,12 +46,11 @@
 #include <KStandardDirs>
 #include <KIconLoader>
 #include <KConfig>
-#include <KConfigGroup>
 #include <KDialog>
 #include <KCalendarSystem>
 
 // Qt Includes
-#include <QFile>
+#include <QtCore/QFile>
 
 
 NewTabPage::NewTabPage(QWebFrame *frame)
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index d0d530fb..58673d60 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -31,9 +31,13 @@
 // Local Includes
 #include "application.h"
 
+// KDE Includes
+#include <KUrl>
+
 // Qt Includes
-#include <QMouseEvent>
-#include <QClipboard>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QClipboard>
 
 
 PanelTreeView::PanelTreeView(QWidget *parent)
@@ -171,7 +175,7 @@ void PanelTreeView::copyToClipboard()
     if (!index.isValid())
         return;
 
-    QClipboard *cb = QApplication::clipboard();
+    QClipboard *cb = Application::clipboard();
     cb->setText(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
 }
 
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
index 93d7a33e..75aee8e7 100644
--- a/src/paneltreeview.h
+++ b/src/paneltreeview.h
@@ -27,14 +27,17 @@
 #ifndef PANELTREEVIEW_H
 #define PANELTREEVIEW_H
 
-// Local Includes
-#include "application.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QTreeView>
 
+// Forward Declarations
+class KUrl;
 
-class PanelTreeView : public QTreeView
+
+class REKONQ_TESTS_EXPORT PanelTreeView : public QTreeView
 {
     Q_OBJECT
 
diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp
index acf20312..cacf6968 100644
--- a/src/previewselectorbar.cpp
+++ b/src/previewselectorbar.cpp
@@ -29,21 +29,26 @@
 #include "previewselectorbar.h"
 #include "previewselectorbar.moc"
 
-// Local Include
+// Self Includes
 #include "rekonq.h"
+
+// Local Include
 #include "websnap.h"
 #include "application.h"
 #include "mainwindow.h"
 #include "webtab.h"
+#include "webpage.h"
 
 // KDE Includes
 #include <KIcon>
 #include <KLocalizedString>
 
 // Qt Includes
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QString>
+#include <QtCore/QString>
+
+#include <QtGui/QToolButton>
+#include <QtGui/QHBoxLayout>
+
 
 
 PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent)
diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h
index c291fb43..6f2acd41 100644
--- a/src/previewselectorbar.h
+++ b/src/previewselectorbar.h
@@ -31,9 +31,6 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "webpage.h"
-
 // Qt Includes
 #include <QWidget>
 #include <QPushButton>
diff --git a/src/searchengine.cpp b/src/searchengine.cpp
index d2bfaf34..0d2c6aea 100644
--- a/src/searchengine.cpp
+++ b/src/searchengine.cpp
@@ -28,6 +28,9 @@
 //local includes
 #include "searchengine.h"
 
+// Auto Includes
+#include "rekonq.h"
+
 //KDE includes
 #include <KConfigGroup>
 #include <KServiceTypeTrader>
diff --git a/src/searchengine.h b/src/searchengine.h
index 691833c1..2e30e056 100644
--- a/src/searchengine.h
+++ b/src/searchengine.h
@@ -31,9 +31,6 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Auto Includes
-#include "rekonq.h"
-
 // KDE Includes
 #include <KService>
 
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index 3a2a8ae5..0b50791d 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -40,8 +40,9 @@
 #include <KStandardDirs>
 
 // Qt Includes
-#include <QFile>
-#include <QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+
 
 
 SessionManager::SessionManager(QObject *parent)
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 230f96d4..6dae6285 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -41,12 +41,13 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QPoint>
-#include <QSize>
-#include <QVBoxLayout>
-#include <QString>
-#include <QEvent>
-#include <QKeyEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+#include <QtCore/QEvent>
+
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QKeyEvent>
+
 
 
 CompletionWidget::CompletionWidget(QWidget *parent)
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 8382742a..fc0798e7 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -32,11 +32,9 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "application.h"
 #include "listitem.h"
 
 // KDE Includes
-#include <KLineEdit>
 #include <KService>
 
 // Qt Includes
@@ -57,6 +55,7 @@ public:
     {
         return _searchEngine;
     };
+    
     void setCurrentEngine(KService::Ptr engine)
     {
         _searchEngine = engine;
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index f8f93dcd..c6f75348 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -40,9 +40,10 @@
 
 // KDE Includes
 #include <KIcon>
-#include <QActionGroup>
+#include <KAction>
 
 // Qt Includes
+#include <QActionGroup>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 328e5af9..6737ed70 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -36,17 +36,17 @@
 
 // KDE Includes
 #include <KToolBar>
-#include <KAction>
 #include <KService>
 
 // Qt Includes
 #include <QWidget>
-#include <QLayout>
 #include <QStyleOptionViewItemV4>
 #include <QLabel>
 
 // Forward Declarations
 class UrlSearchItem;
+class KAction;
+class QActionGroup;
 
 
 class ListItem : public QWidget
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 9e26164e..1cce6e8c 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -36,18 +36,19 @@
 
 // KDE Includes
 #include <KLocalizedString>
-#include <KComboBox>
 #include <KIcon>
 #include <KProcess>
 #include <KMessageBox>
 
 // Qt Includes
-#include <QFormLayout>
-#include <QDialogButtonBox>
-#include <QDBusInterface>
-#include <QDBusConnectionInterface>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QFormLayout>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusConnectionInterface>
+
 
 
 RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index a5bd7b2d..258107eb 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -32,10 +32,12 @@
 
 // KDE Includes
 #include <KComboBox>
+#include <KUrl>
 
 // Qt Includes
-#include <QFrame>
-#include <KUrl>
+#include <QtCore/QMap>
+
+#include <QtGui/QFrame>
 
 
 class RSSWidget : public QFrame
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index ef0ee45c..32e71c23 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -35,6 +35,7 @@
 #include "rekonq.h"
 
 // Local Includes
+#include "application.h"
 #include "mainwindow.h"
 #include "webtab.h"
 #include "webpage.h"
@@ -45,11 +46,11 @@
 #include <KCompletionBox>
 
 // Qt Includes
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPalette>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QVBoxLayout>
+
 
 
 IconButton::IconButton(QWidget *parent)
@@ -65,6 +66,7 @@ void IconButton::mouseReleaseEvent(QMouseEvent* event)
     emit clicked(event->globalPos());
 }
 
+
 // -----------------------------------------------------------------------------------------------------------
 
 
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 2fd02c10..276c2531 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -40,9 +40,7 @@
 #include <KConfigGroup>
 
 // Qt Includes
-#include <QString>
 #include <QByteArray>
-#include <QUrl>
 
 // defines
 #define MAX_ELEMENTS 9
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 3e5115c3..a175a02e 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -70,7 +70,8 @@
 #include <QtGui/QMouseEvent>
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
-#include <QWebFrame>
+
+#include <QtWebKit/QWebFrame>
 
 
 // Returns true if the scheme and domain of the two urls match...
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 8e2be800..aaaed1d5 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -37,12 +37,15 @@
 #include <KStandardDirs>
 
 // Qt Includes
-#include <QSize>
-#include <QWebFrame>
-#include <QWebSettings>
-#include <QPainter>
-#include <QTimer>
-#include <QFile>
+#include <QtCore/QSize>
+#include <QtCore/QTimer>
+#include <QtCore/QFile>
+
+#include <QtGui/QPainter>
+
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebSettings>
+
 
 
 WebSnap::WebSnap(const KUrl& url, QObject *parent)
diff --git a/src/websnap.h b/src/websnap.h
index 3c714c1b..c85dc0d2 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -38,10 +38,12 @@
 
 // Qt Includes
 #include <QtCore/QObject>
-#include <QPixmap>
-#include <QImage>
-#include <QWebPage>
 
+#include <QtGui/QPixmap>
+
+#include <QtWebKit/QWebPage>
+
+// Defines
 #define WIDTH  200
 #define HEIGHT 150
 
diff --git a/src/webtab.cpp b/src/webtab.cpp
index ae4d34c6..e03fb72f 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -53,13 +53,12 @@
 #include <KDE/KMessageBox>
 
 // Qt Includes
-#include <QContextMenuEvent>
-#include <QWheelEvent>
-#include <QMouseEvent>
-#include <QClipboard>
-#include <QKeyEvent>
-#include <QAction>
-#include <QVBoxLayout>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QVBoxLayout>
 
 
 WebTab::WebTab(QWidget *parent)
diff --git a/src/webview.cpp b/src/webview.cpp
index 4d470a40..4209829a 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -48,17 +48,19 @@
 #include <ktoolinvocation.h>
 
 // Qt Includes
-#include <QContextMenuEvent>
-#include <QWheelEvent>
-#include <QMouseEvent>
-#include <QClipboard>
-#include <QKeyEvent>
-#include <QAction>
-#include <QLayout>
+#include <QtCore/QDir>
+
+#include <QtGui/QAction>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLayout>
+
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
-#include <QDir>
 
 
 WebView::WebView(QWidget* parent)
diff --git a/src/webview.h b/src/webview.h
index c4c29d10..71e3047f 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -32,9 +32,6 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "application.h"
-
 // KDE Includes
 #include <KWebView>