diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-04-20 23:31:41 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-20 23:47:32 +0200 |
| commit | 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885 (patch) | |
| tree | 61b57a16e83c5a170799f9abfc6b667911966992 /src/adblock | |
| parent | Fix apturl handling (workaround) (diff) | |
| download | rekonq-962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885.tar.xz | |
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
Diffstat (limited to 'src/adblock')
| -rw-r--r-- | src/adblock/adblockmanager.cpp | 2 | ||||
| -rw-r--r-- | src/adblock/adblockmanager.h | 2 | ||||
| -rw-r--r-- | src/adblock/adblockwidget.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index 5078f215..a9ac0612 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -44,6 +44,8 @@ // Qt Includes #include <QUrl> #include <QWebElement> +#include <QNetworkReply> +#include <QNetworkRequest> AdBlockManager::AdBlockManager(QObject *parent) diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index 9d746e18..07bed803 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -133,11 +133,11 @@ // Qt Includes #include <QObject> -#include <QNetworkReply> #include <QStringList> #include <QByteArray> // Forward Includes +class QNetworkReply; class QNetworkRequest; class WebPage; diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h index 3c7c667b..b54134e0 100644 --- a/src/adblock/adblockwidget.h +++ b/src/adblock/adblockwidget.h @@ -32,8 +32,7 @@ #include "ui_settings_adblock.h" // Qt Includes -#include <QtGui/QWidget> -#include <QtGui/QTreeWidgetItem> +#include <QWidget> class AdBlockWidget : public QWidget, private Ui::adblock |