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/opensearch | |
| 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/opensearch')
| -rw-r--r-- | src/opensearch/opensearchmanager.cpp | 6 | ||||
| -rw-r--r-- | src/opensearch/opensearchmanager.h | 3 | ||||
| -rw-r--r-- | src/opensearch/opensearchreader.cpp | 2 | ||||
| -rw-r--r-- | src/opensearch/opensearchreader.h | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp index 12b93ec2..480e9a26 100644 --- a/src/opensearch/opensearchmanager.cpp +++ b/src/opensearch/opensearchmanager.cpp @@ -31,10 +31,10 @@ #include "opensearchmanager.moc" // Local Includes +#include "application.h" #include "opensearchengine.h" #include "opensearchreader.h" #include "opensearchwriter.h" -#include "application.h" // KDE Includes #include <KGlobal> @@ -47,8 +47,8 @@ #include <KConfigGroup> // Qt Includes -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QFile> +#include <QFileInfo> #include <QDBusMessage> #include <QDBusConnection> diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h index 84272f26..e698e0ee 100644 --- a/src/opensearch/opensearchmanager.h +++ b/src/opensearch/opensearchmanager.h @@ -40,8 +40,7 @@ #include <kio/jobclasses.h> // Qt Includes -#include <QtCore/QObject> -#include <QFile> +#include <QObject> // Forward Declarations class OpenSearchEngine; diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp index c2bf0f09..897fca29 100644 --- a/src/opensearch/opensearchreader.cpp +++ b/src/opensearch/opensearchreader.cpp @@ -38,7 +38,7 @@ #include <KLocalizedString> // Qt Includes -#include <QtCore/QIODevice> +#include <QIODevice> OpenSearchReader::OpenSearchReader() diff --git a/src/opensearch/opensearchreader.h b/src/opensearch/opensearchreader.h index 70b560f1..d1c644ae 100644 --- a/src/opensearch/opensearchreader.h +++ b/src/opensearch/opensearchreader.h @@ -34,7 +34,7 @@ #include "rekonq_defines.h" // Qt Includes -#include <QtCore/QXmlStreamReader> +#include <QXmlStreamReader> // Forward Declarations class OpenSearchEngine; |