summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Małek <michalm@jabster.pl>2014-08-07 09:10:45 (GMT)
committerMichał Małek <michalm@jabster.pl>2014-08-07 09:10:45 (GMT)
commit73cc9990f2982d0259eba5b7b3ce65cc8d4037c3 (patch)
tree57c2f8f12240023fba3bcf65d9b177b58bd538fb
parent1d4f4777318e4c464accb0c33a91fcdc753b5022 (diff)
Cleaned up header inclusion
-rw-r--r--kcmcddb/cddbconfigwidget.cpp9
-rw-r--r--kcmcddb/doc/CMakeLists.txt1
-rw-r--r--kcmcddb/kcmcddb.cpp8
-rw-r--r--kcmcddb/kcmcddb.h2
-rw-r--r--libkcddb/asynccddbplookup.h1
-rw-r--r--libkcddb/asynchttplookup.cpp4
-rw-r--r--libkcddb/asynchttpsubmit.cpp2
-rw-r--r--libkcddb/asyncsmtpsubmit.cpp3
-rw-r--r--libkcddb/cache.cpp6
-rw-r--r--libkcddb/cache.h5
-rw-r--r--libkcddb/categories.h4
-rw-r--r--libkcddb/cddb.cpp6
-rw-r--r--libkcddb/cddb.h5
-rw-r--r--libkcddb/cddbplookup.cpp2
-rw-r--r--libkcddb/cddbplookup.h4
-rw-r--r--libkcddb/cdinfo.cpp2
-rw-r--r--libkcddb/cdinfo.h2
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp2
-rw-r--r--libkcddb/client.h4
-rw-r--r--libkcddb/genres.h2
-rw-r--r--libkcddb/httplookup.cpp2
-rw-r--r--libkcddb/kcddbconfig.cpp2
-rw-r--r--libkcddb/lookup.h5
-rw-r--r--libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp3
-rw-r--r--libkcddb/musicbrainz/musicbrainzlookup.cpp16
-rw-r--r--libkcddb/submit.h2
-rw-r--r--test/asynccddblookuptest.h2
-rw-r--r--test/asynchttplookuptest.h2
-rw-r--r--test/asynchttpsubmittest.h2
-rw-r--r--test/asyncmusicbrainztest.h2
-rw-r--r--test/asyncsmtpsubmittest.h2
-rw-r--r--test/cachetest.h2
-rw-r--r--test/cdinfotest.h2
-rw-r--r--test/musicbrainztest-fulldate.h2
-rw-r--r--test/musicbrainztest-severaldiscs.h2
-rw-r--r--test/musicbrainztest.h2
-rw-r--r--test/synccddblookuptest.h2
-rw-r--r--test/synchttplookuptest.h2
-rw-r--r--test/utf8test.h2
39 files changed, 64 insertions, 66 deletions
diff --git a/kcmcddb/cddbconfigwidget.cpp b/kcmcddb/cddbconfigwidget.cpp
index 1cb2d1c..07d9ea2 100644
--- a/kcmcddb/cddbconfigwidget.cpp
+++ b/kcmcddb/cddbconfigwidget.cpp
@@ -25,11 +25,12 @@
#include "libkcddb/sites.h"
#include "libkcddb/lookup.h"
-#include <qlist.h>
#include <KI18n/KLocalizedString>
-#include <kmessagebox.h>
-#include <keditlistwidget.h>
-#include <kurlrequester.h>
+#include <KIOWidgets/KUrlRequester>
+#include <KWidgetsAddons/KMessageBox>
+#include <KWidgetsAddons/KEditListWidget>
+
+#include <QtCore/QList>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QInputDialog>
diff --git a/kcmcddb/doc/CMakeLists.txt b/kcmcddb/doc/CMakeLists.txt
index c702409..5839d56 100644
--- a/kcmcddb/doc/CMakeLists.txt
+++ b/kcmcddb/doc/CMakeLists.txt
@@ -1,2 +1 @@
-########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cddbretrieval)
diff --git a/kcmcddb/kcmcddb.cpp b/kcmcddb/kcmcddb.cpp
index d6afb21..d9d3864 100644
--- a/kcmcddb/kcmcddb.cpp
+++ b/kcmcddb/kcmcddb.cpp
@@ -25,15 +25,15 @@
#include "libkcddb/cache.h"
#include "libkcddb/submit.h"
+#include <KCoreAddons/KPluginFactory>
+#include <KI18n/KLocalizedString>
+#include <KWidgetsAddons/KMessageBox>
+
#include <QtCore/QDebug>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QVBoxLayout>
-#include <KI18n/KLocalizedString>
-#include <KCoreAddons/KPluginFactory>
-#include <kmessagebox.h>
-
K_PLUGIN_FACTORY(KCDDBFactory, registerPlugin<CDDBModule>();)
K_EXPORT_PLUGIN(KCDDBFactory( "kcmcddb" ))
diff --git a/kcmcddb/kcmcddb.h b/kcmcddb/kcmcddb.h
index 9ecf628..6780826 100644
--- a/kcmcddb/kcmcddb.h
+++ b/kcmcddb/kcmcddb.h
@@ -20,7 +20,7 @@
#ifndef KCMCDDB_H
#define KCMCDDB_H
-#include <kcmodule.h>
+#include <KConfigWidgets/KCModule>
#include "libkcddb/kcddbconfig.h"
class CDDBConfigWidget;
diff --git a/libkcddb/asynccddbplookup.h b/libkcddb/asynccddbplookup.h
index 0b2aa2a..4079b25 100644
--- a/libkcddb/asynccddbplookup.h
+++ b/libkcddb/asynccddbplookup.h
@@ -21,7 +21,6 @@
#ifndef KCDDB_ASYNC_CDDBP_LOOKUP_H
#define KCDDB_ASYNC_CDDBP_LOOKUP_H
-
#include "cddbplookup.h"
namespace KCDDB
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index d033700..cbe9aaa 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -21,9 +21,7 @@
#include "asynchttplookup.h"
#include "logging.h"
-#include <qstringlist.h>
-
-#include <kio/job.h>
+#include <KIO/Job>
namespace KCDDB
{
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 3f54857..31ed186 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -19,7 +19,7 @@
#include "asynchttpsubmit.h"
-#include <kio/job.h>
+#include <KIO/Job>
#include <QtCore/QDebug>
namespace KCDDB
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index 4ead760..e5b7505 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -22,8 +22,7 @@
#include "cdinfo.h"
-
-#include <kio/job.h>
+#include <KIO/Job>
namespace KCDDB
{
diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp
index 73057c4..055c14a 100644
--- a/libkcddb/cache.cpp
+++ b/libkcddb/cache.cpp
@@ -31,9 +31,9 @@
#include "musicbrainz/musicbrainzlookup.h"
#endif
-#include <QFile>
-#include <QDir>
-#include <QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QTextStream>
namespace KCDDB
{
diff --git a/libkcddb/cache.h b/libkcddb/cache.h
index 0f4be7a..3858ad4 100644
--- a/libkcddb/cache.h
+++ b/libkcddb/cache.h
@@ -22,12 +22,11 @@
#ifndef KCDDB_CACHE_H
#define KCDDB_CACHE_H
-#include <qpair.h>
-#include <QString>
-
#include "kcddb.h"
#include "cdinfo.h"
+#include <QtCore/QString>
+
namespace KCDDB
{
class Config;
diff --git a/libkcddb/categories.h b/libkcddb/categories.h
index c2d28fa..2c13861 100644
--- a/libkcddb/categories.h
+++ b/libkcddb/categories.h
@@ -8,8 +8,8 @@
#ifndef KCDDB_CATEGORIES_H
#define KCDDB_CATEGORIES_H
-#include <QString>
-#include <qstringlist.h>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
namespace KCDDB
{
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index f1e3a15..34c3787 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -23,11 +23,11 @@
#include "categories.h"
-#include <qstringlist.h>
+#include <KCoreAddons/KStringHandler>
+#include <KI18n/KLocalizedString>
#include <QtCore/QDebug>
-#include <kstringhandler.h>
-#include <KI18n/KLocalizedString>
+#include <QtCore/QStringList>
namespace KCDDB
{
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index 202f1d9..8adc077 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -22,12 +22,13 @@
#ifndef KCDDB_CDDB_H
#define KCDDB_CDDB_H
-#include <QtCore/QString>
-#include <QtCore/QList>
#include <libkcddb/kcddb.h>
#include <libkcddb/cdinfo.h>
#include <libkcddb/kcddbconfig.h>
+#include <QtCore/QList>
+#include <QtCore/QString>
+
namespace KCDDB
{
class CDDB
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index a77b76c..06a7f9f 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -22,7 +22,7 @@
#include "cddbplookup.h"
#include "logging.h"
-#include <qbytearray.h>
+#include <QtCore/QByteArray>
namespace KCDDB
{
diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h
index 4641464..ee5aaf6 100644
--- a/libkcddb/cddbplookup.h
+++ b/libkcddb/cddbplookup.h
@@ -22,10 +22,10 @@
#ifndef KCDDB_CDDBP_LOOKUP_H
#define KCDDB_CDDBP_LOOKUP_H
-#include <QtNetwork/QTcpSocket>
-
#include "lookup.h"
+#include <QtNetwork/QTcpSocket>
+
namespace KCDDB
{
class CDDBPLookup : public Lookup
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index e99418d..4c1d67e 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -26,8 +26,8 @@
#include "cddb.h"
#include "logging.h"
+#include <KCoreAddons/KStringHandler>
#include <QtCore/QDebug>
-#include <kstringhandler.h>
#include <QMap>
diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h
index 6322f59..a8702d8 100644
--- a/libkcddb/cdinfo.h
+++ b/libkcddb/cdinfo.h
@@ -22,9 +22,9 @@
#ifndef KCDDB_CDINFO_H
#define KCDDB_CDINFO_H
+#include <libkcddb/kcddb_export.h>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
-#include <libkcddb/kcddb_export.h>
namespace KCDDB
{
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 9f1ca88..a9c38b8 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -19,9 +19,9 @@
#include "cdinfoencodingwidget.h"
-#include <QtCore/QTextCodec>
#include <KCodecs/KCharsets>
#include <KI18n/KLocalizedString>
+#include <QtCore/QTextCodec>
namespace KCDDB
{
diff --git a/libkcddb/client.h b/libkcddb/client.h
index 9a3692d..30e39d2 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -21,10 +21,10 @@
#ifndef KCDDB_CLIENT_H
#define KCDDB_CLIENT_H
-#include "kcddbconfig.h"
#include "cdinfo.h"
-#include <QtCore/QObject>
#include "kcddb.h"
+#include "kcddbconfig.h"
+#include <QtCore/QObject>
namespace KCDDB
{
diff --git a/libkcddb/genres.h b/libkcddb/genres.h
index d0fe2bb..de3dca3 100644
--- a/libkcddb/genres.h
+++ b/libkcddb/genres.h
@@ -8,8 +8,8 @@
#ifndef KCDDB_GENRES_H
#define KCDDB_GENRES_H
-#include <QtCore/QStringList>
#include <libkcddb/kcddb_export.h>
+#include <QtCore/QStringList>
namespace KCDDB
{
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index 0b3c9f3..0a5044d 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -22,8 +22,8 @@
#include "httplookup.h"
#include <KIO/Job>
-#include <QtCore/QUrlQuery>
#include <QtCore/QDebug>
+#include <QtCore/QUrlQuery>
namespace KCDDB
{
diff --git a/libkcddb/kcddbconfig.cpp b/libkcddb/kcddbconfig.cpp
index cd0429a..6cb99a6 100644
--- a/libkcddb/kcddbconfig.cpp
+++ b/libkcddb/kcddbconfig.cpp
@@ -22,7 +22,7 @@
#include <libkcddb/kcddbconfig.h>
-#include <kemailsettings.h>
+#include <KConfigCore/KEMailSettings>
namespace KCDDB
{
diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h
index 5b5556b..fec63ce 100644
--- a/libkcddb/lookup.h
+++ b/libkcddb/lookup.h
@@ -22,11 +22,12 @@
#ifndef KCDDB_LOOKUP_H
#define KCDDB_LOOKUP_H
+#include <libkcddb/cddb.h>
+#include <libkcddb/cdinfo.h>
+
#include <QtCore/QList>
#include <QtCore/QObject>
#include <QtCore/QPair>
-#include <libkcddb/cddb.h>
-#include <libkcddb/cdinfo.h>
namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
index d17a758..a9f8afe 100644
--- a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
@@ -21,9 +21,8 @@
#include "musicbrainzlookup.h"
-#include <QtCore/QThread>
-
#include <QtCore/QDebug>
+#include <QtCore/QThread>
namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp
index 776c4ed..6accc69 100644
--- a/libkcddb/musicbrainz/musicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp
@@ -17,15 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-
#include "musicbrainzlookup.h"
-#include <QtCore/QDebug>
-#include <kcodecs.h>
-#include <KI18n/KLocalizedString>
-#include <qcryptographichash.h>
-#include <cstdio>
-#include <cstring>
#include <musicbrainz5/Query.h>
#include <musicbrainz5/Medium.h>
#include <musicbrainz5/Release.h>
@@ -39,6 +32,15 @@
#include <musicbrainz5/NameCredit.h>
#include <musicbrainz5/SecondaryType.h>
+#include <KCodecs/KCodecs>
+#include <KI18n/KLocalizedString>
+
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDebug>
+
+#include <cstdio>
+#include <cstring>
+
namespace KCDDB
{
MusicBrainzLookup::MusicBrainzLookup()
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index e46fedb..ae83222 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -25,7 +25,7 @@
#include "cddb.h"
#include "cdinfo.h"
-#include <QObject>
+#include <QtCore/QObject>
namespace KIO
{
diff --git a/test/asynccddblookuptest.h b/test/asynccddblookuptest.h
index 5ce40fb..efa6fce 100644
--- a/test/asynccddblookuptest.h
+++ b/test/asynccddblookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QObject>
+#include <QtCore/QObject>
#include <libkcddb/client.h>
#include <libkcddb/kcddb.h>
diff --git a/test/asynchttplookuptest.h b/test/asynchttplookuptest.h
index bcddc58..1c92b42 100644
--- a/test/asynchttplookuptest.h
+++ b/test/asynchttplookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QObject>
+#include <QtCore/QObject>
#include <libkcddb/client.h>
#include <libkcddb/kcddb.h>
diff --git a/test/asynchttpsubmittest.h b/test/asynchttpsubmittest.h
index ba89ecf..5f061b9 100644
--- a/test/asynchttpsubmittest.h
+++ b/test/asynchttpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H
-#include <QObject>
+#include <QtCore/QObject>
#include <libkcddb/client.h>
using namespace KCDDB;
diff --git a/test/asyncmusicbrainztest.h b/test/asyncmusicbrainztest.h
index b56fdc2..6187a95 100644
--- a/test/asyncmusicbrainztest.h
+++ b/test/asyncmusicbrainztest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QObject>
+#include <QtCore/QObject>
#include <libkcddb/client.h>
#include <libkcddb/kcddb.h>
diff --git a/test/asyncsmtpsubmittest.h b/test/asyncsmtpsubmittest.h
index 0d19114..06b8801 100644
--- a/test/asyncsmtpsubmittest.h
+++ b/test/asyncsmtpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H
-#include <QObject>
+#include <QtCore/QObject>
#include <libkcddb/client.h>
using namespace KCDDB;
diff --git a/test/cachetest.h b/test/cachetest.h
index 6f8820d..1a67813 100644
--- a/test/cachetest.h
+++ b/test/cachetest.h
@@ -28,7 +28,7 @@ namespace KCDDB
class Client;
}
-#include <QObject>
+#include <QtCore/QObject>
class CacheTest : public QObject
{
diff --git a/test/cdinfotest.h b/test/cdinfotest.h
index 12d4749..70db442 100644
--- a/test/cdinfotest.h
+++ b/test/cdinfotest.h
@@ -20,7 +20,7 @@
#ifndef CDINFOTEST_H
#define CDINFOTEST_H
-#include <QObject>
+#include <QtCore/QObject>
class CDInfoTest : public QObject
{
diff --git a/test/musicbrainztest-fulldate.h b/test/musicbrainztest-fulldate.h
index 8ab56c1..9f9cf01 100644
--- a/test/musicbrainztest-fulldate.h
+++ b/test/musicbrainztest-fulldate.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTFULLDATE_H
#define MUSICBRAINZTESTFULLDATE_H
-#include <QObject>
+#include <QtCore/QObject>
class MusicBrainzTestFullDate : public QObject
{
diff --git a/test/musicbrainztest-severaldiscs.h b/test/musicbrainztest-severaldiscs.h
index 87655f6..f792f5d 100644
--- a/test/musicbrainztest-severaldiscs.h
+++ b/test/musicbrainztest-severaldiscs.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTSEVERALDISCS_H
#define MUSICBRAINZTESTSEVERALDISCS_H
-#include <QObject>
+#include <QtCore/QObject>
class MusicBrainzTestSeveralDiscs : public QObject
{
diff --git a/test/musicbrainztest.h b/test/musicbrainztest.h
index df9d2b3..0a8ec21 100644
--- a/test/musicbrainztest.h
+++ b/test/musicbrainztest.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTEST_H
#define MUSICBRAINZTEST_H
-#include <QObject>
+#include <QtCore/QObject>
class MusicBrainzTest : public QObject
{
diff --git a/test/synccddblookuptest.h b/test/synccddblookuptest.h
index 01a750f..7687464 100644
--- a/test/synccddblookuptest.h
+++ b/test/synccddblookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCCDDBLOOKUPTEST_H
#define SYNCCDDBLOOKUPTEST_H
-#include <QObject>
+#include <QtCore/QObject>
class SyncCDDBLookupTest : public QObject
{
diff --git a/test/synchttplookuptest.h b/test/synchttplookuptest.h
index 72e3ddc..8a12b31 100644
--- a/test/synchttplookuptest.h
+++ b/test/synchttplookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCHTTPLOOKUPTEST_H
#define SYNCHTTPLOOKUPTEST_H
-#include <QObject>
+#include <QtCore/QObject>
class SyncHTTPLookupTest : public QObject
{
diff --git a/test/utf8test.h b/test/utf8test.h
index 631dafd..2298b0e 100644
--- a/test/utf8test.h
+++ b/test/utf8test.h
@@ -20,7 +20,7 @@
#ifndef UTF8TEST_H
#define UTF8TEST_H
-#include <QObject>
+#include <QtCore/QObject>
class Utf8Test : public QObject
{