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/urlbar/bookmarkwidget.cpp    |  8 ++++----
 src/urlbar/bookmarkwidget.h      |  2 +-
 src/urlbar/completionwidget.cpp  | 12 ++++++------
 src/urlbar/completionwidget.h    |  5 ++++-
 src/urlbar/favoritewidget.cpp    |  9 +++++----
 src/urlbar/favoritewidget.h      |  8 ++++----
 src/urlbar/listitem.cpp          |  6 +++---
 src/urlbar/listitem.h            | 15 +++++++++------
 src/urlbar/rsswidget.cpp         | 12 ++++++------
 src/urlbar/rsswidget.h           |  2 +-
 src/urlbar/sslwidget.cpp         | 12 +++++++-----
 src/urlbar/sslwidget.h           |  5 +++--
 src/urlbar/urlbar.cpp            |  9 +++++----
 src/urlbar/urlresolver.h         |  2 +-
 src/urlbar/webshortcutwidget.cpp |  1 +
 15 files changed, 60 insertions(+), 48 deletions(-)

(limited to 'src/urlbar')

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