diff options
author | Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> | 2016-12-07 14:32:38 +0100 |
---|---|---|
committer | Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> | 2016-12-07 17:01:37 +0000 |
commit | ef2d628c7f34bf40a7a146a71a10c1f7e6f8d29e (patch) | |
tree | 53f6060f59def8f6f91d7d7cfacf66b6f81d40f0 /src | |
parent | 223adf2ae33d702c0fbf55e9d5abc3b4a80f6b88 (diff) | |
download | qtivi-ef2d628c7f34bf40a7a146a71a10c1f7e6f8d29e.tar.gz |
Sort includes in media plugin by alphabet
Sorted includes in media simulator plugin by alphabet.
Change-Id: I7444d57a0dcc14ed2fa585d2bb76b252a41d93e8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'src')
11 files changed, 38 insertions, 27 deletions
diff --git a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h index 692a900..e88e62d 100644 --- a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h +++ b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h @@ -42,8 +42,9 @@ #ifndef MEDIADISCOVERYBACKEND_H #define MEDIADISCOVERYBACKEND_H -#include <QtIviMedia/QIviMediaDeviceDiscoveryModelBackendInterface> #include <QtIviMedia/QIviMediaDeviceDiscoveryModel> +#include <QtIviMedia/QIviMediaDeviceDiscoveryModelBackendInterface> + #include <QFileSystemWatcher> class MediaDiscoveryBackend : public QIviMediaDeviceDiscoveryModelBackendInterface diff --git a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp index c19c01d..2a9f1fc 100644 --- a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp @@ -40,23 +40,25 @@ ****************************************************************************/ #include "mediaindexerbackend.h" -#include <QtDebug> -#include <QSqlQuery> -#include <QSqlError> + +#include <QtConcurrent/QtConcurrent> + #include <QDirIterator> #include <QImage> -#include <QtConcurrent/QtConcurrent> +#include <QSqlError> +#include <QSqlQuery> +#include <QtDebug> #ifdef QT_TAGLIB -#include <taglib.h> -#include <tag.h> -#include <tstring.h> +#include <attachedpictureframe.h> #include <fileref.h> -#include <mpegfile.h> -#include <id3v2tag.h> #include <id3v2frame.h> #include <id3v2header.h> -#include <attachedpictureframe.h> +#include <id3v2tag.h> +#include <mpegfile.h> +#include <tag.h> +#include <taglib.h> +#include <tstring.h> #endif MediaIndexerBackend::MediaIndexerBackend(const QSqlDatabase &database, QObject *parent) diff --git a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h index 1d3ee2f..6a6a11b 100644 --- a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h +++ b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h @@ -42,12 +42,12 @@ #ifndef MEDIAINDEXERBACKEND_H #define MEDIAINDEXERBACKEND_H -#include <QtIviMedia/QIviMediaIndexerControlBackendInterface> #include <QtIviMedia/QIviMediaIndexerControl> +#include <QtIviMedia/QIviMediaIndexerControlBackendInterface> -#include <QSqlDatabase> -#include <QQueue> #include <QFutureWatcher> +#include <QQueue> +#include <QSqlDatabase> class MediaIndexerBackend : public QIviMediaIndexerControlBackendInterface { diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp index e24fd72..03ff097 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp @@ -42,11 +42,12 @@ #include "mediaplayerbackend.h" #include "searchandbrowsebackend.h" +#include <QtConcurrent/QtConcurrent> #include <QtMultimedia/QMediaPlayer> -#include <QSqlQuery> -#include <QSqlError> + #include <QFuture> -#include <QtConcurrent/QtConcurrent> +#include <QSqlError> +#include <QSqlQuery> #include <QtDebug> MediaPlayerBackend::MediaPlayerBackend(const QSqlDatabase &database, QObject *parent) diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h index 3958a27..3831e9f 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h +++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h @@ -43,6 +43,7 @@ #define MEDIAPLAYERBACKEND_H #include <QtIviMedia/QIviMediaPlayerBackendInterface> + #include <QSqlDatabase> QT_FORWARD_DECLARE_CLASS(QMediaPlayer); diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp index f1bd8ae..461894b 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ - -#include "mediaplugin.h" -#include "mediaplayerbackend.h" -#include "searchandbrowsebackend.h" #include "mediadiscoverybackend.h" #include "mediaindexerbackend.h" +#include "mediaplayerbackend.h" +#include "mediaplugin.h" +#include "searchandbrowsebackend.h" -#include <QtIviMedia/QIviMediaPlayer> #include <QtIviCore/QIviSearchAndBrowseModel> +#include <QtIviMedia/QIviMediaPlayer> + #include <QStringList> #include <QtDebug> diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.h b/src/plugins/ivimedia/media_simulator/mediaplugin.h index 747b0a8..129b3fd 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplugin.h +++ b/src/plugins/ivimedia/media_simulator/mediaplugin.h @@ -44,6 +44,7 @@ #define MEDIAPLUGIN_H #include <QtIviCore/QIviServiceInterface> + #include <QSqlDatabase> class MediaPlayerBackend; diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp index 67c44a9..35c3651 100644 --- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp +++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp @@ -41,10 +41,11 @@ #include "searchandbrowsebackend.h" -#include <QSqlQuery> -#include <QSqlError> -#include <QFuture> #include <QtConcurrent/QtConcurrent> + +#include <QFuture> +#include <QSqlError> +#include <QSqlQuery> #include <QtDebug> SearchAndBrowseBackend::SearchAndBrowseBackend(const QSqlDatabase &database, QObject *parent) diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h index 6cde384..258eb37 100644 --- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h +++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h @@ -42,9 +42,10 @@ #ifndef SEARCHBACKEND_H #define SEARCHBACKEND_H -#include <QtIviCore/QIviSearchAndBrowseModelInterface> #include <QtIviCore/QIviSearchAndBrowseModel> +#include <QtIviCore/QIviSearchAndBrowseModelInterface> #include <QtIviMedia/QIviAudioTrackItem> + #include <QSqlDatabase> #include <QStack> diff --git a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp index 21f996d..3eb3ab4 100644 --- a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp +++ b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "usbbrowsebackend.h" + #include <QDir> #include <QtDebug> diff --git a/src/plugins/ivimedia/media_simulator/usbdevice.cpp b/src/plugins/ivimedia/media_simulator/usbdevice.cpp index 47e76af..51861ba 100644 --- a/src/plugins/ivimedia/media_simulator/usbdevice.cpp +++ b/src/plugins/ivimedia/media_simulator/usbdevice.cpp @@ -39,9 +39,11 @@ ** ****************************************************************************/ -#include "usbdevice.h" #include "usbbrowsebackend.h" +#include "usbdevice.h" + #include <QtIviCore/QIviSearchAndBrowseModel> + #include <QDir> USBDevice::USBDevice(const QString &folder, QObject *parent) |