[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-mediacenter] /: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-08-27 16:41:50
Message-ID: E1fuKaM-0003V4-11 () code ! kde ! org
[Download RAW message or body]
Git commit 8fd88b377ec6965caa7a5ab2a6c16c90fa34d01f by Yuri Chornoivan.
Committed on 27/08/2018 at 16:41.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +3 -3 autotests/runtimedatatest.h
M +1 -1 browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
M +1 -1 components/CMakeLists.txt
M +1 -1 datasources/CMakeLists.txt
M +1 -1 libs/mediacenter/abstractbrowsingbackend.h
M +1 -1 libs/mediacenter/abstractdatasource.h
M +1 -1 libs/mediacenter/datasourcesloader.h
M +1 -1 libs/mediacenter/filterplaylistmodel.h
M +1 -1 libs/mediacenter/localthumbnailprovider.h
M +3 -3 libs/mediacenter/multipleplaylistmodel.h
M +2 -2 libs/mediacenter/playlistitem.h
M +5 -5 libs/mediacenter/playlistmodel.cpp
M +4 -4 libs/mediacenter/playlistmodel.h
M +1 -1 libs/mediacenter/pmccoverartprovider.cpp
M +1 -1 libs/mediacenter/pmccoverartprovider.h
M +1 -1 libs/mediacenter/pmcimagecache.cpp
M +1 -1 libs/mediacenter/pmcimagecache.h
M +1 -1 libs/mediacenter/pmcmetadatamodel.cpp
M +1 -1 libs/mediacenter/pmcmetadatamodel.h
M +2 -2 libs/mediacenter/settings.h
M +7 -7 libs/mediacenter/subtitleprovider.h
M +2 -2 onlineservices/flickr/flickrmodel.cpp
M +0 -1 onlineservices/youtube/video.h
https://commits.kde.org/plasma-mediacenter/8fd88b377ec6965caa7a5ab2a6c16c90fa34d01f
diff --git a/autotests/runtimedatatest.h b/autotests/runtimedatatest.h
index b553b841..06eaf739 100644
--- a/autotests/runtimedatatest.h
+++ b/autotests/runtimedatatest.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TESTRUNTIMEDATA_H
-#define TESTRUNTIMEDATA_H
+#ifndef RUNTIMEDATATEST_H
+#define RUNTIMEDATATEST_H
#include <QObject>
@@ -39,4 +39,4 @@ private slots:
void testVolumeAndMuteFunction();
};
-#endif // TESTRUNTIMEDATA_H
+#endif // RUNTIMEDATATEST_H
diff --git a/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp \
b/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp index \
99927bec..d955c02d 100644
--- a/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
+++ b/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
@@ -22,7 +22,7 @@
#include "mediacenter/mediacenter.h"
#include "mediacenter/abstractbrowsingbackend.h"
-#include <QtGui/QIcon>
+#include <QIcon>
#include <QEvent>
MetadataPictureModel::MetadataPictureModel (QObject* parent)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e1c41fd7..4508f406 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -3,4 +3,4 @@ install(FILES CategoriesBrowser.qml DESTINATION \
${QML_INSTALL_DIR}/org/kde/plasm install(FILES MediaInfoPanel.qml DESTINATION \
${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components) install(FILES AutoHide.qml \
DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components) install(FILES \
BreezeBlock.qml DESTINATION \
${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
-install(DIRECTORY common DESTINATION \
${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components) \ No newline at end of file
+install(DIRECTORY common DESTINATION \
${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
diff --git a/datasources/CMakeLists.txt b/datasources/CMakeLists.txt
index 554513da..61ff8e7f 100644
--- a/datasources/CMakeLists.txt
+++ b/datasources/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(baloosearch)
add_subdirectory(filesystemsearch)
-add_subdirectory(lastfm)
\ No newline at end of file
+add_subdirectory(lastfm)
diff --git a/libs/mediacenter/abstractbrowsingbackend.h \
b/libs/mediacenter/abstractbrowsingbackend.h index 1b3ff349..df521fb7 100644
--- a/libs/mediacenter/abstractbrowsingbackend.h
+++ b/libs/mediacenter/abstractbrowsingbackend.h
@@ -249,7 +249,7 @@ protected:
* Subclasses can call this method to set the button strings that are used
* for the buttons property
*
- * @param buttons list of strings for the buton labels
+ * @param buttons list of strings for the button labels
*/
void setButtons(const QStringList &buttons);
diff --git a/libs/mediacenter/abstractdatasource.h \
b/libs/mediacenter/abstractdatasource.h index dde872ef..88a3ddb4 100644
--- a/libs/mediacenter/abstractdatasource.h
+++ b/libs/mediacenter/abstractdatasource.h
@@ -20,7 +20,7 @@
#ifndef ABSTRACTDATASOURCE_H
#define ABSTRACTDATASOURCE_H
-#include <QtCore/QThread>
+#include <QThread>
#include <KPluginInfo>
#include "mediacenter_export.h"
diff --git a/libs/mediacenter/datasourcesloader.h \
b/libs/mediacenter/datasourcesloader.h index b0f7937d..4ab8bd18 100644
--- a/libs/mediacenter/datasourcesloader.h
+++ b/libs/mediacenter/datasourcesloader.h
@@ -20,7 +20,7 @@
#ifndef DATASOURCESLOADER_H
#define DATASOURCESLOADER_H
-#include <QtCore/QObject>
+#include <QObject>
#include "mediacenter_export.h"
diff --git a/libs/mediacenter/filterplaylistmodel.h \
b/libs/mediacenter/filterplaylistmodel.h index 71e9baca..3d2cd19a 100644
--- a/libs/mediacenter/filterplaylistmodel.h
+++ b/libs/mediacenter/filterplaylistmodel.h
@@ -19,7 +19,7 @@
#ifndef FILTERPLAYLISTMODEL_H
#define FILTERPLAYLISTMODEL_H
-#include <QtCore/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
#include <QAbstractItemModel>
#include "mediacenter_export.h"
diff --git a/libs/mediacenter/localthumbnailprovider.h \
b/libs/mediacenter/localthumbnailprovider.h index d248ae04..3a22b309 100644
--- a/libs/mediacenter/localthumbnailprovider.h
+++ b/libs/mediacenter/localthumbnailprovider.h
@@ -21,7 +21,7 @@
#define THUMBNAILPROVIDER_H
#include "mediacenter_export.h"
-#include <QtQuick/QQuickImageProvider>
+#include <QQuickImageProvider>
#include <QUrl>
diff --git a/libs/mediacenter/multipleplaylistmodel.h \
b/libs/mediacenter/multipleplaylistmodel.h index be65942f..4a56236d 100644
--- a/libs/mediacenter/multipleplaylistmodel.h
+++ b/libs/mediacenter/multipleplaylistmodel.h
@@ -18,9 +18,9 @@
#ifndef MULTIPLEPLAYLISTMODEL_H
#define MULTIPLEPLAYLISTMODEL_H
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QAbstractListModel>
+#include <QString>
+#include <QStringList>
#include "mediacenter_export.h"
#include "mediacenter.h"
diff --git a/libs/mediacenter/playlistitem.h b/libs/mediacenter/playlistitem.h
index 3f0b8238..92111e6f 100644
--- a/libs/mediacenter/playlistitem.h
+++ b/libs/mediacenter/playlistitem.h
@@ -19,8 +19,8 @@
#ifndef PLAYLISTITEM_H
#define PLAYLISTITEM_H
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
#include <QSharedPointer>
class PmcMedia;
diff --git a/libs/mediacenter/playlistmodel.cpp b/libs/mediacenter/playlistmodel.cpp
index dcf845e9..0eae5ae9 100644
--- a/libs/mediacenter/playlistmodel.cpp
+++ b/libs/mediacenter/playlistmodel.cpp
@@ -23,11 +23,11 @@
#include <QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QStringList>
-#include <QtCore/QDateTime>
-#include <QtCore/QCoreApplication>
-#include <QtXml/QDomDocument>
+#include <QDir>
+#include <QStringList>
+#include <QDateTime>
+#include <QCoreApplication>
+#include <QDomDocument>
namespace
{
diff --git a/libs/mediacenter/playlistmodel.h b/libs/mediacenter/playlistmodel.h
index 0fc1d4ad..fd40296f 100644
--- a/libs/mediacenter/playlistmodel.h
+++ b/libs/mediacenter/playlistmodel.h
@@ -18,10 +18,10 @@
#ifndef PLAYLISTMODEL_H
#define PLAYLISTMODEL_H
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QFile>
+#include <QAbstractItemModel>
+#include <QString>
+#include <QList>
+#include <QFile>
#include "mediacenter_export.h"
#include "mediacenter.h"
diff --git a/libs/mediacenter/pmccoverartprovider.cpp \
b/libs/mediacenter/pmccoverartprovider.cpp index 21564d4f..735bfb6a 100644
--- a/libs/mediacenter/pmccoverartprovider.cpp
+++ b/libs/mediacenter/pmccoverartprovider.cpp
@@ -29,7 +29,7 @@
#include <mpegfile.h>
#include <attachedpictureframe.h>
-#include <QtCore/QUrl>
+#include <QUrl>
const char *PmcCoverArtProvider::identificationString = "coverart";
diff --git a/libs/mediacenter/pmccoverartprovider.h \
b/libs/mediacenter/pmccoverartprovider.h index c69ddffa..761b47ef 100644
--- a/libs/mediacenter/pmccoverartprovider.h
+++ b/libs/mediacenter/pmccoverartprovider.h
@@ -19,7 +19,7 @@
#ifndef PMCCOVERARTPROVIDER_H
#define PMCCOVERARTPROVIDER_H
-#include <QtQuick/QQuickImageProvider>
+#include <QQuickImageProvider>
#include "mediacenter_export.h"
diff --git a/libs/mediacenter/pmcimagecache.cpp b/libs/mediacenter/pmcimagecache.cpp
index fcfe2a83..4d234622 100644
--- a/libs/mediacenter/pmcimagecache.cpp
+++ b/libs/mediacenter/pmcimagecache.cpp
@@ -18,7 +18,7 @@
#include "pmcimagecache.h"
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
const char *PmcImageCache::fileIdentification = "mediafile:";
const char *PmcImageCache::albumIdentification = "album:";
diff --git a/libs/mediacenter/pmcimagecache.h b/libs/mediacenter/pmcimagecache.h
index 63994616..52bfc6fe 100644
--- a/libs/mediacenter/pmcimagecache.h
+++ b/libs/mediacenter/pmcimagecache.h
@@ -19,7 +19,7 @@
#ifndef PMCIMAGECACHE_H
#define PMCIMAGECACHE_H
-#include <QtCore/QHash>
+#include <QHash>
#include <KImageCache>
diff --git a/libs/mediacenter/pmcmetadatamodel.cpp \
b/libs/mediacenter/pmcmetadatamodel.cpp index 83b9e93c..1719a343 100644
--- a/libs/mediacenter/pmcmetadatamodel.cpp
+++ b/libs/mediacenter/pmcmetadatamodel.cpp
@@ -30,7 +30,7 @@
#include <KIO/PreviewJob>
#include <QDebug>
-#include <QtCore/QTimer>
+#include <QTimer>
#include <QSharedPointer>
class PmcMetadataModel::Private
diff --git a/libs/mediacenter/pmcmetadatamodel.h \
b/libs/mediacenter/pmcmetadatamodel.h index 602c4ef6..427d3100 100644
--- a/libs/mediacenter/pmcmetadatamodel.h
+++ b/libs/mediacenter/pmcmetadatamodel.h
@@ -23,7 +23,7 @@
#include "mediacenter_export.h"
#include "mediacenter.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
#include <QSharedPointer>
#include <QList>
diff --git a/libs/mediacenter/settings.h b/libs/mediacenter/settings.h
index 79b0d961..a575574f 100644
--- a/libs/mediacenter/settings.h
+++ b/libs/mediacenter/settings.h
@@ -23,8 +23,8 @@
#include "mediacenter_export.h"
#include <KConfigGroup>
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QVariant>
class MEDIACENTER_EXPORT Settings : public QObject
{
diff --git a/libs/mediacenter/subtitleprovider.h \
b/libs/mediacenter/subtitleprovider.h index 7232212b..d7e26020 100644
--- a/libs/mediacenter/subtitleprovider.h
+++ b/libs/mediacenter/subtitleprovider.h
@@ -20,13 +20,13 @@
#ifndef SUBTITLEPROVIDER_H
#define SUBTITLEPROVIDER_H
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
+#include <QFile>
+#include <QTextStream>
+#include <QRegExp>
+#include <QDebug>
+#include <QList>
+#include <QStringList>
+#include <QUrl>
#include "mediacenter_export.h"
diff --git a/onlineservices/flickr/flickrmodel.cpp \
b/onlineservices/flickr/flickrmodel.cpp index 67aeb011..b91d8fc8 100644
--- a/onlineservices/flickr/flickrmodel.cpp
+++ b/onlineservices/flickr/flickrmodel.cpp
@@ -27,8 +27,8 @@
#include <KIO/Job>
#include <KJob>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomNodeList>
+#include <QDomDocument>
+#include <QDomNodeList>
#include <QDebug>
diff --git a/onlineservices/youtube/video.h b/onlineservices/youtube/video.h
index 1d6596af..111c1182 100644
--- a/onlineservices/youtube/video.h
+++ b/onlineservices/youtube/video.h
@@ -19,7 +19,6 @@
#define VIDEO_H
#include <QUrl>
-#include <QtGui>
#include <QString>
#include <QPointer>
#include <QDateTime>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic