From 17c35e32e5970bfc3a0ca41fd5cbd5869aa9e0be Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Fri, 19 Dec 2014 00:40:30 +0100 Subject: [PATCH] Fix header order in internet/ --- src/internet/core/internetplaylistitem.cpp | 9 +++--- src/internet/core/internetservice.cpp | 7 ++-- src/internet/core/internetview.cpp | 5 +-- src/internet/core/internetviewcontainer.cpp | 11 ++++--- src/internet/core/searchboxwidget.cpp | 7 ++-- .../digitally/digitallyimportedclient.cpp | 5 +-- .../digitallyimportedsettingspage.cpp | 7 ++-- .../digitally/digitallyimportedurlhandler.cpp | 3 +- .../googledrive/googledrivesettingspage.cpp | 9 +++--- .../grooveshark/groovesharksettingspage.cpp | 11 ++++--- src/internet/icecast/icecastbackend.cpp | 5 +-- src/internet/icecast/icecastfilterwidget.cpp | 7 ++-- src/internet/internetradio/savedradio.cpp | 9 +++--- .../jamendo/jamendodynamicplaylist.cpp | 6 ++-- src/internet/jamendo/jamendoservice.cpp | 20 ++++++------ src/internet/magnatune/magnatuneservice.cpp | 32 ++++++++++--------- .../magnatune/magnatunesettingspage.cpp | 10 +++--- src/internet/somafm/somafmservice.cpp | 17 +++++----- src/internet/somafm/somafmurlhandler.cpp | 13 ++++---- src/internet/spotify/spotifyserver.cpp | 9 +++--- src/internet/spotify/spotifyservice.cpp | 23 ++++++------- src/internet/spotify/spotifysettingspage.cpp | 14 ++++---- .../subsonic/subsonicsettingspage.cpp | 5 +-- src/internet/vk/vkconnection.cpp | 2 ++ src/internet/vk/vkmusiccache.cpp | 2 +- src/internet/vk/vksearchdialog.cpp | 6 ++-- 26 files changed, 138 insertions(+), 116 deletions(-) diff --git a/src/internet/core/internetplaylistitem.cpp b/src/internet/core/internetplaylistitem.cpp index d1430dca1..400e6a5ff 100644 --- a/src/internet/core/internetplaylistitem.cpp +++ b/src/internet/core/internetplaylistitem.cpp @@ -20,16 +20,17 @@ */ #include "internet/core/internetplaylistitem.h" + +#include +#include +#include + #include "internet/core/internetservice.h" #include "internet/core/internetmodel.h" #include "core/settingsprovider.h" #include "library/sqlrow.h" #include "playlist/playlistbackend.h" -#include -#include -#include - InternetPlaylistItem::InternetPlaylistItem(const QString& type) : PlaylistItem(type), set_service_icon_(false) {} diff --git a/src/internet/core/internetservice.cpp b/src/internet/core/internetservice.cpp index 18b3e967e..aeade51fb 100644 --- a/src/internet/core/internetservice.cpp +++ b/src/internet/core/internetservice.cpp @@ -21,15 +21,16 @@ */ #include "internet/core/internetservice.h" + +#include +#include + #include "internet/core/internetmodel.h" #include "core/logging.h" #include "core/mergedproxymodel.h" #include "core/mimedata.h" #include "ui/iconloader.h" -#include -#include - InternetService::InternetService(const QString& name, Application* app, InternetModel* model, QObject* parent) : QObject(parent), diff --git a/src/internet/core/internetview.cpp b/src/internet/core/internetview.cpp index 353eff276..653d1ef06 100644 --- a/src/internet/core/internetview.cpp +++ b/src/internet/core/internetview.cpp @@ -20,12 +20,13 @@ */ #include "internetview.h" + +#include + #include "internet/core/internetmodel.h" #include "core/mergedproxymodel.h" #include "library/libraryview.h" -#include - InternetView::InternetView(QWidget* parent) : AutoExpandingTreeView(parent) { setItemDelegate(new LibraryItemDelegate(this)); SetExpandOnReset(false); diff --git a/src/internet/core/internetviewcontainer.cpp b/src/internet/core/internetviewcontainer.cpp index 2b7634074..46f2d53b2 100644 --- a/src/internet/core/internetviewcontainer.cpp +++ b/src/internet/core/internetviewcontainer.cpp @@ -19,17 +19,18 @@ */ #include "internetviewcontainer.h" -#include "internet/core/internetmodel.h" -#include "internet/core/internetservice.h" #include "ui_internetviewcontainer.h" -#include "core/application.h" -#include "core/mergedproxymodel.h" -#include "globalsearch/globalsearch.h" #include #include #include +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" +#include "core/application.h" +#include "core/mergedproxymodel.h" +#include "globalsearch/globalsearch.h" + const int InternetViewContainer::kAnimationDuration = 500; InternetViewContainer::InternetViewContainer(QWidget* parent) diff --git a/src/internet/core/searchboxwidget.cpp b/src/internet/core/searchboxwidget.cpp index 6c80e2db8..3c99796d4 100644 --- a/src/internet/core/searchboxwidget.cpp +++ b/src/internet/core/searchboxwidget.cpp @@ -18,15 +18,16 @@ along with Clementine. If not, see . */ -#include "internet/core/internetservice.h" #include "internet/core/searchboxwidget.h" #include "ui_searchboxwidget.h" -#include "ui/iconloader.h" -#include "widgets/didyoumean.h" #include #include +#include "internet/core/internetservice.h" +#include "ui/iconloader.h" +#include "widgets/didyoumean.h" + SearchBoxWidget::SearchBoxWidget(InternetService* service) : service_(service), ui_(new Ui_SearchBoxWidget), diff --git a/src/internet/digitally/digitallyimportedclient.cpp b/src/internet/digitally/digitallyimportedclient.cpp index 1b79fd5fc..642619687 100644 --- a/src/internet/digitally/digitallyimportedclient.cpp +++ b/src/internet/digitally/digitallyimportedclient.cpp @@ -18,14 +18,15 @@ */ #include "digitallyimportedclient.h" -#include "core/logging.h" -#include "core/network.h" #include #include #include +#include "core/logging.h" +#include "core/network.h" + // The API used here is undocumented - it was reverse engineered by watching // calls made by the sky.fm android app: // https://market.android.com/details?id=com.audioaddict.sky diff --git a/src/internet/digitally/digitallyimportedsettingspage.cpp b/src/internet/digitally/digitallyimportedsettingspage.cpp index b3df3d75c..476773d27 100644 --- a/src/internet/digitally/digitallyimportedsettingspage.cpp +++ b/src/internet/digitally/digitallyimportedsettingspage.cpp @@ -17,16 +17,17 @@ along with Clementine. If not, see . */ -#include "digitallyimportedclient.h" -#include "digitallyimportedservicebase.h" #include "digitallyimportedsettingspage.h" #include "ui_digitallyimportedsettingspage.h" -#include "core/closure.h" #include #include #include +#include "digitallyimportedclient.h" +#include "digitallyimportedservicebase.h" +#include "core/closure.h" + DigitallyImportedSettingsPage::DigitallyImportedSettingsPage( SettingsDialog* dialog) : SettingsPage(dialog), diff --git a/src/internet/digitally/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp index d52a94a9c..e35d81326 100644 --- a/src/internet/digitally/digitallyimportedurlhandler.cpp +++ b/src/internet/digitally/digitallyimportedurlhandler.cpp @@ -18,8 +18,9 @@ along with Clementine. If not, see . */ -#include "digitallyimportedservicebase.h" #include "digitallyimportedurlhandler.h" + +#include "digitallyimportedservicebase.h" #include "internet/core/internetmodel.h" #include "core/application.h" #include "core/logging.h" diff --git a/src/internet/googledrive/googledrivesettingspage.cpp b/src/internet/googledrive/googledrivesettingspage.cpp index ca05cc52f..7a0c2b828 100644 --- a/src/internet/googledrive/googledrivesettingspage.cpp +++ b/src/internet/googledrive/googledrivesettingspage.cpp @@ -17,16 +17,17 @@ along with Clementine. If not, see . */ -#include "googledriveclient.h" -#include "googledriveservice.h" #include "googledrivesettingspage.h" #include "ui_googledrivesettingspage.h" + +#include + +#include "googledriveclient.h" +#include "googledriveservice.h" #include "core/application.h" #include "internet/core/internetmodel.h" #include "ui/settingsdialog.h" -#include - GoogleDriveSettingsPage::GoogleDriveSettingsPage(SettingsDialog* parent) : SettingsPage(parent), ui_(new Ui::GoogleDriveSettingsPage), diff --git a/src/internet/grooveshark/groovesharksettingspage.cpp b/src/internet/grooveshark/groovesharksettingspage.cpp index ed68fb69b..7c923e52a 100644 --- a/src/internet/grooveshark/groovesharksettingspage.cpp +++ b/src/internet/grooveshark/groovesharksettingspage.cpp @@ -18,13 +18,8 @@ along with Clementine. If not, see . */ -#include "groovesharkservice.h" #include "groovesharksettingspage.h" -#include "internet/core/internetmodel.h" -#include "core/logging.h" -#include "core/network.h" #include "ui_groovesharksettingspage.h" -#include "ui/iconloader.h" #include #include @@ -32,6 +27,12 @@ #include #include +#include "groovesharkservice.h" +#include "internet/core/internetmodel.h" +#include "core/logging.h" +#include "core/network.h" +#include "ui/iconloader.h" + GroovesharkSettingsPage::GroovesharkSettingsPage(SettingsDialog* dialog) : SettingsPage(dialog), ui_(new Ui_GroovesharkSettingsPage), diff --git a/src/internet/icecast/icecastbackend.cpp b/src/internet/icecast/icecastbackend.cpp index 6957e4293..35daa3c24 100644 --- a/src/internet/icecast/icecastbackend.cpp +++ b/src/internet/icecast/icecastbackend.cpp @@ -20,12 +20,13 @@ */ #include "icecastbackend.h" -#include "core/database.h" -#include "core/scopedtransaction.h" #include #include +#include "core/database.h" +#include "core/scopedtransaction.h" + const char* IcecastBackend::kTableName = "icecast_stations"; IcecastBackend::IcecastBackend(QObject* parent) : QObject(parent) {} diff --git a/src/internet/icecast/icecastfilterwidget.cpp b/src/internet/icecast/icecastfilterwidget.cpp index 895433e64..7b6297215 100644 --- a/src/internet/icecast/icecastfilterwidget.cpp +++ b/src/internet/icecast/icecastfilterwidget.cpp @@ -17,16 +17,17 @@ along with Clementine. If not, see . */ -#include "icecastmodel.h" #include "icecastfilterwidget.h" -#include "ui_icecastfilterwidget.h" -#include "ui/iconloader.h" #include #include #include #include +#include "icecastmodel.h" +#include "ui_icecastfilterwidget.h" +#include "ui/iconloader.h" + const char* IcecastFilterWidget::kSettingsGroup = "Icecast"; IcecastFilterWidget::IcecastFilterWidget(QWidget* parent) diff --git a/src/internet/internetradio/savedradio.cpp b/src/internet/internetradio/savedradio.cpp index 53c86abe4..0343d5cfa 100644 --- a/src/internet/internetradio/savedradio.cpp +++ b/src/internet/internetradio/savedradio.cpp @@ -20,8 +20,12 @@ along with Clementine. If not, see . */ -#include "internet/core/internetmodel.h" #include "savedradio.h" + +#include +#include + +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/mimedata.h" #include "globalsearch/globalsearch.h" @@ -29,9 +33,6 @@ #include "ui/addstreamdialog.h" #include "ui/iconloader.h" -#include -#include - const char* SavedRadio::kServiceName = "SavedRadio"; const char* SavedRadio::kSettingsGroup = "SavedRadio"; diff --git a/src/internet/jamendo/jamendodynamicplaylist.cpp b/src/internet/jamendo/jamendodynamicplaylist.cpp index 749ba48f6..fce33f324 100644 --- a/src/internet/jamendo/jamendodynamicplaylist.cpp +++ b/src/internet/jamendo/jamendodynamicplaylist.cpp @@ -21,9 +21,6 @@ #include "jamendodynamicplaylist.h" -#include "jamendoplaylistitem.h" -#include "jamendoservice.h" - #include #include #include @@ -31,8 +28,11 @@ #include "core/logging.h" #include "core/network.h" +#include "jamendoplaylistitem.h" +#include "jamendoservice.h" #include "library/librarybackend.h" + const char* JamendoDynamicPlaylist::kUrl = "http://api.jamendo.com/get2/id/track/plain/"; diff --git a/src/internet/jamendo/jamendoservice.cpp b/src/internet/jamendo/jamendoservice.cpp index 0cc2f280f..d68662e1d 100644 --- a/src/internet/jamendo/jamendoservice.cpp +++ b/src/internet/jamendo/jamendoservice.cpp @@ -23,6 +23,16 @@ #include "jamendoservice.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "qtiocompressor.h" + #include "jamendodynamicplaylist.h" #include "jamendoplaylistitem.h" #include "internet/core/internetmodel.h" @@ -43,16 +53,6 @@ #include "smartplaylists/querygenerator.h" #include "ui/iconloader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include "qtiocompressor.h" - const char* JamendoService::kServiceName = "Jamendo"; const char* JamendoService::kDirectoryUrl = "https://imgjam.com/data/dbdump_artistalbumtrack.xml.gz"; diff --git a/src/internet/magnatune/magnatuneservice.cpp b/src/internet/magnatune/magnatuneservice.cpp index 9e3058dce..7206e8808 100644 --- a/src/internet/magnatune/magnatuneservice.cpp +++ b/src/internet/magnatune/magnatuneservice.cpp @@ -21,9 +21,25 @@ along with Clementine. If not, see . */ +#include "magnatuneservice.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "qtiocompressor.h" + + #include "magnatunedownloaddialog.h" #include "magnatuneplaylistitem.h" -#include "magnatuneservice.h" #include "magnatuneurlhandler.h" #include "internet/core/internetmodel.h" #include "core/application.h" @@ -43,20 +59,6 @@ #include "ui/iconloader.h" #include "ui/settingsdialog.h" -#include "qtiocompressor.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - const char* MagnatuneService::kServiceName = "Magnatune"; const char* MagnatuneService::kSettingsGroup = "Magnatune"; const char* MagnatuneService::kSongsTable = "magnatune_songs"; diff --git a/src/internet/magnatune/magnatunesettingspage.cpp b/src/internet/magnatune/magnatunesettingspage.cpp index 91c017a69..4574e87dd 100644 --- a/src/internet/magnatune/magnatunesettingspage.cpp +++ b/src/internet/magnatune/magnatunesettingspage.cpp @@ -21,17 +21,17 @@ #include "magnatunesettingspage.h" -#include "core/network.h" -#include "magnatuneservice.h" -#include "internet/core/internetmodel.h" -#include "ui_magnatunesettingspage.h" - #include #include #include #include #include +#include "core/network.h" +#include "magnatuneservice.h" +#include "internet/core/internetmodel.h" +#include "ui_magnatunesettingspage.h" + MagnatuneSettingsPage::MagnatuneSettingsPage(SettingsDialog* dialog) : SettingsPage(dialog), network_(new NetworkAccessManager(this)), diff --git a/src/internet/somafm/somafmservice.cpp b/src/internet/somafm/somafmservice.cpp index 77cdec317..270ba5c72 100644 --- a/src/internet/somafm/somafmservice.cpp +++ b/src/internet/somafm/somafmservice.cpp @@ -20,6 +20,15 @@ */ #include "somafmservice.h" + +#include +#include +#include +#include +#include +#include +#include + #include "somafmurlhandler.h" #include "internet/core/internetmodel.h" #include "core/application.h" @@ -33,14 +42,6 @@ #include "globalsearch/somafmsearchprovider.h" #include "ui/iconloader.h" -#include -#include -#include -#include -#include -#include -#include - const int SomaFMServiceBase::kStreamsCacheDurationSecs = 60 * 60 * 24 * 28; // 4 weeks diff --git a/src/internet/somafm/somafmurlhandler.cpp b/src/internet/somafm/somafmurlhandler.cpp index 3afda66f8..337d8c876 100644 --- a/src/internet/somafm/somafmurlhandler.cpp +++ b/src/internet/somafm/somafmurlhandler.cpp @@ -19,19 +19,20 @@ along with Clementine. If not, see . */ -#include "internet/core/internetmodel.h" -#include "somafmservice.h" #include "somafmurlhandler.h" -#include "core/application.h" -#include "core/logging.h" -#include "core/taskmanager.h" -#include "playlistparsers/playlistparser.h" #include #include #include #include +#include "internet/core/internetmodel.h" +#include "somafmservice.h" +#include "core/application.h" +#include "core/logging.h" +#include "core/taskmanager.h" +#include "playlistparsers/playlistparser.h" + SomaFMUrlHandler::SomaFMUrlHandler(Application* app, SomaFMServiceBase* service, QObject* parent) : UrlHandler(parent), app_(app), service_(service), task_id_(0) {} diff --git a/src/internet/spotify/spotifyserver.cpp b/src/internet/spotify/spotifyserver.cpp index dd87063dc..b89df0418 100644 --- a/src/internet/spotify/spotifyserver.cpp +++ b/src/internet/spotify/spotifyserver.cpp @@ -20,16 +20,17 @@ */ #include "spotifyserver.h" -#include "core/closure.h" -#include "core/logging.h" - -#include "spotifymessages.pb.h" #include #include #include #include +#include "core/closure.h" +#include "core/logging.h" + +#include "spotifymessages.pb.h" + SpotifyServer::SpotifyServer(QObject* parent) : AbstractMessageHandler(nullptr, parent), server_(new QTcpServer(this)), diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp index 0e93a3e16..10e669f88 100644 --- a/src/internet/spotify/spotifyservice.cpp +++ b/src/internet/spotify/spotifyservice.cpp @@ -21,12 +21,23 @@ along with Clementine. If not, see . */ +#include "spotifyservice.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "blobversion.h" #include "config.h" #include "internet/core/internetmodel.h" #include "internet/core/searchboxwidget.h" #include "spotifyserver.h" -#include "spotifyservice.h" #include "core/application.h" #include "core/database.h" #include "core/logging.h" @@ -43,16 +54,6 @@ #include "ui/iconloader.h" #include "widgets/didyoumean.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - #ifdef HAVE_SPOTIFY_DOWNLOADER #include "spotifyblobdownloader.h" #endif diff --git a/src/internet/spotify/spotifysettingspage.cpp b/src/internet/spotify/spotifysettingspage.cpp index 31c823f22..a07a16db2 100644 --- a/src/internet/spotify/spotifysettingspage.cpp +++ b/src/internet/spotify/spotifysettingspage.cpp @@ -20,14 +20,7 @@ */ #include "spotifysettingspage.h" - -#include "config.h" -#include "spotifymessages.pb.h" -#include "spotifyservice.h" -#include "internet/core/internetmodel.h" #include "ui_spotifysettingspage.h" -#include "core/network.h" -#include "ui/iconloader.h" #include #include @@ -35,6 +28,13 @@ #include #include +#include "config.h" +#include "spotifymessages.pb.h" +#include "spotifyservice.h" +#include "internet/core/internetmodel.h" +#include "core/network.h" +#include "ui/iconloader.h" + SpotifySettingsPage::SpotifySettingsPage(SettingsDialog* dialog) : SettingsPage(dialog), ui_(new Ui_SpotifySettingsPage), diff --git a/src/internet/subsonic/subsonicsettingspage.cpp b/src/internet/subsonic/subsonicsettingspage.cpp index 416cc789e..47c53bfce 100644 --- a/src/internet/subsonic/subsonicsettingspage.cpp +++ b/src/internet/subsonic/subsonicsettingspage.cpp @@ -20,11 +20,12 @@ #include "subsonicsettingspage.h" #include "ui_subsonicsettingspage.h" -#include "core/logging.h" -#include "internet/core/internetmodel.h" #include +#include "core/logging.h" +#include "internet/core/internetmodel.h" + SubsonicSettingsPage::SubsonicSettingsPage(SettingsDialog* dialog) : SettingsPage(dialog), ui_(new Ui_SubsonicSettingsPage), diff --git a/src/internet/vk/vkconnection.cpp b/src/internet/vk/vkconnection.cpp index d7029143c..d44a65e65 100644 --- a/src/internet/vk/vkconnection.cpp +++ b/src/internet/vk/vkconnection.cpp @@ -17,6 +17,8 @@ along with Clementine. If not, see . */ +#include "vkconnection.h" + #include #include diff --git a/src/internet/vk/vkmusiccache.cpp b/src/internet/vk/vkmusiccache.cpp index 541db2b16..62033948c 100644 --- a/src/internet/vk/vkmusiccache.cpp +++ b/src/internet/vk/vkmusiccache.cpp @@ -16,7 +16,6 @@ along with Clementine. If not, see . */ #include "vkmusiccache.h" -#include "vkservice.h" #include #include @@ -24,6 +23,7 @@ #include "core/application.h" #include "core/logging.h" #include "core/taskmanager.h" +#include "vkservice.h" VkMusicCache::VkMusicCache(Application* app, VkService* service) : QObject(service), diff --git a/src/internet/vk/vksearchdialog.cpp b/src/internet/vk/vksearchdialog.cpp index 0f99b5385..c1314e568 100644 --- a/src/internet/vk/vksearchdialog.cpp +++ b/src/internet/vk/vksearchdialog.cpp @@ -16,14 +16,14 @@ along with Clementine. If not, see . */ +#include "vksearchdialog.h" +#include "ui_vksearchdialog.h" + #include #include #include "vkservice.h" -#include "vksearchdialog.h" -#include "ui_vksearchdialog.h" - VkSearchDialog::VkSearchDialog(VkService* service, QWidget* parent) : QDialog(parent), ui(new Ui::VkSearchDialog),