[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libkcddb] /: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-04 19:41:01
Message-ID: E1fxHC9-0005z1-8n () code ! kde ! org
[Download RAW message or body]
Git commit 79c0c8d6791c162a43113b1fab1590161341613e by Yuri Chornoivan.
Committed on 04/09/2018 at 19:40.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +3 -3 kcmcddb/cddbconfigwidget.cpp
M +1 -1 kcmcddb/cddbconfigwidget.h
M +4 -4 kcmcddb/kcmcddb.cpp
M +0 -1 kcmcddb/kcmcddbi18n.h
M +1 -1 libkcddb/asynchttpsubmit.cpp
M +3 -3 libkcddb/cache.cpp
M +1 -1 libkcddb/cache.h
M +2 -2 libkcddb/categories.h
M +2 -2 libkcddb/cddb.cpp
M +2 -2 libkcddb/cddb.h
M +1 -1 libkcddb/cddbplookup.cpp
M +1 -1 libkcddb/cddbplookup.h
M +1 -1 libkcddb/cdinfo.cpp
M +2 -2 libkcddb/cdinfo.h
M +8 -8 libkcddb/cdinfodialog.cpp
M +1 -1 libkcddb/cdinfodialog.h
M +1 -1 libkcddb/cdinfoencodingwidget.cpp
M +1 -1 libkcddb/client.h
M +1 -1 libkcddb/genres.h
M +2 -2 libkcddb/httplookup.cpp
M +1 -1 libkcddb/httplookup.h
M +1 -1 libkcddb/httpsubmit.cpp
M +1 -1 libkcddb/httpsubmit.h
M +2 -2 libkcddb/kcddb.h
M +1 -1 libkcddb/logging.h
M +1 -1 libkcddb/lookup.cpp
M +3 -3 libkcddb/lookup.h
M +2 -2 libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
M +3 -3 libkcddb/musicbrainz/musicbrainzlookup.cpp
M +5 -5 libkcddb/sites.cpp
M +1 -1 libkcddb/sites.h
M +1 -1 libkcddb/smtpsubmit.h
M +1 -1 libkcddb/submit.h
M +1 -1 libkcddb/synccddbplookup.cpp
M +1 -1 tests/asynccddblookuptest.cpp
M +1 -1 tests/asynccddblookuptest.h
M +1 -1 tests/asynchttplookuptest.cpp
M +1 -1 tests/asynchttplookuptest.h
M +3 -3 tests/asynchttpsubmittest.cpp
M +1 -1 tests/asynchttpsubmittest.h
M +1 -1 tests/asyncmusicbrainztest.cpp
M +1 -1 tests/asyncmusicbrainztest.h
M +3 -3 tests/asyncsmtpsubmittest.cpp
M +1 -1 tests/asyncsmtpsubmittest.h
M +1 -1 tests/cachetest.cpp
M +1 -1 tests/cachetest.h
M +3 -3 tests/cdinfotest.cpp
M +1 -1 tests/cdinfotest.h
M +1 -1 tests/musicbrainztest-fulldate.cpp
M +1 -1 tests/musicbrainztest-fulldate.h
M +1 -1 tests/musicbrainztest-severaldiscs.cpp
M +1 -1 tests/musicbrainztest-severaldiscs.h
M +1 -1 tests/musicbrainztest.cpp
M +1 -1 tests/musicbrainztest.h
M +3 -3 tests/sitestest.cpp
M +2 -2 tests/synccddblookuptest.cpp
M +1 -1 tests/synccddblookuptest.h
M +2 -2 tests/synchttplookuptest.cpp
M +1 -1 tests/synchttplookuptest.h
M +2 -2 tests/synchttpsubmittest.cpp
M +2 -2 tests/syncsmtpsubmittest.cpp
M +2 -2 tests/utf8test.cpp
M +1 -1 tests/utf8test.h
https://commits.kde.org/libkcddb/79c0c8d6791c162a43113b1fab1590161341613e
diff --git a/kcmcddb/cddbconfigwidget.cpp b/kcmcddb/cddbconfigwidget.cpp
index f740f60..32b485c 100644
--- a/kcmcddb/cddbconfigwidget.cpp
+++ b/kcmcddb/cddbconfigwidget.cpp
@@ -30,9 +30,9 @@
#include <KWidgetsAddons/KMessageBox>
#include <KWidgetsAddons/KEditListWidget>
-#include <QtCore/QList>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QInputDialog>
+#include <QList>
+#include <QCheckBox>
+#include <QInputDialog>
CDDBConfigWidget::CDDBConfigWidget(QWidget * parent)
: QWidget(parent)
diff --git a/kcmcddb/cddbconfigwidget.h b/kcmcddb/cddbconfigwidget.h
index b35f956..ccde242 100644
--- a/kcmcddb/cddbconfigwidget.h
+++ b/kcmcddb/cddbconfigwidget.h
@@ -28,7 +28,7 @@ class CDDBConfigWidget : public QWidget, public Ui::CDDBConfigWidgetBase
public:
- CDDBConfigWidget(QWidget * parent = nullptr);
+ explicit CDDBConfigWidget(QWidget * parent = nullptr);
protected Q_SLOTS:
diff --git a/kcmcddb/kcmcddb.cpp b/kcmcddb/kcmcddb.cpp
index b6fd00c..1c469e7 100644
--- a/kcmcddb/kcmcddb.cpp
+++ b/kcmcddb/kcmcddb.cpp
@@ -29,10 +29,10 @@
#include <KCoreAddons/KPluginFactory>
#include <KWidgetsAddons/KMessageBox>
-#include <QtCore/QDebug>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QVBoxLayout>
+#include <QDebug>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QVBoxLayout>
K_PLUGIN_FACTORY(KCDDBFactory, registerPlugin<CDDBModule>();)
K_EXPORT_PLUGIN(KCDDBFactory( "kcmcddb" ))
diff --git a/kcmcddb/kcmcddbi18n.h b/kcmcddb/kcmcddbi18n.h
index 1e4703c..d19c34c 100644
--- a/kcmcddb/kcmcddbi18n.h
+++ b/kcmcddb/kcmcddbi18n.h
@@ -1,7 +1,6 @@
#ifndef KCMCDDBI18N_H
#define KCMCDDBI18N_H
-#define TRANSLATION_DOMAIN "kcmcddb"
#include <KI18n/KLocalizedString>
#endif // KCMCDDBI18N_H
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 31ed186..e820df6 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -20,7 +20,7 @@
#include "asynchttpsubmit.h"
#include <KIO/Job>
-#include <QtCore/QDebug>
+#include <QDebug>
namespace KCDDB
{
diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp
index 1c3846a..de28a01 100644
--- a/libkcddb/cache.cpp
+++ b/libkcddb/cache.cpp
@@ -31,9 +31,9 @@
#include "musicbrainz/musicbrainzlookup.h"
#endif
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QDir>
+#include <QTextStream>
namespace KCDDB
{
diff --git a/libkcddb/cache.h b/libkcddb/cache.h
index 3858ad4..50d39f7 100644
--- a/libkcddb/cache.h
+++ b/libkcddb/cache.h
@@ -25,7 +25,7 @@
#include "kcddb.h"
#include "cdinfo.h"
-#include <QtCore/QString>
+#include <QString>
namespace KCDDB
{
diff --git a/libkcddb/categories.h b/libkcddb/categories.h
index fde1392..d41d40e 100644
--- a/libkcddb/categories.h
+++ b/libkcddb/categories.h
@@ -9,8 +9,8 @@
#define KCDDB_CATEGORIES_H
#include <kcddb_export.h>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
namespace KCDDB
{
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index e86fe9f..52c8528 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -26,8 +26,8 @@
#include <KCoreAddons/KStringHandler>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>
namespace KCDDB
{
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index d914025..e1c9e03 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -26,8 +26,8 @@
#include <cdinfo.h>
#include <kcddbconfig.h>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
namespace KCDDB
{
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index b5c6d11..6bad288 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -22,7 +22,7 @@
#include "cddbplookup.h"
#include "logging.h"
-#include <QtCore/QByteArray>
+#include <QByteArray>
namespace KCDDB
{
diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h
index ee5aaf6..b66762e 100644
--- a/libkcddb/cddbplookup.h
+++ b/libkcddb/cddbplookup.h
@@ -24,7 +24,7 @@
#include "lookup.h"
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
namespace KCDDB
{
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index 9b23793..2ae8bb2 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -27,7 +27,7 @@
#include "logging.h"
#include <KCoreAddons/KStringHandler>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QMap>
diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h
index 4cb03a3..4910c03 100644
--- a/libkcddb/cdinfo.h
+++ b/libkcddb/cdinfo.h
@@ -23,8 +23,8 @@
#define KCDDB_CDINFO_H
#include <kcddb_export.h>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>
namespace KCDDB
{
diff --git a/libkcddb/cdinfodialog.cpp b/libkcddb/cdinfodialog.cpp
index ded87f1..3092fb4 100644
--- a/libkcddb/cdinfodialog.cpp
+++ b/libkcddb/cdinfodialog.cpp
@@ -26,13 +26,13 @@
#include <KCodecs/KCharsets>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTime>
-#include <QtGui/QStandardItemModel>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QDialogButtonBox>
+#include <QDebug>
+#include <QStringList>
+#include <QTextCodec>
+#include <QTime>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
+#include <QDialogButtonBox>
using KCDDB::TrackInfo;
@@ -151,7 +151,7 @@ class CDInfoDialog::Private
QStringList labels;
labels << i18n("Track") << i18n("Length") << i18n("Title") << i18n("Artist") << i18n("Comment");
m_trackModel->setHorizontalHeaderLabels(labels);
- for (unsigned i = 0; i < tracks; i++) {
+ for (unsigned i = 0; i < tracks; ++i) {
QList<QStandardItem *> trackItems = QList<QStandardItem *>();
TrackInfo ti(info.track(i));
QStandardItem *trackNumberItem = new QStandardItem(QString().sprintf("%02d", i + 1));
diff --git a/libkcddb/cdinfodialog.h b/libkcddb/cdinfodialog.h
index 7bbbaca..cc34f4c 100644
--- a/libkcddb/cdinfodialog.h
+++ b/libkcddb/cdinfodialog.h
@@ -24,7 +24,7 @@
#include <cdinfo.h>
#include <kcddb.h>
-#include <QtWidgets/QDialog>
+#include <QDialog>
class QStandardItemModel;
class QModelIndex;
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 568cfe7..ba382ea 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -22,7 +22,7 @@
#include "kcddbi18n.h"
#include <KCodecs/KCharsets>
-#include <QtCore/QTextCodec>
+#include <QTextCodec>
namespace KCDDB
{
diff --git a/libkcddb/client.h b/libkcddb/client.h
index 30e39d2..adb4747 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -24,7 +24,7 @@
#include "cdinfo.h"
#include "kcddb.h"
#include "kcddbconfig.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace KCDDB
{
diff --git a/libkcddb/genres.h b/libkcddb/genres.h
index b067dbd..d93c4ac 100644
--- a/libkcddb/genres.h
+++ b/libkcddb/genres.h
@@ -9,7 +9,7 @@
#define KCDDB_GENRES_H
#include <kcddb_export.h>
-#include <QtCore/QStringList>
+#include <QStringList>
namespace KCDDB
{
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index 8c27945..a9d1d39 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -22,8 +22,8 @@
#include "httplookup.h"
#include <KIO/Job>
-#include <QtCore/QDebug>
-#include <QtCore/QUrlQuery>
+#include <QDebug>
+#include <QUrlQuery>
namespace KCDDB
{
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index ed99162..13faac3 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -23,7 +23,7 @@
#define KCDDB_HTTP_LOOKUP_H
#include "lookup.h"
-#include <QtCore/QUrl>
+#include <QUrl>
namespace KIO
{
diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp
index 96386b9..00373eb 100644
--- a/libkcddb/httpsubmit.cpp
+++ b/libkcddb/httpsubmit.cpp
@@ -21,7 +21,7 @@
#include "httpsubmit.h"
#include <KIO/Job>
-#include <QtCore/QDebug>
+#include <QDebug>
namespace KCDDB
{
diff --git a/libkcddb/httpsubmit.h b/libkcddb/httpsubmit.h
index 4b6d5e4..8dc5123 100644
--- a/libkcddb/httpsubmit.h
+++ b/libkcddb/httpsubmit.h
@@ -20,7 +20,7 @@
*/
#include "submit.h"
-#include <QtCore/QUrl>
+#include <QUrl>
namespace KCDDB
{
diff --git a/libkcddb/kcddb.h b/libkcddb/kcddb.h
index aff2636..e1f7588 100644
--- a/libkcddb/kcddb.h
+++ b/libkcddb/kcddb.h
@@ -20,8 +20,8 @@
#ifndef KCDDB_H
#define KCDDB_H
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
#include <kcddb_export.h>
diff --git a/libkcddb/logging.h b/libkcddb/logging.h
index d3115a8..c746115 100644
--- a/libkcddb/logging.h
+++ b/libkcddb/logging.h
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QLoggingCategory>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(LIBKCDDB)
diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index b7efae0..5d42854 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -21,7 +21,7 @@
#include "lookup.h"
-#include <QtCore/QDebug>
+#include <QDebug>
namespace KCDDB
{
diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h
index ce8df97..69c2500 100644
--- a/libkcddb/lookup.h
+++ b/libkcddb/lookup.h
@@ -25,9 +25,9 @@
#include <cddb.h>
#include <cdinfo.h>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QPair>
+#include <QList>
+#include <QObject>
+#include <QPair>
namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
index 170666f..267c076 100644
--- a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
@@ -21,8 +21,8 @@
#include "musicbrainzlookup.h"
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QThread>
namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp
index f3ed662..cfe7b83 100644
--- a/libkcddb/musicbrainz/musicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp
@@ -36,8 +36,8 @@
#include <KCodecs/KCodecs>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDebug>
+#include <QCryptographicHash>
+#include <QDebug>
#include <cstdio>
#include <cstring>
@@ -153,7 +153,7 @@ namespace KCDDB
// Prefer title and artist from the track credits, but
// it appears to be empty if same as in Recording
- // Noticable in the musicbrainztest-fulldate test,
+ // Noticeable in the musicbrainztest-fulldate test,
// where the title on the credits of track 18 are
// "Bara om min älskade väntar", but the recording
// has title "Men bara om min älskade"
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 7b042ff..305c56a 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -20,11 +20,11 @@
#include "sites.h"
#include <KIO/Job>
-#include <QtCore/QDebug>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
-#include <QtCore/QUrl>
-#include <QtCore/QUrlQuery>
+#include <QDebug>
+#include <QRegExp>
+#include <QTextStream>
+#include <QUrl>
+#include <QUrlQuery>
namespace KCDDB
{
diff --git a/libkcddb/sites.h b/libkcddb/sites.h
index 2cbaae4..b455cad 100644
--- a/libkcddb/sites.h
+++ b/libkcddb/sites.h
@@ -23,7 +23,7 @@
#include <cddb.h>
#include <lookup.h>
#include <kcddb_export.h>
-#include <QtCore/QList>
+#include <QList>
namespace KCDDB
{
diff --git a/libkcddb/smtpsubmit.h b/libkcddb/smtpsubmit.h
index 33682d3..f3fb7cc 100644
--- a/libkcddb/smtpsubmit.h
+++ b/libkcddb/smtpsubmit.h
@@ -20,7 +20,7 @@
*/
#include "submit.h"
-#include <QtCore/QUrl>
+#include <QUrl>
namespace KCDDB
{
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index ae83222..e46fedb 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -25,7 +25,7 @@
#include "cddb.h"
#include "cdinfo.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace KIO
{
diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp
index 8de04e2..03d4f06 100644
--- a/libkcddb/synccddbplookup.cpp
+++ b/libkcddb/synccddbplookup.cpp
@@ -22,7 +22,7 @@
#include "synccddbplookup.h"
#include "logging.h"
-#include <QtCore/QStringList>
+#include <QStringList>
namespace KCDDB
{
diff --git a/tests/asynccddblookuptest.cpp b/tests/asynccddblookuptest.cpp
index 2078d51..929b478 100644
--- a/tests/asynccddblookuptest.cpp
+++ b/tests/asynccddblookuptest.cpp
@@ -20,7 +20,7 @@
#include "asynccddblookuptest.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include <QtTest/QTest>
+#include <QTest>
void AsyncCDDBLookupTest::testLookup()
{
diff --git a/tests/asynccddblookuptest.h b/tests/asynccddblookuptest.h
index 9364b8a..3c42a79 100644
--- a/tests/asynccddblookuptest.h
+++ b/tests/asynccddblookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"
diff --git a/tests/asynchttplookuptest.cpp b/tests/asynchttplookuptest.cpp
index 9208e0c..955db31 100644
--- a/tests/asynchttplookuptest.cpp
+++ b/tests/asynchttplookuptest.cpp
@@ -21,7 +21,7 @@
#include "asynchttplookuptest.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include <QtTest/QTest>
+#include <QTest>
void AsyncHTTPLookupTest::testLookup()
{
diff --git a/tests/asynchttplookuptest.h b/tests/asynchttplookuptest.h
index a1358f4..0ba0b51 100644
--- a/tests/asynchttplookuptest.h
+++ b/tests/asynchttplookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"
diff --git a/tests/asynchttpsubmittest.cpp b/tests/asynchttpsubmittest.cpp
index 7b2dddb..bbc49f6 100644
--- a/tests/asynchttpsubmittest.cpp
+++ b/tests/asynchttpsubmittest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-
#include "asynchttpsubmittest.h"
+#include <QDebug>
+#include <QCoreApplication>
+
#include "libkcddb/submit.h"
AsyncHTTPSubmitTest::AsyncHTTPSubmitTest(QCoreApplication& app)
diff --git a/tests/asynchttpsubmittest.h b/tests/asynchttpsubmittest.h
index 118b337..b6ca803 100644
--- a/tests/asynchttpsubmittest.h
+++ b/tests/asynchttpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
using namespace KCDDB;
diff --git a/tests/asyncmusicbrainztest.cpp b/tests/asyncmusicbrainztest.cpp
index 5879a35..952d419 100644
--- a/tests/asyncmusicbrainztest.cpp
+++ b/tests/asyncmusicbrainztest.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>
void AsyncMusicBrainzTest::testLookup()
{
diff --git a/tests/asyncmusicbrainztest.h b/tests/asyncmusicbrainztest.h
index db600dd..b1c9054 100644
--- a/tests/asyncmusicbrainztest.h
+++ b/tests/asyncmusicbrainztest.h
@@ -21,7 +21,7 @@
#define TEST_H
#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"
diff --git a/tests/asyncsmtpsubmittest.cpp b/tests/asyncsmtpsubmittest.cpp
index ecb4ca0..d15569e 100644
--- a/tests/asyncsmtpsubmittest.cpp
+++ b/tests/asyncsmtpsubmittest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-
#include "asyncsmtpsubmittest.h"
+#include <QDebug>
+#include <QCoreApplication>
+
#include "libkcddb/submit.h"
AsyncSMTPSubmitTest::AsyncSMTPSubmitTest(QCoreApplication& app)
diff --git a/tests/asyncsmtpsubmittest.h b/tests/asyncsmtpsubmittest.h
index 53eccf4..6ce80e1 100644
--- a/tests/asyncsmtpsubmittest.h
+++ b/tests/asyncsmtpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
using namespace KCDDB;
diff --git a/tests/cachetest.cpp b/tests/cachetest.cpp
index d5db7f6..39a9a67 100644
--- a/tests/cachetest.cpp
+++ b/tests/cachetest.cpp
@@ -23,7 +23,7 @@
#include "libkcddb/cdinfo.h"
#include "libkcddb/client.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>
using namespace KCDDB;
diff --git a/tests/cachetest.h b/tests/cachetest.h
index 6a96753..53ed056 100644
--- a/tests/cachetest.h
+++ b/tests/cachetest.h
@@ -28,7 +28,7 @@ namespace KCDDB
class Client;
}
-#include <QtCore/QObject>
+#include <QObject>
class CacheTest : public QObject
{
diff --git a/tests/cdinfotest.cpp b/tests/cdinfotest.cpp
index ce0c25b..71fce5b 100644
--- a/tests/cdinfotest.cpp
+++ b/tests/cdinfotest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtTest/QtTest>
-#include <QtCore/QCoreApplication>
-#include "libkcddb/cdinfo.h"
#include "cdinfotest.h"
+#include <QTest>
+#include <QCoreApplication>
+#include "libkcddb/cdinfo.h"
using namespace KCDDB;
diff --git a/tests/cdinfotest.h b/tests/cdinfotest.h
index 2c1e963..e2ee594 100644
--- a/tests/cdinfotest.h
+++ b/tests/cdinfotest.h
@@ -20,7 +20,7 @@
#ifndef CDINFOTEST_H
#define CDINFOTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class CDInfoTest : public QObject
{
diff --git a/tests/musicbrainztest-fulldate.cpp b/tests/musicbrainztest-fulldate.cpp
index 8c553db..ac10738 100644
--- a/tests/musicbrainztest-fulldate.cpp
+++ b/tests/musicbrainztest-fulldate.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>
void MusicBrainzTestFullDate::testLookup()
{
diff --git a/tests/musicbrainztest-fulldate.h b/tests/musicbrainztest-fulldate.h
index 8a82fb7..aed12d7 100644
--- a/tests/musicbrainztest-fulldate.h
+++ b/tests/musicbrainztest-fulldate.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTFULLDATE_H
#define MUSICBRAINZTESTFULLDATE_H
-#include <QtCore/QObject>
+#include <QObject>
class MusicBrainzTestFullDate : public QObject
{
diff --git a/tests/musicbrainztest-severaldiscs.cpp b/tests/musicbrainztest-severaldiscs.cpp
index bd862af..5a74cd1 100644
--- a/tests/musicbrainztest-severaldiscs.cpp
+++ b/tests/musicbrainztest-severaldiscs.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>
void MusicBrainzTestSeveralDiscs::testLookup()
{
diff --git a/tests/musicbrainztest-severaldiscs.h b/tests/musicbrainztest-severaldiscs.h
index 3435725..6ad3a76 100644
--- a/tests/musicbrainztest-severaldiscs.h
+++ b/tests/musicbrainztest-severaldiscs.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTSEVERALDISCS_H
#define MUSICBRAINZTESTSEVERALDISCS_H
-#include <QtCore/QObject>
+#include <QObject>
class MusicBrainzTestSeveralDiscs : public QObject
{
diff --git a/tests/musicbrainztest.cpp b/tests/musicbrainztest.cpp
index 4503f47..89d4d21 100644
--- a/tests/musicbrainztest.cpp
+++ b/tests/musicbrainztest.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>
void MusicBrainzTest::testLookup()
{
diff --git a/tests/musicbrainztest.h b/tests/musicbrainztest.h
index 079f450..eb60091 100644
--- a/tests/musicbrainztest.h
+++ b/tests/musicbrainztest.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTEST_H
#define MUSICBRAINZTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class MusicBrainzTest : public QObject
{
diff --git a/tests/sitestest.cpp b/tests/sitestest.cpp
index bab5524..a910ef4 100644
--- a/tests/sitestest.cpp
+++ b/tests/sitestest.cpp
@@ -17,9 +17,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QList>
+#include <QDebug>
+#include <QCoreApplication>
+#include <QList>
#include "libkcddb/sites.h"
diff --git a/tests/synccddblookuptest.cpp b/tests/synccddblookuptest.cpp
index 9e240b8..bdaf648 100644
--- a/tests/synccddblookuptest.cpp
+++ b/tests/synccddblookuptest.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/
+#include "synccddblookuptest.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "synccddblookuptest.h"
-#include <QtTest/QTest>
+#include <QTest>
void SyncCDDBLookupTest::testLookup()
{
diff --git a/tests/synccddblookuptest.h b/tests/synccddblookuptest.h
index 401154b..ca22bd3 100644
--- a/tests/synccddblookuptest.h
+++ b/tests/synccddblookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCCDDBLOOKUPTEST_H
#define SYNCCDDBLOOKUPTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class SyncCDDBLookupTest : public QObject
{
diff --git a/tests/synchttplookuptest.cpp b/tests/synchttplookuptest.cpp
index 068f5a0..a46a9e7 100644
--- a/tests/synchttplookuptest.cpp
+++ b/tests/synchttplookuptest.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/
+#include "synchttplookuptest.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "synchttplookuptest.h"
-#include <QtTest/QTest>
+#include <QTest>
void SyncHTTPLookupTest::testLookup()
{
diff --git a/tests/synchttplookuptest.h b/tests/synchttplookuptest.h
index 6604ff1..6eee97c 100644
--- a/tests/synchttplookuptest.h
+++ b/tests/synchttplookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCHTTPLOOKUPTEST_H
#define SYNCHTTPLOOKUPTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class SyncHTTPLookupTest : public QObject
{
diff --git a/tests/synchttpsubmittest.cpp b/tests/synchttpsubmittest.cpp
index fb78839..1e9a3af 100644
--- a/tests/synchttpsubmittest.cpp
+++ b/tests/synchttpsubmittest.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QCoreApplication>
#include "libkcddb/client.h"
#include "libkcddb/kcddbconfig.h"
diff --git a/tests/syncsmtpsubmittest.cpp b/tests/syncsmtpsubmittest.cpp
index e02c8de..1aa4765 100644
--- a/tests/syncsmtpsubmittest.cpp
+++ b/tests/syncsmtpsubmittest.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QCoreApplication>
#include "libkcddb/client.h"
#include "libkcddb/kcddbconfig.h"
diff --git a/tests/utf8test.cpp b/tests/utf8test.cpp
index 8f7f37c..a4f1a99 100644
--- a/tests/utf8test.cpp
+++ b/tests/utf8test.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/
+#include "utf8test.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "utf8test.h"
-#include <QtTest/QTest>
+#include <QTest>
void Utf8Test::testLookup()
{
diff --git a/tests/utf8test.h b/tests/utf8test.h
index ebd1aa3..ba7b6cd 100644
--- a/tests/utf8test.h
+++ b/tests/utf8test.h
@@ -20,7 +20,7 @@
#ifndef UTF8TEST_H
#define UTF8TEST_H
-#include <QtCore/QObject>
+#include <QObject>
class Utf8Test : public QObject
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic