From 8b934b7adaad5e432fc3f0bf0f43d0c7679af1ab Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Tue, 16 Dec 2014 14:32:10 +0100 Subject: [PATCH 1/8] Make formater a little bit more generic --- dist/format.py | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100644 => 100755 dist/format.py diff --git a/dist/format.py b/dist/format.py old mode 100644 new mode 100755 index 834c058d7..a3b39c932 --- a/dist/format.py +++ b/dist/format.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python import argparse import difflib import os @@ -20,6 +21,9 @@ def main(): help='file extensions to reformat') parser.add_argument('-i', dest='inplace', action='store_true', help='edit files inplace instead of showing a diff') + parser.add_argument('--files', nargs='*', metavar='FIL', + default=[], + help='get files as arguments insted of git') args = parser.parse_args() try: @@ -35,8 +39,14 @@ def main(): if not changed_files: print >> sys.stderr, 'No changes from %s' % args.ref + + if not args.files and not changed_files: + print >> sys.stderr, "Use --files to select files for reformat" return + if args.files: + changed_files = args.files + for filename in changed_files: if not os.path.splitext(filename)[1][1:] in args.extension: continue From ad4bc3b88bf2faf9395e1ca296ccdbf98390ecfc Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Tue, 16 Dec 2014 14:59:17 +0100 Subject: [PATCH 2/8] Cherry pick more make format changes src/podcasts --- src/podcasts/gpoddersync.cpp | 4 ++-- src/podcasts/podcastdownloader.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/podcasts/gpoddersync.cpp b/src/podcasts/gpoddersync.cpp index 76084ebfc..bf8e15067 100644 --- a/src/podcasts/gpoddersync.cpp +++ b/src/podcasts/gpoddersync.cpp @@ -170,7 +170,7 @@ void GPodderSync::DeviceUpdatesFailed(mygpo::DeviceUpdatesPtr reply) { void GPodderSync::DeviceUpdatesFinished(mygpo::DeviceUpdatesPtr reply) { // Remember episode actions for each podcast, so when we add a new podcast // we can apply the actions immediately. - QMap > episodes_by_podcast; + QMap> episodes_by_podcast; for (mygpo::EpisodePtr episode : reply->updateList()) { episodes_by_podcast[episode->podcastUrl()].append(episode); } @@ -235,7 +235,7 @@ void GPodderSync::NewPodcastLoaded(PodcastUrlLoaderReply* reply, } void GPodderSync::ApplyActions( - const QList >& actions, + const QList>& actions, PodcastEpisodeList* episodes) { for (PodcastEpisodeList::iterator it = episodes->begin(); it != episodes->end(); ++it) { diff --git a/src/podcasts/podcastdownloader.cpp b/src/podcasts/podcastdownloader.cpp index 1ec266fdb..05d7ae707 100644 --- a/src/podcasts/podcastdownloader.cpp +++ b/src/podcasts/podcastdownloader.cpp @@ -64,13 +64,13 @@ void Task::reading() { } } void Task::finishedPublic() { - disconnect(repl.get(), SIGNAL(readyRead()), 0, 0); - disconnect(repl.get(), SIGNAL(downloadProgress(qint64, qint64)), 0, 0); - disconnect(repl.get(), SIGNAL(finished()), 0, 0); - emit ProgressChanged(episode_, PodcastDownload::NotDownloading, 0); - // Delete the file - file_->remove(); - emit finished(this); + disconnect(repl.get(), SIGNAL(readyRead()), 0, 0); + disconnect(repl.get(), SIGNAL(downloadProgress(qint64, qint64)), 0, 0); + disconnect(repl.get(), SIGNAL(finished()), 0, 0); + emit ProgressChanged(episode_, PodcastDownload::NotDownloading, 0); + // Delete the file + file_->remove(); + emit finished(this); } void Task::finishedInternal() { From ff620325689160ee6a879c1c47f5fc2a66310bd1 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Wed, 17 Dec 2014 19:02:21 +0100 Subject: [PATCH 3/8] Various formating changes in src/internet --- src/internet/boxservice.cpp | 22 +++++- src/internet/boxservice.h | 27 ++++++- src/internet/boxsettingspage.cpp | 3 +- src/internet/boxsettingspage.h | 11 +-- src/internet/boxurlhandler.cpp | 18 +++++ src/internet/boxurlhandler.h | 27 ++++++- src/internet/cloudfilesearchprovider.cpp | 26 +++---- src/internet/cloudfilesearchprovider.h | 19 +++-- src/internet/cloudfileservice.cpp | 39 +++++++--- src/internet/cloudfileservice.h | 26 ++++++- src/internet/digitallyimportedclient.cpp | 18 +++-- src/internet/digitallyimportedclient.h | 10 ++- src/internet/digitallyimportedservicebase.cpp | 23 +++--- src/internet/digitallyimportedservicebase.h | 20 ++--- .../digitallyimportedsettingspage.cpp | 4 +- src/internet/digitallyimportedsettingspage.h | 12 +-- src/internet/digitallyimportedurlhandler.cpp | 5 +- src/internet/digitallyimportedurlhandler.h | 10 ++- src/internet/dropboxauthenticator.cpp | 20 ++++- src/internet/dropboxauthenticator.h | 27 ++++++- src/internet/dropboxservice.cpp | 19 +++++ src/internet/dropboxservice.h | 27 ++++++- src/internet/dropboxsettingspage.cpp | 3 +- src/internet/dropboxsettingspage.h | 11 +-- src/internet/dropboxurlhandler.cpp | 18 +++++ src/internet/dropboxurlhandler.h | 26 ++++++- src/internet/fixlastfm.cpp | 4 +- src/internet/fixlastfm.h | 10 ++- src/internet/geolocator.cpp | 2 + src/internet/geolocator.h | 11 ++- src/internet/googledriveclient.cpp | 8 +- src/internet/googledriveclient.h | 26 ++++--- src/internet/googledriveservice.cpp | 41 ++++++++--- src/internet/googledriveservice.h | 28 ++++++- src/internet/googledrivesettingspage.cpp | 2 + src/internet/googledrivesettingspage.h | 10 ++- src/internet/googledriveurlhandler.cpp | 18 +++++ src/internet/googledriveurlhandler.h | 27 ++++++- src/internet/groovesharkradio.cpp | 4 +- src/internet/groovesharkradio.h | 13 ++-- src/internet/groovesharkservice.cpp | 38 +++++----- src/internet/groovesharkservice.h | 16 ++-- src/internet/groovesharksettingspage.cpp | 5 +- src/internet/groovesharksettingspage.h | 12 +-- src/internet/groovesharkurlhandler.cpp | 4 +- src/internet/groovesharkurlhandler.h | 10 ++- src/internet/icecastbackend.cpp | 6 +- src/internet/icecastbackend.h | 14 ++-- src/internet/icecastfilterwidget.cpp | 4 +- src/internet/icecastfilterwidget.h | 12 +-- src/internet/icecastitem.h | 25 ++++--- src/internet/icecastmodel.cpp | 5 +- src/internet/icecastmodel.h | 16 ++-- src/internet/icecastservice.cpp | 13 +++- src/internet/icecastservice.h | 20 +++-- src/internet/internetmimedata.h | 13 ++-- src/internet/internetmodel.cpp | 10 ++- src/internet/internetmodel.h | 17 +++-- src/internet/internetplaylistitem.cpp | 6 +- src/internet/internetplaylistitem.h | 14 ++-- src/internet/internetservice.cpp | 7 +- src/internet/internetservice.h | 15 ++-- src/internet/internetshowsettingspage.cpp | 3 +- src/internet/internetshowsettingspage.h | 11 +-- src/internet/internetsongmimedata.h | 12 +-- src/internet/internetview.cpp | 6 +- src/internet/internetview.h | 15 ++-- src/internet/internetviewcontainer.cpp | 5 +- src/internet/internetviewcontainer.h | 12 +-- src/internet/jamendodynamicplaylist.cpp | 6 +- src/internet/jamendodynamicplaylist.h | 16 ++-- src/internet/jamendoplaylistitem.cpp | 4 +- src/internet/jamendoplaylistitem.h | 14 ++-- src/internet/jamendoservice.cpp | 26 ++++--- src/internet/jamendoservice.h | 13 +++- src/internet/lastfmcompat.cpp | 22 +++--- src/internet/lastfmcompat.h | 12 +-- src/internet/lastfmservice.cpp | 11 ++- src/internet/lastfmservice.h | 17 +++-- src/internet/lastfmsettingspage.cpp | 6 +- src/internet/lastfmsettingspage.h | 13 ++-- src/internet/lastfmurlhandler.h | 10 ++- src/internet/localredirectserver.cpp | 18 +++++ src/internet/localredirectserver.h | 29 ++++++-- src/internet/magnatunedownloaddialog.cpp | 6 +- src/internet/magnatunedownloaddialog.h | 15 ++-- src/internet/magnatuneplaylistitem.cpp | 5 +- src/internet/magnatuneplaylistitem.h | 14 ++-- src/internet/magnatuneservice.cpp | 12 ++- src/internet/magnatuneservice.h | 12 +-- src/internet/magnatunesettingspage.cpp | 6 +- src/internet/magnatunesettingspage.h | 12 +-- src/internet/magnatuneurlhandler.cpp | 4 +- src/internet/magnatuneurlhandler.h | 10 ++- src/internet/oauthenticator.cpp | 26 ++++++- src/internet/oauthenticator.h | 29 +++++++- src/internet/savedradio.cpp | 7 +- src/internet/savedradio.h | 21 ++++-- src/internet/scrobbler.h | 28 +++++-- src/internet/seafileservice.cpp | 28 +++++-- src/internet/seafileservice.h | 28 ++++++- src/internet/seafilesettingspage.cpp | 4 +- src/internet/seafilesettingspage.h | 11 +-- src/internet/seafiletree.cpp | 21 +++++- src/internet/seafiletree.h | 30 ++++++-- src/internet/seafileurlhandler.cpp | 22 +++++- src/internet/seafileurlhandler.h | 26 ++++++- src/internet/searchboxwidget.cpp | 10 ++- src/internet/searchboxwidget.h | 15 ++-- src/internet/skydriveservice.cpp | 19 +++++ src/internet/skydriveservice.h | 25 ++++++- src/internet/skydrivesettingspage.cpp | 3 +- src/internet/skydrivesettingspage.h | 11 +-- src/internet/skydriveurlhandler.cpp | 18 +++++ src/internet/skydriveurlhandler.h | 27 ++++++- src/internet/somafmservice.cpp | 8 +- src/internet/somafmservice.h | 17 +++-- src/internet/somafmurlhandler.cpp | 8 +- src/internet/somafmurlhandler.h | 10 ++- src/internet/soundcloudservice.cpp | 62 ++++++++-------- src/internet/soundcloudservice.h | 18 +++-- src/internet/soundcloudsettingspage.cpp | 3 +- src/internet/soundcloudsettingspage.h | 11 +-- src/internet/spotifyblobdownloader.cpp | 4 +- src/internet/spotifyblobdownloader.h | 12 +-- src/internet/spotifyserver.cpp | 6 +- src/internet/spotifyserver.h | 16 ++-- src/internet/spotifyservice.cpp | 29 +++++++- src/internet/spotifyservice.h | 33 +++++++-- src/internet/spotifysettingspage.cpp | 6 +- src/internet/spotifysettingspage.h | 12 +-- src/internet/subsonicservice.cpp | 26 ++++++- src/internet/subsonicservice.h | 43 +++++++++-- src/internet/subsonicsettingspage.cpp | 20 +++++ src/internet/subsonicsettingspage.h | 27 ++++++- src/internet/subsonicurlhandler.cpp | 19 +++++ src/internet/subsonicurlhandler.h | 25 ++++++- src/internet/vkconnection.cpp | 2 + src/internet/vkconnection.h | 58 +++++++-------- src/internet/vkmusiccache.cpp | 3 +- src/internet/vkmusiccache.h | 9 ++- src/internet/vksearchdialog.cpp | 73 +++++++++---------- src/internet/vksearchdialog.h | 21 +++--- src/internet/vkservice.cpp | 8 +- src/internet/vkservice.h | 12 +-- src/internet/vksettingspage.cpp | 3 +- src/internet/vksettingspage.h | 15 ++-- src/internet/vkurlhandler.cpp | 3 +- src/internet/vkurlhandler.h | 9 ++- 149 files changed, 1697 insertions(+), 677 deletions(-) diff --git a/src/internet/boxservice.cpp b/src/internet/boxservice.cpp index 56b19ef46..86c4ea68d 100644 --- a/src/internet/boxservice.cpp +++ b/src/internet/boxservice.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "boxservice.h" #include @@ -27,7 +45,7 @@ static const int kRootFolderId = 0; static const char* kFileContent = "https://api.box.com/2.0/files/%1/content"; static const char* kEvents = "https://api.box.com/2.0/events"; -} +} // namespace BoxService::BoxService(Application* app, InternetModel* parent) : CloudFileService(app, parent, kServiceName, kSettingsGroup, @@ -263,7 +281,7 @@ void BoxService::UpdateFilesFromCursor(const QString& cursor) { } void BoxService::FetchEventsFinished(QNetworkReply* reply) { - // TODO: Page through events. + // TODO(John Maguire): Page through events. reply->deleteLater(); QJson::Parser parser; QVariantMap response = parser.parse(reply).toMap(); diff --git a/src/internet/boxservice.h b/src/internet/boxservice.h index 97a822b24..a0cd5cdda 100644 --- a/src/internet/boxservice.h +++ b/src/internet/boxservice.h @@ -1,5 +1,23 @@ -#ifndef BOXSERVICE_H -#define BOXSERVICE_H +/* This file is part of Clementine. + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_BOXSERVICE_H_ +#define INTERNET_BOXSERVICE_H_ #include "cloudfileservice.h" @@ -11,6 +29,7 @@ class QNetworkRequest; class BoxService : public CloudFileService { Q_OBJECT + public: BoxService(Application* app, InternetModel* parent); @@ -24,7 +43,7 @@ class BoxService : public CloudFileService { void Connect(); void ForgetCredentials(); -signals: + signals: void Connected(); private slots: @@ -52,4 +71,4 @@ signals: QDateTime expiry_time_; }; -#endif // BOXSERVICE_H +#endif // INTERNET_BOXSERVICE_H_ diff --git a/src/internet/boxsettingspage.cpp b/src/internet/boxsettingspage.cpp index f8889469a..2a12002b3 100644 --- a/src/internet/boxsettingspage.cpp +++ b/src/internet/boxsettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, John Maguire + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/boxsettingspage.h b/src/internet/boxsettingspage.h index d0f6c6130..afa476287 100644 --- a/src/internet/boxsettingspage.h +++ b/src/internet/boxsettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, John Maguire + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef BOXSETTINGSPAGE_H -#define BOXSETTINGSPAGE_H +#ifndef INTERNET_BOXSETTINGSPAGE_H_ +#define INTERNET_BOXSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -30,7 +31,7 @@ class BoxSettingsPage : public SettingsPage { Q_OBJECT public: - BoxSettingsPage(SettingsDialog* parent = nullptr); + explicit BoxSettingsPage(SettingsDialog* parent = nullptr); ~BoxSettingsPage(); void Load(); @@ -50,4 +51,4 @@ class BoxSettingsPage : public SettingsPage { BoxService* service_; }; -#endif // BOXSETTINGSPAGE_H +#endif // INTERNET_BOXSETTINGSPAGE_H_ diff --git a/src/internet/boxurlhandler.cpp b/src/internet/boxurlhandler.cpp index 08d404ad3..10c042285 100644 --- a/src/internet/boxurlhandler.cpp +++ b/src/internet/boxurlhandler.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "boxurlhandler.h" #include "boxservice.h" diff --git a/src/internet/boxurlhandler.h b/src/internet/boxurlhandler.h index 563942bcd..cd9f6bbee 100644 --- a/src/internet/boxurlhandler.h +++ b/src/internet/boxurlhandler.h @@ -1,5 +1,23 @@ -#ifndef BOXURLHANDLER_H -#define BOXURLHANDLER_H +/* This file is part of Clementine. + Copyright 2013, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_BOXURLHANDLER_H_ +#define INTERNET_BOXURLHANDLER_H_ #include "core/urlhandler.h" @@ -7,8 +25,9 @@ class BoxService; class BoxUrlHandler : public UrlHandler { Q_OBJECT + public: - BoxUrlHandler(BoxService* service, QObject* parent = nullptr); + explicit BoxUrlHandler(BoxService* service, QObject* parent = nullptr); QString scheme() const { return "box"; } QIcon icon() const { return QIcon(":/providers/box.png"); } @@ -18,4 +37,4 @@ class BoxUrlHandler : public UrlHandler { BoxService* service_; }; -#endif // BOXURLHANDLER_H +#endif // INTERNET_BOXURLHANDLER_H_ diff --git a/src/internet/cloudfilesearchprovider.cpp b/src/internet/cloudfilesearchprovider.cpp index f3185b8f1..e07c76f75 100644 --- a/src/internet/cloudfilesearchprovider.cpp +++ b/src/internet/cloudfilesearchprovider.cpp @@ -1,16 +1,17 @@ /* This file is part of Clementine. + Copyright 2014, Krzysztof Sobiecki Copyright 2014, David Sansome - + Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + Clementine is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with Clementine. If not, see . */ @@ -20,18 +21,11 @@ #include "internet/internetmodel.h" CloudFileSearchProvider::CloudFileSearchProvider( - LibraryBackendInterface* backend, - const QString& id, - const QIcon& icon, + LibraryBackendInterface* backend, const QString& id, const QIcon& icon, CloudFileService* service) - : LibrarySearchProvider(backend, - service->name(), - id, - icon, - true, - service->model()->app(), - service), - service_(service) { + : LibrarySearchProvider(backend, service->name(), id, icon, true, + service->model()->app(), service), + service_(service) { SetHint(CanShowConfig); } @@ -39,9 +33,7 @@ bool CloudFileSearchProvider::IsLoggedIn() { return service_->has_credentials(); } -void CloudFileSearchProvider::ShowConfig() { - service_->ShowSettingsDialog(); -} +void CloudFileSearchProvider::ShowConfig() { service_->ShowSettingsDialog(); } InternetService* CloudFileSearchProvider::internet_service() { return service_; diff --git a/src/internet/cloudfilesearchprovider.h b/src/internet/cloudfilesearchprovider.h index 3e41298d0..c514af7f1 100644 --- a/src/internet/cloudfilesearchprovider.h +++ b/src/internet/cloudfilesearchprovider.h @@ -1,22 +1,23 @@ /* This file is part of Clementine. + Copyright 2014, Krzysztof Sobiecki Copyright 2014, David Sansome - + Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + Clementine is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with Clementine. If not, see . */ -#ifndef CLOUDFILESEARCHPROVIDER_H -#define CLOUDFILESEARCHPROVIDER_H +#ifndef INTERNET_CLOUDFILESEARCHPROVIDER_H_ +#define INTERNET_CLOUDFILESEARCHPROVIDER_H_ #include "globalsearch/librarysearchprovider.h" @@ -24,10 +25,8 @@ class CloudFileService; class CloudFileSearchProvider : public LibrarySearchProvider { public: - CloudFileSearchProvider(LibraryBackendInterface* backend, - const QString& id, - const QIcon& icon, - CloudFileService* service); + CloudFileSearchProvider(LibraryBackendInterface* backend, const QString& id, + const QIcon& icon, CloudFileService* service); virtual bool IsLoggedIn(); virtual void ShowConfig(); @@ -37,4 +36,4 @@ class CloudFileSearchProvider : public LibrarySearchProvider { CloudFileService* service_; }; -#endif // CLOUDFILESEARCHPROVIDER_H +#endif // INTERNET_CLOUDFILESEARCHPROVIDER_H_ diff --git a/src/internet/cloudfileservice.cpp b/src/internet/cloudfileservice.cpp index 96699520c..f46c62559 100644 --- a/src/internet/cloudfileservice.cpp +++ b/src/internet/cloudfileservice.cpp @@ -1,3 +1,23 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2013, Martin Brodbeck + Copyright 2013-2014, David Sansome + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "cloudfileservice.h" #include @@ -129,35 +149,34 @@ void CloudFileService::MaybeAddFileToDatabase(const Song& metadata, } if (indexing_task_id_ == -1) { - indexing_task_id_ = - task_manager_->StartTask(tr("Indexing %1").arg(name())); + indexing_task_id_ = task_manager_->StartTask(tr("Indexing %1").arg(name())); indexing_task_progress_ = 0; indexing_task_max_ = 0; } - indexing_task_max_ ++; - task_manager_->SetTaskProgress( - indexing_task_id_, indexing_task_progress_, indexing_task_max_); + indexing_task_max_++; + task_manager_->SetTaskProgress(indexing_task_id_, indexing_task_progress_, + indexing_task_max_); TagReaderClient::ReplyType* reply = app_->tag_reader_client()->ReadCloudFile( download_url, metadata.title(), metadata.filesize(), mime_type, authorisation); NewClosure(reply, SIGNAL(Finished(bool)), this, - SLOT(ReadTagsFinished(TagReaderClient::ReplyType*, Song)), - reply, metadata); + SLOT(ReadTagsFinished(TagReaderClient::ReplyType*, Song)), reply, + metadata); } void CloudFileService::ReadTagsFinished(TagReaderClient::ReplyType* reply, const Song& metadata) { reply->deleteLater(); - indexing_task_progress_ ++; + indexing_task_progress_++; if (indexing_task_progress_ == indexing_task_max_) { task_manager_->SetTaskFinished(indexing_task_id_); indexing_task_id_ = -1; emit AllIndexingTasksFinished(); } else { - task_manager_->SetTaskProgress( - indexing_task_id_, indexing_task_progress_, indexing_task_max_); + task_manager_->SetTaskProgress(indexing_task_id_, indexing_task_progress_, + indexing_task_max_); } const pb::tagreader::ReadCloudFileResponse& message = diff --git a/src/internet/cloudfileservice.h b/src/internet/cloudfileservice.h index 44e7cc5dc..6d78e484c 100644 --- a/src/internet/cloudfileservice.h +++ b/src/internet/cloudfileservice.h @@ -1,5 +1,24 @@ -#ifndef CLOUDFILESERVICE_H -#define CLOUDFILESERVICE_H +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_CLOUDFILESERVICE_H_ +#define INTERNET_CLOUDFILESERVICE_H_ #include "internetservice.h" @@ -19,6 +38,7 @@ class PlaylistManager; class CloudFileService : public InternetService { Q_OBJECT + public: CloudFileService(Application* app, InternetModel* parent, const QString& service_name, const QString& service_id, @@ -76,4 +96,4 @@ class CloudFileService : public InternetService { int indexing_task_max_; }; -#endif // CLOUDFILESERVICE_H +#endif // INTERNET_CLOUDFILESERVICE_H_ diff --git a/src/internet/digitallyimportedclient.cpp b/src/internet/digitallyimportedclient.cpp index 1a9d256b3..1b79fd5fc 100644 --- a/src/internet/digitallyimportedclient.cpp +++ b/src/internet/digitallyimportedclient.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,13 +46,13 @@ DigitallyImportedClient::DigitallyImportedClient(const QString& service_name, network_(new NetworkAccessManager(this)), service_name_(service_name) {} -void DigitallyImportedClient::SetAuthorisationHeader(QNetworkRequest* req) - const { - req->setRawHeader("Authorization", - "Basic " + QString("%1:%2") - .arg(kApiUsername, kApiPassword) - .toAscii() - .toBase64()); +void DigitallyImportedClient::SetAuthorisationHeader( + QNetworkRequest* req) const { + req->setRawHeader("Authorization", "Basic " + + QString("%1:%2") + .arg(kApiUsername, kApiPassword) + .toAscii() + .toBase64()); } QNetworkReply* DigitallyImportedClient::Auth(const QString& username, diff --git a/src/internet/digitallyimportedclient.h b/src/internet/digitallyimportedclient.h index 0a8364280..ef86f5450 100644 --- a/src/internet/digitallyimportedclient.h +++ b/src/internet/digitallyimportedclient.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef DIGITALLYIMPORTEDCLIENT_H -#define DIGITALLYIMPORTEDCLIENT_H +#ifndef INTERNET_DIGITALLYIMPORTEDCLIENT_H_ +#define INTERNET_DIGITALLYIMPORTEDCLIENT_H_ #include #include @@ -31,7 +33,7 @@ class DigitallyImportedClient : public QObject { Q_OBJECT public: - DigitallyImportedClient(const QString& service_name, QObject* parent = nullptr); + explicit DigitallyImportedClient(const QString& service_name, QObject* parent = nullptr); static const char* kApiUsername; static const char* kApiPassword; @@ -84,4 +86,4 @@ QDataStream& operator>>(QDataStream& in, DigitallyImportedClient::Channel& channel); Q_DECLARE_METATYPE(DigitallyImportedClient::Channel) -#endif // DIGITALLYIMPORTEDCLIENT_H +#endif // INTERNET_DIGITALLYIMPORTEDCLIENT_H_ diff --git a/src/internet/digitallyimportedservicebase.cpp b/src/internet/digitallyimportedservicebase.cpp index 3098a5571..a9266d4ee 100644 --- a/src/internet/digitallyimportedservicebase.cpp +++ b/src/internet/digitallyimportedservicebase.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2011-2012, 2014, John Maguire + Copyright 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -249,16 +252,14 @@ SkyFmService::SkyFmService(Application* app, InternetModel* model, JazzRadioService::JazzRadioService(Application* app, InternetModel* model, QObject* parent) - : DigitallyImportedServiceBase( - "JazzRadio", "JAZZRADIO.com", QUrl("http://www.jazzradio.com"), - QIcon(":/providers/jazzradio.png"), "jazzradio", app, model, true, - parent) { -} + : DigitallyImportedServiceBase("JazzRadio", "JAZZRADIO.com", + QUrl("http://www.jazzradio.com"), + QIcon(":/providers/jazzradio.png"), + "jazzradio", app, model, true, parent) {} RockRadioService::RockRadioService(Application* app, InternetModel* model, QObject* parent) - : DigitallyImportedServiceBase( - "RockRadio", "ROCKRADIO.com", QUrl("http://www.rockradio.com"), - QIcon(":/providers/rockradio.png"), "rockradio", app, model, false, - parent) { -} + : DigitallyImportedServiceBase("RockRadio", "ROCKRADIO.com", + QUrl("http://www.rockradio.com"), + QIcon(":/providers/rockradio.png"), + "rockradio", app, model, false, parent) {} diff --git a/src/internet/digitallyimportedservicebase.h b/src/internet/digitallyimportedservicebase.h index f210f5abf..6cb91a4fb 100644 --- a/src/internet/digitallyimportedservicebase.h +++ b/src/internet/digitallyimportedservicebase.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef DIGITALLYIMPORTEDSERVICEBASE_H -#define DIGITALLYIMPORTEDSERVICEBASE_H +#ifndef INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ +#define INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ #include @@ -38,8 +40,7 @@ class DigitallyImportedServiceBase : public InternetService { const QUrl& homepage_url, const QIcon& icon, const QString& api_service_name, Application* app, InternetModel* model, - bool has_premium, - QObject* parent = nullptr); + bool has_premium, QObject* parent = nullptr); ~DigitallyImportedServiceBase(); static const char* kSettingsGroup; @@ -66,7 +67,7 @@ class DigitallyImportedServiceBase : public InternetService { public slots: void ShowSettingsDialog(); -signals: + signals: void StreamsChanged(); private slots: @@ -98,7 +99,7 @@ signals: int premium_audio_type_; QString username_; QString listen_hash_; - bool has_premium_; // Does the service has premium features? + bool has_premium_; // Does the service has premium features? QStandardItem* root_; @@ -118,7 +119,8 @@ class DigitallyImportedService : public DigitallyImportedServiceBase { class SkyFmService : public DigitallyImportedServiceBase { public: - SkyFmService(Application* app, InternetModel* model, QObject* parent = nullptr); + SkyFmService(Application* app, InternetModel* model, + QObject* parent = nullptr); }; class JazzRadioService : public DigitallyImportedServiceBase { @@ -133,4 +135,4 @@ class RockRadioService : public DigitallyImportedServiceBase { QObject* parent = nullptr); }; -#endif // DIGITALLYIMPORTEDSERVICEBASE_H +#endif // INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ diff --git a/src/internet/digitallyimportedsettingspage.cpp b/src/internet/digitallyimportedsettingspage.cpp index f06a2db53..b3df3d75c 100644 --- a/src/internet/digitallyimportedsettingspage.cpp +++ b/src/internet/digitallyimportedsettingspage.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/digitallyimportedsettingspage.h b/src/internet/digitallyimportedsettingspage.h index f22947925..b9268e0ad 100644 --- a/src/internet/digitallyimportedsettingspage.h +++ b/src/internet/digitallyimportedsettingspage.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef DIGITALLYIMPORTEDSETTINGSPAGE_H -#define DIGITALLYIMPORTEDSETTINGSPAGE_H +#ifndef INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ +#define INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -29,7 +31,7 @@ class DigitallyImportedSettingsPage : public SettingsPage { Q_OBJECT public: - DigitallyImportedSettingsPage(SettingsDialog* dialog); + explicit DigitallyImportedSettingsPage(SettingsDialog* dialog); ~DigitallyImportedSettingsPage(); void Load(); @@ -51,4 +53,4 @@ class DigitallyImportedSettingsPage : public SettingsPage { DigitallyImportedClient* client_; }; -#endif // DIGITALLYIMPORTEDSETTINGSPAGE_H +#endif // INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ diff --git a/src/internet/digitallyimportedurlhandler.cpp b/src/internet/digitallyimportedurlhandler.cpp index c57cdf371..457c53b54 100644 --- a/src/internet/digitallyimportedurlhandler.cpp +++ b/src/internet/digitallyimportedurlhandler.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2012, Arnaud Bienner + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/digitallyimportedurlhandler.h b/src/internet/digitallyimportedurlhandler.h index 3386a6257..de682129b 100644 --- a/src/internet/digitallyimportedurlhandler.h +++ b/src/internet/digitallyimportedurlhandler.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef DIGITALLYIMPORTEDURLHANDLER_H -#define DIGITALLYIMPORTEDURLHANDLER_H +#ifndef INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ +#define INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ #include "core/urlhandler.h" @@ -43,4 +45,4 @@ class DigitallyImportedUrlHandler : public UrlHandler { QUrl last_original_url_; }; -#endif // DIGITALLYIMPORTEDURLHANDLER_H +#endif // INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ diff --git a/src/internet/dropboxauthenticator.cpp b/src/internet/dropboxauthenticator.cpp index b4378ad30..c69a702d7 100644 --- a/src/internet/dropboxauthenticator.cpp +++ b/src/internet/dropboxauthenticator.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "dropboxauthenticator.h" #include @@ -61,7 +79,7 @@ QMap ParseParamList(const QString& params) { } return ret; } -} +} // namespace void DropboxAuthenticator::RequestTokenFinished(QNetworkReply* reply) { reply->deleteLater(); diff --git a/src/internet/dropboxauthenticator.h b/src/internet/dropboxauthenticator.h index bd3a71809..d9e7933e4 100644 --- a/src/internet/dropboxauthenticator.h +++ b/src/internet/dropboxauthenticator.h @@ -1,5 +1,23 @@ -#ifndef DROPBOXAUTHENTICATOR_H -#define DROPBOXAUTHENTICATOR_H +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_DROPBOXAUTHENTICATOR_H_ +#define INTERNET_DROPBOXAUTHENTICATOR_H_ #include #include @@ -10,6 +28,7 @@ class QNetworkReply; class DropboxAuthenticator : public QObject { Q_OBJECT + public: explicit DropboxAuthenticator(QObject* parent = nullptr); void StartAuthorisation(); @@ -22,7 +41,7 @@ class DropboxAuthenticator : public QObject { static QByteArray GenerateAuthorisationHeader(const QString& token, const QString& secret); -signals: + signals: void Finished(); private slots: @@ -54,4 +73,4 @@ signals: QString name_; }; -#endif // DROPBOXAUTHENTICATOR_H +#endif // INTERNET_DROPBOXAUTHENTICATOR_H_ diff --git a/src/internet/dropboxservice.cpp b/src/internet/dropboxservice.cpp index f96b58cc6..dcff95c9f 100644 --- a/src/internet/dropboxservice.cpp +++ b/src/internet/dropboxservice.cpp @@ -1,3 +1,22 @@ +/* This file is part of Clementine. + Copyright 2012-2014, John Maguire + Copyright 2013, Martin Brodbeck + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "dropboxservice.h" #include diff --git a/src/internet/dropboxservice.h b/src/internet/dropboxservice.h index 9434fa5da..6df5caf74 100644 --- a/src/internet/dropboxservice.h +++ b/src/internet/dropboxservice.h @@ -1,5 +1,23 @@ -#ifndef DROPBOXSERVICE_H -#define DROPBOXSERVICE_H +/* This file is part of Clementine. + Copyright 2012-2013, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_DROPBOXSERVICE_H_ +#define INTERNET_DROPBOXSERVICE_H_ #include "internet/cloudfileservice.h" @@ -11,6 +29,7 @@ class QNetworkReply; class DropboxService : public CloudFileService { Q_OBJECT + public: DropboxService(Application* app, InternetModel* parent); @@ -21,7 +40,7 @@ class DropboxService : public CloudFileService { QUrl GetStreamingUrlFromSongId(const QUrl& url); -signals: + signals: void Connected(); public slots: @@ -46,4 +65,4 @@ signals: NetworkAccessManager* network_; }; -#endif // DROPBOXSERVICE_H +#endif // INTERNET_DROPBOXSERVICE_H_ diff --git a/src/internet/dropboxsettingspage.cpp b/src/internet/dropboxsettingspage.cpp index 22418d9d5..340b4d1f1 100644 --- a/src/internet/dropboxsettingspage.cpp +++ b/src/internet/dropboxsettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/dropboxsettingspage.h b/src/internet/dropboxsettingspage.h index f03f97e0a..10332f6d7 100644 --- a/src/internet/dropboxsettingspage.h +++ b/src/internet/dropboxsettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef DROPBOXSETTINGSPAGE_H -#define DROPBOXSETTINGSPAGE_H +#ifndef INTERNET_DROPBOXSETTINGSPAGE_H_ +#define INTERNET_DROPBOXSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -31,7 +32,7 @@ class DropboxSettingsPage : public SettingsPage { Q_OBJECT public: - DropboxSettingsPage(SettingsDialog* parent = nullptr); + explicit DropboxSettingsPage(SettingsDialog* parent = nullptr); ~DropboxSettingsPage(); void Load(); @@ -51,4 +52,4 @@ class DropboxSettingsPage : public SettingsPage { DropboxService* service_; }; -#endif // DROPBOXSETTINGSPAGE_H +#endif // INTERNET_DROPBOXSETTINGSPAGE_H_ diff --git a/src/internet/dropboxurlhandler.cpp b/src/internet/dropboxurlhandler.cpp index 1a2068e2c..dd5b8e568 100644 --- a/src/internet/dropboxurlhandler.cpp +++ b/src/internet/dropboxurlhandler.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "dropboxurlhandler.h" #include "internet/dropboxservice.h" diff --git a/src/internet/dropboxurlhandler.h b/src/internet/dropboxurlhandler.h index f86734f64..6ff9d5038 100644 --- a/src/internet/dropboxurlhandler.h +++ b/src/internet/dropboxurlhandler.h @@ -1,5 +1,23 @@ -#ifndef DROPBOXURLHANDLER_H -#define DROPBOXURLHANDLER_H +/* This file is part of Clementine. + Copyright 2012, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_DROPBOXURLHANDLER_H_ +#define INTERNET_DROPBOXURLHANDLER_H_ #include "core/urlhandler.h" @@ -8,7 +26,7 @@ class DropboxService; class DropboxUrlHandler : public UrlHandler { Q_OBJECT public: - DropboxUrlHandler(DropboxService* service, QObject* parent = nullptr); + explicit DropboxUrlHandler(DropboxService* service, QObject* parent = nullptr); QString scheme() const { return "dropbox"; } QIcon icon() const { return QIcon(":providers/dropbox.png"); } @@ -18,4 +36,4 @@ class DropboxUrlHandler : public UrlHandler { DropboxService* service_; }; -#endif +#endif // INTERNET_DROPBOXURLHANDLER_H_ diff --git a/src/internet/fixlastfm.cpp b/src/internet/fixlastfm.cpp index 607f5c162..8884e0e26 100644 --- a/src/internet/fixlastfm.cpp +++ b/src/internet/fixlastfm.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/fixlastfm.h b/src/internet/fixlastfm.h index f23e2702e..628f8b766 100644 --- a/src/internet/fixlastfm.h +++ b/src/internet/fixlastfm.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef FIXLASTFM_H -#define FIXLASTFM_H +#ifndef INTERNET_FIXLASTFM_H_ +#define INTERNET_FIXLASTFM_H_ // Include this before to fix a compile error in release mode @@ -27,4 +29,4 @@ QDebug& operator<<(QDebug&, const QUrl&); #endif -#endif +#endif // INTERNET_FIXLASTFM_H_ diff --git a/src/internet/geolocator.cpp b/src/internet/geolocator.cpp index 2c773b995..f527dd81d 100644 --- a/src/internet/geolocator.cpp +++ b/src/internet/geolocator.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/geolocator.h b/src/internet/geolocator.h index d0690aecc..461836a5d 100644 --- a/src/internet/geolocator.h +++ b/src/internet/geolocator.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef GEOLOCATOR_H -#define GEOLOCATOR_H +#ifndef INTERNET_GEOLOCATOR_H_ +#define INTERNET_GEOLOCATOR_H_ #include @@ -24,6 +26,7 @@ class Geolocator : public QObject { Q_OBJECT + public: explicit Geolocator(QObject* parent = nullptr); @@ -47,7 +50,7 @@ class Geolocator : public QObject { int lng_e6_; }; -signals: + signals: void Finished(Geolocator::LatLng latlng); private slots: @@ -62,4 +65,4 @@ signals: QDebug operator<<(QDebug dbg, const Geolocator::LatLng& ll); Q_DECLARE_METATYPE(Geolocator::LatLng); -#endif // GEOLOCATOR_H +#endif // INTERNET_GEOLOCATOR_H_ diff --git a/src/internet/googledriveclient.cpp b/src/internet/googledriveclient.cpp index 5987e5165..7684264e6 100644 --- a/src/internet/googledriveclient.cpp +++ b/src/internet/googledriveclient.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2012, 2014, David Sansome + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +46,7 @@ static const char* kOAuthScope = "https://www.googleapis.com/auth/userinfo.email"; static const char* kClientId = "679260893280.apps.googleusercontent.com"; static const char* kClientSecret = "l3cWb8efUZsrBI4wmY3uKl6i"; -} +} // namespace QStringList File::parent_ids() const { QStringList ret; @@ -201,7 +203,7 @@ void Client::ListChangesFinished(ListChangesResponse* response, QJson::Parser parser; bool ok = false; - // TODO: Put this on a separate thread as the response could be large. + // TODO(John Maguire): Put this on a separate thread as the response could be large. QVariantMap result = parser.parse(reply, &ok).toMap(); if (!ok) { qLog(Error) << "Failed to fetch changes" << response->cursor(); diff --git a/src/internet/googledriveclient.h b/src/internet/googledriveclient.h index 3708f55e6..b07e176fd 100644 --- a/src/internet/googledriveclient.h +++ b/src/internet/googledriveclient.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef GOOGLEDRIVECLIENT_H -#define GOOGLEDRIVECLIENT_H +#ifndef INTERNET_GOOGLEDRIVECLIENT_H_ +#define INTERNET_GOOGLEDRIVECLIENT_H_ #include #include @@ -37,7 +39,7 @@ class Client; // Holds the metadata for a file on Google Drive. class File { public: - File(const QVariantMap& data = QVariantMap()) : data_(data) {} + explicit File(const QVariantMap& data = QVariantMap()) : data_(data) {} static const char* kFolderMimeType; @@ -46,7 +48,7 @@ class File { QString title() const { return data_["title"].toString(); } QString mime_type() const { return data_["mimeType"].toString(); } QString description() const { return data_["description"].toString(); } - long size() const { return data_["fileSize"].toUInt(); } + qint64 size() const { return data_["fileSize"].toUInt(); } QUrl download_url() const { return data_["downloadUrl"].toUrl(); } QUrl alternate_link() const { return data_["alternateLink"].toUrl(); } @@ -85,11 +87,11 @@ class ConnectResponse : public QObject { const QString& refresh_token() const { return refresh_token_; } const QString& user_email() const { return user_email_; } -signals: + signals: void Finished(); private: - ConnectResponse(QObject* parent); + explicit ConnectResponse(QObject* parent); QString refresh_token_; QString user_email_; }; @@ -102,7 +104,7 @@ class GetFileResponse : public QObject { const QString& file_id() const { return file_id_; } const File& file() const { return file_; } -signals: + signals: void Finished(); private: @@ -119,7 +121,7 @@ class ListChangesResponse : public QObject { const QString& cursor() const { return cursor_; } const QString& next_cursor() const { return next_cursor_; } -signals: + signals: void FilesFound(const QList& files); void FilesDeleted(const QList& files); void Finished(); @@ -134,7 +136,7 @@ class Client : public QObject { Q_OBJECT public: - Client(QObject* parent = nullptr); + explicit Client(QObject* parent = nullptr); bool is_authenticated() const; const QString& access_token() const { return access_token_; } @@ -145,7 +147,7 @@ class Client : public QObject { GetFileResponse* GetFile(const QString& file_id); ListChangesResponse* ListChanges(const QString& cursor); -signals: + signals: void Authenticated(); private slots: @@ -166,6 +168,6 @@ signals: QDateTime expiry_time_; }; -} // namespace +} // namespace google_drive -#endif // GOOGLEDRIVECLIENT_H +#endif // INTERNET_GOOGLEDRIVECLIENT_H_ diff --git a/src/internet/googledriveservice.cpp b/src/internet/googledriveservice.cpp index 838129073..0704fb299 100644 --- a/src/internet/googledriveservice.cpp +++ b/src/internet/googledriveservice.cpp @@ -1,3 +1,22 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2012, 2014, David Sansome + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "googledriveservice.h" #include @@ -92,9 +111,8 @@ void GoogleDriveService::ListChangesFinished( if (is_indexing()) { // Only save the cursor after all the songs have been indexed - that way if // Clementine is closed it'll resume next time. - NewClosure(this, SIGNAL(AllIndexingTasksFinished()), - this, SLOT(SaveCursor(QString)), - cursor); + NewClosure(this, SIGNAL(AllIndexingTasksFinished()), this, + SLOT(SaveCursor(QString)), cursor); } else { SaveCursor(cursor); } @@ -198,12 +216,12 @@ void GoogleDriveService::ShowContextMenu(const QPoint& global_pos) { QIcon(":/providers/googledrive.png"), tr("Open in Google Drive"), this, SLOT(OpenWithDrive())); context_menu_->addSeparator(); - update_action_ = context_menu_->addAction( - IconLoader::Load("view-refresh"), tr("Check for updates"), - this, SLOT(CheckForUpdates())); + update_action_ = context_menu_->addAction(IconLoader::Load("view-refresh"), + tr("Check for updates"), this, + SLOT(CheckForUpdates())); full_rescan_action_ = context_menu_->addAction( - IconLoader::Load("view-refresh"), tr("Do a full rescan..."), - this, SLOT(ConfirmFullRescan())); + IconLoader::Load("view-refresh"), tr("Do a full rescan..."), this, + SLOT(ConfirmFullRescan())); context_menu_->addSeparator(); context_menu_->addAction(IconLoader::Load("download"), tr("Cover Manager"), this, SLOT(ShowCoverManager())); @@ -246,15 +264,14 @@ void GoogleDriveService::OpenWithDrive() { void GoogleDriveService::ConfirmFullRescan() { QMessageBox* message_box = new QMessageBox( - QMessageBox::Warning, - tr("Do a full rescan"), + QMessageBox::Warning, tr("Do a full rescan"), tr("Doing a full rescan will lose any metadata you've saved in " "Clementine such as cover art, play counts and ratings. Clementine " "will rescan all your music in Google Drive which may take some " "time."), QMessageBox::NoButton); - QPushButton* button = message_box->addButton( - tr("Do a full rescan"), QMessageBox::DestructiveRole); + QPushButton* button = message_box->addButton(tr("Do a full rescan"), + QMessageBox::DestructiveRole); connect(button, SIGNAL(clicked()), SLOT(DoFullRescan())); message_box->addButton(QMessageBox::Cancel); diff --git a/src/internet/googledriveservice.h b/src/internet/googledriveservice.h index 6d698d8df..b204aa0c1 100644 --- a/src/internet/googledriveservice.h +++ b/src/internet/googledriveservice.h @@ -1,5 +1,24 @@ -#ifndef GOOGLEDRIVESERVICE_H -#define GOOGLEDRIVESERVICE_H +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2012, 2014, David Sansome + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_GOOGLEDRIVESERVICE_H_ +#define INTERNET_GOOGLEDRIVESERVICE_H_ #include "cloudfileservice.h" @@ -13,6 +32,7 @@ class ListChangesResponse; class GoogleDriveService : public CloudFileService { Q_OBJECT + public: GoogleDriveService(Application* app, InternetModel* parent); @@ -31,7 +51,7 @@ class GoogleDriveService : public CloudFileService { void Connect(); void ForgetCredentials(); -signals: + signals: void Connected(); private slots: @@ -58,4 +78,4 @@ signals: QAction* full_rescan_action_; }; -#endif +#endif // INTERNET_GOOGLEDRIVESERVICE_H_ diff --git a/src/internet/googledrivesettingspage.cpp b/src/internet/googledrivesettingspage.cpp index 5a4ff2622..3c0bb5d5f 100644 --- a/src/internet/googledrivesettingspage.cpp +++ b/src/internet/googledrivesettingspage.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/googledrivesettingspage.h b/src/internet/googledrivesettingspage.h index 37da9cb46..ae9363c2d 100644 --- a/src/internet/googledrivesettingspage.h +++ b/src/internet/googledrivesettingspage.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef GOOGLEDRIVESETTINGSPAGE_H -#define GOOGLEDRIVESETTINGSPAGE_H +#ifndef INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ +#define INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -30,7 +32,7 @@ class GoogleDriveSettingsPage : public SettingsPage { Q_OBJECT public: - GoogleDriveSettingsPage(SettingsDialog* parent = nullptr); + explicit GoogleDriveSettingsPage(SettingsDialog* parent = nullptr); ~GoogleDriveSettingsPage(); void Load(); @@ -50,4 +52,4 @@ class GoogleDriveSettingsPage : public SettingsPage { GoogleDriveService* service_; }; -#endif // GOOGLEDRIVESETTINGSPAGE_H +#endif // INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ diff --git a/src/internet/googledriveurlhandler.cpp b/src/internet/googledriveurlhandler.cpp index 2a35297cb..a700f9e20 100644 --- a/src/internet/googledriveurlhandler.cpp +++ b/src/internet/googledriveurlhandler.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "googledriveurlhandler.h" #include "googledriveservice.h" diff --git a/src/internet/googledriveurlhandler.h b/src/internet/googledriveurlhandler.h index a4f9a4bf7..7403fe4c4 100644 --- a/src/internet/googledriveurlhandler.h +++ b/src/internet/googledriveurlhandler.h @@ -1,5 +1,23 @@ -#ifndef GOOGLEDRIVEURLHANDLER_H -#define GOOGLEDRIVEURLHANDLER_H +/* This file is part of Clementine. + Copyright 2012, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_GOOGLEDRIVEURLHANDLER_H_ +#define INTERNET_GOOGLEDRIVEURLHANDLER_H_ #include "core/urlhandler.h" @@ -7,8 +25,9 @@ class GoogleDriveService; class GoogleDriveUrlHandler : public UrlHandler { Q_OBJECT + public: - GoogleDriveUrlHandler(GoogleDriveService* service, QObject* parent = nullptr); + explicit GoogleDriveUrlHandler(GoogleDriveService* service, QObject* parent = nullptr); QString scheme() const { return "googledrive"; } QIcon icon() const { return QIcon(":providers/googledrive.png"); } @@ -18,4 +37,4 @@ class GoogleDriveUrlHandler : public UrlHandler { GoogleDriveService* service_; }; -#endif +#endif // INTERNET_GOOGLEDRIVEURLHANDLER_H_ diff --git a/src/internet/groovesharkradio.cpp b/src/internet/groovesharkradio.cpp index 64e127908..2ea49712c 100644 --- a/src/internet/groovesharkradio.cpp +++ b/src/internet/groovesharkradio.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/groovesharkradio.h b/src/internet/groovesharkradio.h index 56df3d619..6ce45da51 100644 --- a/src/internet/groovesharkradio.h +++ b/src/internet/groovesharkradio.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,20 +17,19 @@ along with Clementine. If not, see . */ -#ifndef GROOVESHARKRADIO_H -#define GROOVESHARKRADIO_H +#ifndef INTERNET_GROOVESHARKRADIO_H_ +#define INTERNET_GROOVESHARKRADIO_H_ #include "smartplaylists/generator.h" class GroovesharkService; class GroovesharkRadio : public smart_playlists::Generator { - public: // Start Grooveshark radio for a particular type of music GroovesharkRadio(GroovesharkService* service, int tag_id); // Start Grooveshark radio based on last artists and songs you listen to - GroovesharkRadio(GroovesharkService* service); + explicit GroovesharkRadio(GroovesharkService* service); QString type() const { return "Grooveshark"; } void Load(const QByteArray& data); @@ -48,4 +49,4 @@ class GroovesharkRadio : public smart_playlists::Generator { QVariantMap autoplay_state_; }; -#endif // GROOVESHARKRADIO_H +#endif // INTERNET_GROOVESHARKRADIO_H_ diff --git a/src/internet/groovesharkservice.cpp b/src/internet/groovesharkservice.cpp index dbe243587..6388d8a7a 100644 --- a/src/internet/groovesharkservice.cpp +++ b/src/internet/groovesharkservice.cpp @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011-2014, Arnaud Bienner + Copyright 2011-2012, 2014, John Maguire + Copyright 2011, HYPNOTOAD + Copyright 2011-2012, David Sansome + Copyright 2014, Antonio Nicolás Pina + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,7 +123,6 @@ GroovesharkService::GroovesharkService(Application* app, InternetModel* parent) task_popular_id_(0), task_playlists_id_(0), task_search_id_(0) { - app_->player()->RegisterUrlHandler(url_handler_); search_delay_->setInterval(kSearchDelayMsec); @@ -442,7 +446,8 @@ void GroovesharkService::RemoveItems() { playlists_.clear(); subscribed_playlists_parent_ = nullptr; subscribed_playlists_.clear(); - // Cancel any pending requests and mark tasks as finished, in case they weren't + // Cancel any pending requests and mark tasks as finished, in case they + // weren't // finished yet. pending_retrieve_playlists_.clear(); app_->task_manager()->SetTaskFinished(task_playlists_id_); @@ -719,7 +724,8 @@ void GroovesharkService::UserPlaylistsRetrieved(QNetworkReply* reply) { } void GroovesharkService::PlaylistSongsRetrieved(QNetworkReply* reply, - int playlist_id, int request_id) { + int playlist_id, + int request_id) { reply->deleteLater(); if (!pending_retrieve_playlists_.remove(request_id)) { @@ -1273,9 +1279,9 @@ void GroovesharkService::RefreshPlaylist(int playlist_id) { parameters << Param("playlistID", playlist_id); QNetworkReply* reply = CreateRequest("getPlaylistSongs", parameters); int id = next_pending_playlist_retrieve_id_++; - NewClosure(reply, SIGNAL(finished()), - this, SLOT(PlaylistSongsRetrieved(QNetworkReply*, int, int)), - reply, playlist_id, id); + NewClosure(reply, SIGNAL(finished()), this, + SLOT(PlaylistSongsRetrieved(QNetworkReply*, int, int)), reply, + playlist_id, id); pending_retrieve_playlists_.insert(id); } @@ -1468,9 +1474,8 @@ void GroovesharkService::UserLibrarySongAdded(QNetworkReply* reply, void GroovesharkService::RemoveCurrentFromPlaylist() { const QModelIndexList& indexes(model()->selected_indexes()); - QMap > playlists_songs_ids; + QMap> playlists_songs_ids; for (const QModelIndex& index : indexes) { - if (index.parent().data(InternetModel::Role_Type).toInt() != InternetModel::Type_UserPlaylist) { continue; @@ -1483,7 +1488,7 @@ void GroovesharkService::RemoveCurrentFromPlaylist() { } } - for (QMap >::const_iterator it = + for (QMap>::const_iterator it = playlists_songs_ids.constBegin(); it != playlists_songs_ids.constEnd(); ++it) { RemoveFromPlaylist(it.key(), it.value()); @@ -1508,7 +1513,6 @@ void GroovesharkService::RemoveCurrentFromFavorites() { const QModelIndexList& indexes(model()->selected_indexes()); QList songs_ids; for (const QModelIndex& index : indexes) { - if (index.parent().data(Role_PlaylistType).toInt() != UserFavorites) { continue; } @@ -1561,7 +1565,6 @@ void GroovesharkService::RemoveCurrentFromLibrary() { QList songs_ids; for (const QModelIndex& index : indexes) { - if (index.parent().data(Role_PlaylistType).toInt() != UserLibrary) { continue; } @@ -1619,7 +1622,6 @@ void GroovesharkService::SongsRemovedFromLibrary(QNetworkReply* reply, QNetworkReply* GroovesharkService::CreateRequest(const QString& method_name, const QList& params, bool use_https) { - QVariantMap request_params; request_params.insert("method", method_name); @@ -1650,9 +1652,8 @@ QNetworkReply* GroovesharkService::CreateRequest(const QString& method_name, url.setScheme("https"); } url.setQueryItems( - QList >() - << QPair( - "sig", Utilities::HmacMd5(api_key_, post_params).toHex())); + QList>() << QPair( + "sig", Utilities::HmacMd5(api_key_, post_params).toHex())); QNetworkRequest req(url); QNetworkReply* reply = network_->post(req, post_params); @@ -1723,11 +1724,12 @@ bool CompareSongs(const QVariant& song1, const QVariant& song2) { int song2_sort = song2_map["Sort"].toInt(); if (song1_sort == song2_sort) { // Favorite songs have a "TSFavorited" and (currently) no "Sort" field - return song1_map["TSFavorited"].toString() < song2_map["TSFavorited"].toString(); + return song1_map["TSFavorited"].toString() < + song2_map["TSFavorited"].toString(); } return song1_sort < song2_sort; } -} +} // namespace SongList GroovesharkService::ExtractSongs(const QVariantMap& result) { QVariantList result_songs = result["songs"].toList(); diff --git a/src/internet/groovesharkservice.h b/src/internet/groovesharkservice.h index b955b8568..59b715b4f 100644 --- a/src/internet/groovesharkservice.h +++ b/src/internet/groovesharkservice.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011-2014, Arnaud Bienner + Copyright 2011-2012, 2014, John Maguire + Copyright 2012, David Sansome + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef GROOVESHARKSERVICE_H -#define GROOVESHARKSERVICE_H +#ifndef INTERNET_GROOVESHARKSERVICE_H_ +#define INTERNET_GROOVESHARKSERVICE_H_ #include "internetmodel.h" #include "internetservice.h" @@ -35,6 +38,7 @@ class QSortFilterProxyModel; class GroovesharkService : public InternetService { Q_OBJECT + public: GroovesharkService(Application* app, InternetModel* parent); ~GroovesharkService(); @@ -123,7 +127,7 @@ class GroovesharkService : public InternetService { static const char* kServiceName; static const char* kSettingsGroup; -signals: + signals: void LoginFinished(bool success); void SimpleSearchResults(int id, SongList songs); // AlbumSearchResult emits the search id and the Grooveshark ids of the @@ -222,7 +226,7 @@ signals: // If need_authentication is true, add session_id to params. // Returns the reply object created QNetworkReply* CreateRequest(const QString& method_name, - const QList >& params, + const QList>& params, bool use_https = false); // Convenient function which block until 'reply' replies, or timeout after 10 // seconds. Returns false if reply has timeouted @@ -332,4 +336,4 @@ signals: static const char* kApiSecret; }; -#endif // GROOVESHARKSERVICE_H +#endif // INTERNET_GROOVESHARKSERVICE_H_ diff --git a/src/internet/groovesharksettingspage.cpp b/src/internet/groovesharksettingspage.cpp index ca198f5b3..9daf50df6 100644 --- a/src/internet/groovesharksettingspage.cpp +++ b/src/internet/groovesharksettingspage.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, 2014, Arnaud Bienner + Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/groovesharksettingspage.h b/src/internet/groovesharksettingspage.h index 88b74fbe4..c36fdaa89 100644 --- a/src/internet/groovesharksettingspage.h +++ b/src/internet/groovesharksettingspage.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef GROOVESHARKSETTINGSPAGE_H -#define GROOVESHARKSETTINGSPAGE_H +#ifndef INTERNET_GROOVESHARKSETTINGSPAGE_H_ +#define INTERNET_GROOVESHARKSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -28,7 +30,7 @@ class GroovesharkSettingsPage : public SettingsPage { Q_OBJECT public: - GroovesharkSettingsPage(SettingsDialog* dialog); + explicit GroovesharkSettingsPage(SettingsDialog* dialog); ~GroovesharkSettingsPage(); void Load(); @@ -51,4 +53,4 @@ class GroovesharkSettingsPage : public SettingsPage { QString original_password_; }; -#endif // GROOVESHARKSETTINGSPAGE_H +#endif // INTERNET_GROOVESHARKSETTINGSPAGE_H_ diff --git a/src/internet/groovesharkurlhandler.cpp b/src/internet/groovesharkurlhandler.cpp index c505baf1c..9554892c8 100644 --- a/src/internet/groovesharkurlhandler.cpp +++ b/src/internet/groovesharkurlhandler.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/groovesharkurlhandler.h b/src/internet/groovesharkurlhandler.h index cc5cad9e7..86b391c21 100644 --- a/src/internet/groovesharkurlhandler.h +++ b/src/internet/groovesharkurlhandler.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef GROOVESHARKURLHANDLER_H -#define GROOVESHARKURLHANDLER_H +#ifndef INTERNET_GROOVESHARKURLHANDLER_H_ +#define INTERNET_GROOVESHARKURLHANDLER_H_ #include "core/urlhandler.h" @@ -47,4 +49,4 @@ class GroovesharkUrlHandler : public UrlHandler { QString last_stream_key_; }; -#endif // GROOVESHARKURLHANDLER_H +#endif // INTERNET_GROOVESHARKURLHANDLER_H_ diff --git a/src/internet/icecastbackend.cpp b/src/internet/icecastbackend.cpp index c449d8cf2..6957e4293 100644 --- a/src/internet/icecastbackend.cpp +++ b/src/internet/icecastbackend.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2011, Paweł Bara + Copyright 2012, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/icecastbackend.h b/src/internet/icecastbackend.h index 3e3115488..78ee635c7 100644 --- a/src/internet/icecastbackend.h +++ b/src/internet/icecastbackend.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, 2012, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef ICECASTBACKEND_H -#define ICECASTBACKEND_H +#ifndef INTERNET_ICECASTBACKEND_H_ +#define INTERNET_ICECASTBACKEND_H_ #include "core/song.h" @@ -29,7 +31,7 @@ class IcecastBackend : public QObject { Q_OBJECT public: - IcecastBackend(QObject* parent = nullptr); + explicit IcecastBackend(QObject* parent = nullptr); void Init(Database* db); static const char* kTableName; @@ -58,11 +60,11 @@ class IcecastBackend : public QObject { bool IsEmpty(); -signals: + signals: void DatabaseReset(); private: Database* db_; }; -#endif // ICECASTBACKEND_H +#endif // INTERNET_ICECASTBACKEND_H_ diff --git a/src/internet/icecastfilterwidget.cpp b/src/internet/icecastfilterwidget.cpp index ba7bb9a9e..895433e64 100644 --- a/src/internet/icecastfilterwidget.cpp +++ b/src/internet/icecastfilterwidget.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/icecastfilterwidget.h b/src/internet/icecastfilterwidget.h index c6c019d44..7084f8821 100644 --- a/src/internet/icecastfilterwidget.h +++ b/src/internet/icecastfilterwidget.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef ICECASTFILTERWIDGET_H -#define ICECASTFILTERWIDGET_H +#ifndef INTERNET_ICECASTFILTERWIDGET_H_ +#define INTERNET_ICECASTFILTERWIDGET_H_ #include "icecastmodel.h" @@ -33,7 +35,7 @@ class IcecastFilterWidget : public QWidget { Q_OBJECT public: - IcecastFilterWidget(QWidget* parent = nullptr); + explicit IcecastFilterWidget(QWidget* parent = nullptr); ~IcecastFilterWidget(); static const char* kSettingsGroup; @@ -60,4 +62,4 @@ class IcecastFilterWidget : public QWidget { QSignalMapper* sort_mode_mapper_; }; -#endif // ICECASTFILTERWIDGET_H +#endif // INTERNET_ICECASTFILTERWIDGET_H_ diff --git a/src/internet/icecastitem.h b/src/internet/icecastitem.h index d1178d002..5f6477de5 100644 --- a/src/internet/icecastitem.h +++ b/src/internet/icecastitem.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,22 +17,27 @@ along with Clementine. If not, see . */ -#ifndef ICECASTITEM_H -#define ICECASTITEM_H +#ifndef INTERNET_ICECASTITEM_H_ +#define INTERNET_ICECASTITEM_H_ #include "icecastbackend.h" #include "core/simpletreeitem.h" class IcecastItem : public SimpleTreeItem { public: - enum Type { Type_Root, Type_Genre, Type_Station, Type_Divider, }; + enum Type { + Type_Root, + Type_Genre, + Type_Station, + Type_Divider, + }; - IcecastItem(SimpleTreeModel* model) - : SimpleTreeItem(Type_Root, model) {} - IcecastItem(Type type, IcecastItem* parent = nullptr) - : SimpleTreeItem(type, parent) {} + explicit IcecastItem(SimpleTreeModel* model) + : SimpleTreeItem(Type_Root, model) {} + explicit IcecastItem(Type type, IcecastItem* parent = nullptr) + : SimpleTreeItem(type, parent) {} IcecastBackend::Station station; }; -#endif // ICECASTITEM_H +#endif // INTERNET_ICECASTITEM_H_ diff --git a/src/internet/icecastmodel.cpp b/src/internet/icecastmodel.cpp index c6d0e133a..98ef34493 100644 --- a/src/internet/icecastmodel.cpp +++ b/src/internet/icecastmodel.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2011, Paweł Bara + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/icecastmodel.h b/src/internet/icecastmodel.h index 02bbe8a00..3757e02a9 100644 --- a/src/internet/icecastmodel.h +++ b/src/internet/icecastmodel.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef ICECASTMODEL_H -#define ICECASTMODEL_H +#ifndef INTERNET_ICECASTMODEL_H_ +#define INTERNET_ICECASTMODEL_H_ #include "icecastitem.h" #include "core/simpletreemodel.h" @@ -30,7 +32,7 @@ class IcecastModel : public SimpleTreeModel { Q_OBJECT public: - IcecastModel(IcecastBackend* backend, QObject* parent = nullptr); + explicit IcecastModel(IcecastBackend* backend, QObject* parent = nullptr); ~IcecastModel(); // These values get saved in QSettings - don't change them @@ -40,7 +42,9 @@ class IcecastModel : public SimpleTreeModel { SortMode_StationAlphabetical = 2, }; - enum Role { Role_IsDivider = LibraryModel::Role_IsDivider, }; + enum Role { + Role_IsDivider = LibraryModel::Role_IsDivider, + }; IcecastBackend* backend() const { return backend_; } @@ -81,4 +85,4 @@ class IcecastModel : public SimpleTreeModel { QIcon station_icon_; }; -#endif // ICECASTMODEL_H +#endif // INTERNET_ICECASTMODEL_H_ diff --git a/src/internet/icecastservice.cpp b/src/internet/icecastservice.cpp index e8a8df534..55b38273c 100644 --- a/src/internet/icecastservice.cpp +++ b/src/internet/icecastservice.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2010, 2012, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,6 +19,8 @@ along with Clementine. If not, see . */ +#include "icecastservice.h" + #include #include @@ -28,7 +34,6 @@ #include "icecastbackend.h" #include "icecastfilterwidget.h" #include "icecastmodel.h" -#include "icecastservice.h" #include "internetmodel.h" #include "core/application.h" #include "core/closure.h" @@ -134,7 +139,7 @@ void IcecastService::DownloadDirectoryFinished(QNetworkReply* reply) { namespace { template struct GenreSorter { - GenreSorter(const QMultiHash& genres) : genres_(genres) {} + explicit GenreSorter(const QMultiHash& genres) : genres_(genres) {} bool operator()(const QString& a, const QString& b) const { return genres_.count(a) > genres_.count(b); @@ -184,7 +189,7 @@ QStringList FilterGenres(const QStringList& genres) { } return ret; } -} +} // namespace void IcecastService::ParseDirectoryFinished( QFuture future) { diff --git a/src/internet/icecastservice.h b/src/internet/icecastservice.h index 52c549597..ab5eaa766 100644 --- a/src/internet/icecastservice.h +++ b/src/internet/icecastservice.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2010, 2012, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,13 +18,14 @@ along with Clementine. If not, see . */ -#ifndef ICECASTSERVICE_H -#define ICECASTSERVICE_H +#ifndef INTERNET_ICECASTSERVICE_H_ +#define INTERNET_ICECASTSERVICE_H_ + +#include "internetservice.h" #include #include "icecastbackend.h" -#include "internetservice.h" class IcecastFilterWidget; class IcecastModel; @@ -33,6 +37,7 @@ class QNetworkReply; class IcecastService : public InternetService { Q_OBJECT + public: IcecastService(Application* app, InternetModel* parent); ~IcecastService(); @@ -41,7 +46,10 @@ class IcecastService : public InternetService { static const char* kDirectoryUrl; static const char* kHomepage; - enum ItemType { Type_Stream = 3000, Type_Genre, }; + enum ItemType { + Type_Stream = 3000, + Type_Genre, + }; QStandardItem* CreateRootItem(); void LazyPopulate(QStandardItem* item); @@ -73,4 +81,4 @@ class IcecastService : public InternetService { int load_directory_task_id_; }; -#endif +#endif // INTERNET_ICECASTSERVICE_H_ diff --git a/src/internet/internetmimedata.h b/src/internet/internetmimedata.h index 3e0513a49..3b844f8ff 100644 --- a/src/internet/internetmimedata.h +++ b/src/internet/internetmimedata.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2011, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETMIMEDATA_H -#define INTERNETMIMEDATA_H +#ifndef INTERNET_INTERNETMIMEDATA_H_ +#define INTERNET_INTERNETMIMEDATA_H_ #include "core/mimedata.h" @@ -29,10 +32,10 @@ class InternetMimeData : public MimeData { Q_OBJECT public: - InternetMimeData(const InternetModel* _model) : model(_model) {} + explicit InternetMimeData(const InternetModel* _model) : model(_model) {} const InternetModel* model; QModelIndexList indexes; }; -#endif // INTERNETMIMEDATA_H +#endif // INTERNET_INTERNETMIMEDATA_H_ diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp index f06e574df..243d452af 100644 --- a/src/internet/internetmodel.cpp +++ b/src/internet/internetmodel.cpp @@ -1,5 +1,13 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2014, David Sansome + Copyright 2010, 2012-2014, John Maguire + Copyright 2011-2012, 2014, Arnaud Bienner + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2011-2013, Alan Briolat + Copyright 2014, Maltsev Vlad + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetmodel.h b/src/internet/internetmodel.h index 98112c77f..19ca2db11 100644 --- a/src/internet/internetmodel.h +++ b/src/internet/internetmodel.h @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2012, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011-2012, Arnaud Bienner + Copyright 2011, Tyler Rhodes + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETMODEL_H -#define INTERNETMODEL_H +#ifndef INTERNET_INTERNETMODEL_H_ +#define INTERNET_INTERNETMODEL_H_ #include "core/song.h" #include "library/librarymodel.h" @@ -42,7 +47,7 @@ class InternetModel : public QStandardItemModel { Q_OBJECT public: - InternetModel(Application* app, QObject* parent = nullptr); + explicit InternetModel(Application* app, QObject* parent = nullptr); enum Role { // Services can use this role to distinguish between different types of @@ -169,7 +174,7 @@ class InternetModel : public QStandardItemModel { return shown_services_; } -signals: + signals: void StreamError(const QString& message); void StreamMetadataFound(const QUrl& original_url, const Song& song); @@ -193,4 +198,4 @@ signals: QModelIndex current_index_; }; -#endif // INTERNETMODEL_H +#endif // INTERNET_INTERNETMODEL_H_ diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp index 803a0b029..6781ffa6b 100644 --- a/src/internet/internetplaylistitem.cpp +++ b/src/internet/internetplaylistitem.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2011, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetplaylistitem.h b/src/internet/internetplaylistitem.h index 3f636397c..83b0c93ed 100644 --- a/src/internet/internetplaylistitem.h +++ b/src/internet/internetplaylistitem.h @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2011, David Sansome + Copyright 2010, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETPLAYLISTITEM_H -#define INTERNETPLAYLISTITEM_H +#ifndef INTERNET_INTERNETPLAYLISTITEM_H_ +#define INTERNET_INTERNETPLAYLISTITEM_H_ #include "core/song.h" #include "playlist/playlistitem.h" @@ -27,7 +31,7 @@ class InternetService; class InternetPlaylistItem : public PlaylistItem { public: - InternetPlaylistItem(const QString& type); + explicit InternetPlaylistItem(const QString& type); InternetPlaylistItem(InternetService* service, const Song& metadata); Options options() const; @@ -55,4 +59,4 @@ class InternetPlaylistItem : public PlaylistItem { Song metadata_; }; -#endif // INTERNETPLAYLISTITEM_H +#endif // INTERNET_INTERNETPLAYLISTITEM_H_ diff --git a/src/internet/internetservice.cpp b/src/internet/internetservice.cpp index ee033e651..d15642b81 100644 --- a/src/internet/internetservice.cpp +++ b/src/internet/internetservice.cpp @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2012, Arnaud Bienner + Copyright 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h index bf62a28ac..f30342be6 100644 --- a/src/internet/internetservice.h +++ b/src/internet/internetservice.h @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2012, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011-2012, Arnaud Bienner + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETSERVICE_H -#define INTERNETSERVICE_H +#ifndef INTERNET_INTERNETSERVICE_H_ +#define INTERNET_INTERNETSERVICE_H_ #include #include @@ -74,7 +79,7 @@ class InternetService : public QObject { virtual QString Icon() { return QString(); } -signals: + signals: void StreamError(const QString& message); void StreamMetadataFound(const QUrl& original_url, const Song& song); @@ -134,4 +139,4 @@ signals: Q_DECLARE_METATYPE(InternetService*); -#endif // INTERNETSERVICE_H +#endif // INTERNET_INTERNETSERVICE_H_ diff --git a/src/internet/internetshowsettingspage.cpp b/src/internet/internetshowsettingspage.cpp index c6cc13dd4..59d4b17f2 100644 --- a/src/internet/internetshowsettingspage.cpp +++ b/src/internet/internetshowsettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetshowsettingspage.h b/src/internet/internetshowsettingspage.h index 3c63ca583..f3b653d44 100644 --- a/src/internet/internetshowsettingspage.h +++ b/src/internet/internetshowsettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETSHOWSETTINGSPAGE_H -#define INTERNETSHOWSETTINGSPAGE_H +#ifndef INTERNET_INTERNETSHOWSETTINGSPAGE_H_ +#define INTERNET_INTERNETSHOWSETTINGSPAGE_H_ #include "ui/settingspage.h" #include "ui_internetshowsettingspage.h" @@ -30,7 +31,7 @@ class InternetShowSettingsPage : public SettingsPage { Q_OBJECT public: - InternetShowSettingsPage(SettingsDialog* dialog); + explicit InternetShowSettingsPage(SettingsDialog* dialog); void Load(); void Save(); @@ -39,4 +40,4 @@ class InternetShowSettingsPage : public SettingsPage { std::unique_ptr ui_; }; -#endif // INTERNETSHOWSETTINGSPAGE_H +#endif // INTERNET_INTERNETSHOWSETTINGSPAGE_H_ diff --git a/src/internet/internetsongmimedata.h b/src/internet/internetsongmimedata.h index 07e86d237..8788dfba6 100644 --- a/src/internet/internetsongmimedata.h +++ b/src/internet/internetsongmimedata.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETSONGMIMEDATA_H -#define INTERNETSONGMIMEDATA_H +#ifndef INTERNET_INTERNETSONGMIMEDATA_H_ +#define INTERNET_INTERNETSONGMIMEDATA_H_ #include "core/mimedata.h" #include "core/song.h" @@ -27,10 +29,10 @@ class InternetSongMimeData : public MimeData { Q_OBJECT public: - InternetSongMimeData(InternetService* _service) : service(_service) {} + explicit InternetSongMimeData(InternetService* _service) : service(_service) {} InternetService* service; SongList songs; }; -#endif // INTERNETSONGMIMEDATA_H +#endif // INTERNET_INTERNETSONGMIMEDATA_H_ diff --git a/src/internet/internetview.cpp b/src/internet/internetview.cpp index 4b14dcf5e..a3343b5a2 100644 --- a/src/internet/internetview.cpp +++ b/src/internet/internetview.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2010, 2012, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetview.h b/src/internet/internetview.h index ef5d7be2b..e01f1b9f5 100644 --- a/src/internet/internetview.h +++ b/src/internet/internetview.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2010, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETVIEW_H -#define INTERNETVIEW_H +#ifndef INTERNET_INTERNETVIEW_H_ +#define INTERNET_INTERNETVIEW_H_ #include "widgets/autoexpandingtreeview.h" @@ -24,7 +27,7 @@ class InternetView : public AutoExpandingTreeView { Q_OBJECT public: - InternetView(QWidget* parent = nullptr); + explicit InternetView(QWidget* parent = nullptr); // QWidget void contextMenuEvent(QContextMenuEvent* e); @@ -33,8 +36,8 @@ class InternetView : public AutoExpandingTreeView { void currentChanged(const QModelIndex& current, const QModelIndex& previous); void setModel(QAbstractItemModel* model); -signals: + signals: void CurrentIndexChanged(const QModelIndex& index); }; -#endif // INTERNETVIEW_H +#endif // INTERNET_INTERNETVIEW_H_ diff --git a/src/internet/internetviewcontainer.cpp b/src/internet/internetviewcontainer.cpp index c9beec672..38284db2f 100644 --- a/src/internet/internetviewcontainer.cpp +++ b/src/internet/internetviewcontainer.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/internetviewcontainer.h b/src/internet/internetviewcontainer.h index f57f4b177..5eb281419 100644 --- a/src/internet/internetviewcontainer.h +++ b/src/internet/internetviewcontainer.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNETVIEWCONTAINER_H -#define INTERNETVIEWCONTAINER_H +#ifndef INTERNET_INTERNETVIEWCONTAINER_H_ +#define INTERNET_INTERNETVIEWCONTAINER_H_ #include #include @@ -34,7 +36,7 @@ class InternetViewContainer : public QWidget { Q_OBJECT public: - InternetViewContainer(QWidget* parent = nullptr); + explicit InternetViewContainer(QWidget* parent = nullptr); ~InternetViewContainer(); static const int kAnimationDuration; @@ -72,4 +74,4 @@ class InternetViewContainer : public QWidget { QMap headers_; }; -#endif // INTERNETVIEWCONTAINER_H +#endif // INTERNET_INTERNETVIEWCONTAINER_H_ diff --git a/src/internet/jamendodynamicplaylist.cpp b/src/internet/jamendodynamicplaylist.cpp index b6daa0712..749ba48f6 100644 --- a/src/internet/jamendodynamicplaylist.cpp +++ b/src/internet/jamendodynamicplaylist.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/jamendodynamicplaylist.h b/src/internet/jamendodynamicplaylist.h index d69318208..081fd2255 100644 --- a/src/internet/jamendodynamicplaylist.h +++ b/src/internet/jamendodynamicplaylist.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2011, David Sansome + Copyright 2010, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef JAMENDODYNAMICPLAYLIST_H -#define JAMENDODYNAMICPLAYLIST_H +#ifndef INTERNET_JAMENDODYNAMICPLAYLIST_H_ +#define INTERNET_JAMENDODYNAMICPLAYLIST_H_ #include "smartplaylists/generator.h" @@ -36,7 +39,10 @@ class JamendoDynamicPlaylist : public smart_playlists::Generator { }; // These values are persisted - only add to the end - enum OrderDirection { Order_Ascending = 0, Order_Descending = 1, }; + enum OrderDirection { + Order_Ascending = 0, + Order_Descending = 1, + }; JamendoDynamicPlaylist(); JamendoDynamicPlaylist(const QString& name, OrderBy order_by); @@ -73,4 +79,4 @@ class JamendoDynamicPlaylist : public smart_playlists::Generator { QDataStream& operator<<(QDataStream& s, const JamendoDynamicPlaylist& p); QDataStream& operator>>(QDataStream& s, JamendoDynamicPlaylist& p); -#endif +#endif // INTERNET_JAMENDODYNAMICPLAYLIST_H_ diff --git a/src/internet/jamendoplaylistitem.cpp b/src/internet/jamendoplaylistitem.cpp index 253ac4134..8eb1b2ad0 100644 --- a/src/internet/jamendoplaylistitem.cpp +++ b/src/internet/jamendoplaylistitem.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/jamendoplaylistitem.h b/src/internet/jamendoplaylistitem.h index 06e35a3e1..505345b26 100644 --- a/src/internet/jamendoplaylistitem.h +++ b/src/internet/jamendoplaylistitem.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,19 +17,19 @@ along with Clementine. If not, see . */ -#ifndef JAMENDOPLAYLISTITEM_H -#define JAMENDOPLAYLISTITEM_H +#ifndef INTERNET_JAMENDOPLAYLISTITEM_H_ +#define INTERNET_JAMENDOPLAYLISTITEM_H_ #include "library/libraryplaylistitem.h" class JamendoPlaylistItem : public LibraryPlaylistItem { public: - JamendoPlaylistItem(const QString& type); - JamendoPlaylistItem(const Song& song); + explicit JamendoPlaylistItem(const QString& type); + explicit JamendoPlaylistItem(const Song& song); bool InitFromQuery(const SqlRow& query); QUrl Url() const; }; -#endif // JAMENDOPLAYLISTITEM_H +#endif // INTERNET_JAMENDOPLAYLISTITEM_H_ diff --git a/src/internet/jamendoservice.cpp b/src/internet/jamendoservice.cpp index 2434a20ea..63c1b5469 100644 --- a/src/internet/jamendoservice.cpp +++ b/src/internet/jamendoservice.cpp @@ -1,5 +1,11 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2013, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2011, Andrea Decorte + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -116,12 +122,11 @@ JamendoService::JamendoService(Application* app, InternetModel* parent) << GeneratorPtr(new JamendoDynamicPlaylist( tr("Jamendo Most Listened Tracks"), JamendoDynamicPlaylist::OrderBy_Listened))) - << (LibraryModel::GeneratorList() - << GeneratorPtr(new QueryGenerator( - tr("Dynamic random mix"), - Search(Search::Type_All, Search::TermList(), - Search::Sort_Random, SearchTerm::Field_Title), - true)))); + << (LibraryModel::GeneratorList() << GeneratorPtr(new QueryGenerator( + tr("Dynamic random mix"), + Search(Search::Type_All, Search::TermList(), Search::Sort_Random, + SearchTerm::Field_Title), + true)))); library_sort_model_->setSourceModel(library_model_); library_sort_model_->setSortRole(LibraryModel::Role_SortText); @@ -197,9 +202,10 @@ void JamendoService::DownloadDirectory() { } void JamendoService::DownloadDirectoryProgress(qint64 received, qint64 total) { - float progress = float(received) / total; + float progress = static_cast(received) / total; app_->task_manager()->SetTaskProgress(load_database_task_id_, - int(progress * 100), 100); + static_cast(progress * 100), + 100); } void JamendoService::DownloadDirectoryFinished() { @@ -209,7 +215,7 @@ void JamendoService::DownloadDirectoryFinished() { app_->task_manager()->SetTaskFinished(load_database_task_id_); load_database_task_id_ = 0; - // TODO: Not leak reply. + // TODO(John Maguire): Not leak reply. QtIOCompressor* gzip = new QtIOCompressor(reply); gzip->setStreamFormat(QtIOCompressor::GzipFormat); if (!gzip->open(QIODevice::ReadOnly)) { diff --git a/src/internet/jamendoservice.h b/src/internet/jamendoservice.h index b658da0ef..e5a19ed84 100644 --- a/src/internet/jamendoservice.h +++ b/src/internet/jamendoservice.h @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Andrea Decorte + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef JAMENDOSERVICE_H -#define JAMENDOSERVICE_H +#ifndef INTERNET_JAMENDOSERVICE_H_ +#define INTERNET_JAMENDOSERVICE_H_ #include "internetservice.h" @@ -37,6 +41,7 @@ class QSortFilterProxyModel; class JamendoService : public InternetService { Q_OBJECT + public: JamendoService(Application* app, InternetModel* parent); ~JamendoService(); @@ -118,4 +123,4 @@ class JamendoService : public InternetService { bool accepted_download_; }; -#endif +#endif // INTERNET_JAMENDOSERVICE_H_ diff --git a/src/internet/lastfmcompat.cpp b/src/internet/lastfmcompat.cpp index 8f4d1579e..2a06c59b8 100644 --- a/src/internet/lastfmcompat.cpp +++ b/src/internet/lastfmcompat.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012-2013, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,8 +32,9 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query, const bool ret = query->parse(data); if (connection_problems) { - *connection_problems = !ret && query->parseError().enumValue() == - lastfm::ws::MalformedResponse; + *connection_problems = + !ret && + query->parseError().enumValue() == lastfm::ws::MalformedResponse; } return ret; @@ -65,15 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query, return false; } #endif // Q_OS_WIN32 - } - catch (lastfm::ws::ParseError e) { + } catch (lastfm::ws::ParseError e) { qLog(Error) << "Last.fm parse error: " << e.enumValue(); if (connection_problems) { *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse; } return false; - } - catch (std::runtime_error& e) { + } catch (std::runtime_error& e) { qLog(Error) << e.what(); return false; } @@ -98,8 +99,7 @@ bool ParseUserList(QNetworkReply* reply, QList* users) { return false; } #endif // Q_OS_WIN32 - } - catch (std::runtime_error& e) { + } catch (std::runtime_error& e) { qLog(Error) << e.what(); return false; } @@ -109,5 +109,5 @@ bool ParseUserList(QNetworkReply* reply, QList* users) { uint ScrobbleTimeMin() { return ScrobblePoint::kScrobbleMinLength; } #endif // HAVE_LIBLASTFM1 -} -} +} // namespace compat +} // namespace lastfm diff --git a/src/internet/lastfmcompat.h b/src/internet/lastfmcompat.h index cdd149be4..3854f2c0f 100644 --- a/src/internet/lastfmcompat.h +++ b/src/internet/lastfmcompat.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef LASTFMCOMPAT_H -#define LASTFMCOMPAT_H +#ifndef INTERNET_LASTFMCOMPAT_H_ +#define INTERNET_LASTFMCOMPAT_H_ #include "config.h" #include "fixlastfm.h" @@ -58,7 +60,7 @@ typedef lastfm::User AuthenticatedUser; typedef ::ScrobbleCache ScrobbleCache; typedef lastfm::AuthenticatedUser AuthenticatedUser; #endif -} -} +} // namespace compat +} // namespace lastfm -#endif // LASTFMCOMPAT_H +#endif // INTERNET_LASTFMCOMPAT_H_ diff --git a/src/internet/lastfmservice.cpp b/src/internet/lastfmservice.cpp index e3091eb2f..fc286f627 100644 --- a/src/internet/lastfmservice.cpp +++ b/src/internet/lastfmservice.cpp @@ -1,5 +1,12 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2013, David Sansome + Copyright 2010-2012, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2011, Andrea Decorte + Copyright 2012, Arnaud Bienner + Copyright 2012, Kacper "mattrick" Banasik + Copyright 2012, Harald Sitter + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -339,7 +346,7 @@ void LastFMService::NowPlaying(const Song& song) { return; } #else -// TODO: validity was removed from liblastfm1 but might reappear, it should have +// TODO(John Maguire): validity was removed from liblastfm1 but might reappear, it should have // no impact as we get a different error when actually trying to scrobble. #endif diff --git a/src/internet/lastfmservice.h b/src/internet/lastfmservice.h index aae8b8e2b..a5a3fa396 100644 --- a/src/internet/lastfmservice.h +++ b/src/internet/lastfmservice.h @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2013, David Sansome + Copyright 2010-2012, 2014, John Maguire + Copyright 2011, Andrea Decorte + Copyright 2012, Kacper "mattrick" Banasik + Copyright 2012, Harald Sitter + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef LASTFMSERVICE_H -#define LASTFMSERVICE_H +#ifndef INTERNET_LASTFMSERVICE_H_ +#define INTERNET_LASTFMSERVICE_H_ #include @@ -41,7 +46,7 @@ class LastFMService : public Scrobbler { Q_OBJECT public: - LastFMService(Application* app, QObject* parent = nullptr); + explicit LastFMService(Application* app, QObject* parent = nullptr); ~LastFMService(); static const char* kServiceName; @@ -75,7 +80,7 @@ class LastFMService : public Scrobbler { void ShowConfig(); void ToggleScrobbling(); -signals: + signals: void AuthenticationComplete(bool success, const QString& error_message); void ScrobblingEnabledChanged(bool value); void ButtonVisibilityChanged(bool value); @@ -122,4 +127,4 @@ signals: Application* app_; }; -#endif // LASTFMSERVICE_H +#endif // INTERNET_LASTFMSERVICE_H_ diff --git a/src/internet/lastfmsettingspage.cpp b/src/internet/lastfmsettingspage.cpp index 58715669e..8c915676a 100644 --- a/src/internet/lastfmsettingspage.cpp +++ b/src/internet/lastfmsettingspage.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2011, 2013, David Sansome + Copyright 2011, Andrea Decorte + Copyright 2011, 2014, John Maguire + Copyright 2012, Kacper "mattrick" Banasik + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/lastfmsettingspage.h b/src/internet/lastfmsettingspage.h index cf5e12580..31c91b26d 100644 --- a/src/internet/lastfmsettingspage.h +++ b/src/internet/lastfmsettingspage.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2009-2011, 2013, David Sansome + Copyright 2011, Andrea Decorte + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef LASTFMSETTINGSPAGE_H -#define LASTFMSETTINGSPAGE_H +#ifndef INTERNET_LASTFMSETTINGSPAGE_H_ +#define INTERNET_LASTFMSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -27,7 +30,7 @@ class LastFMSettingsPage : public SettingsPage { Q_OBJECT public: - LastFMSettingsPage(SettingsDialog* dialog); + explicit LastFMSettingsPage(SettingsDialog* dialog); ~LastFMSettingsPage(); void Load(); @@ -47,4 +50,4 @@ class LastFMSettingsPage : public SettingsPage { void RefreshControls(bool authenticated); }; -#endif // LASTFMSETTINGSPAGE_H +#endif // INTERNET_LASTFMSETTINGSPAGE_H_ diff --git a/src/internet/lastfmurlhandler.h b/src/internet/lastfmurlhandler.h index 4cfcb9757..c6b61bf43 100644 --- a/src/internet/lastfmurlhandler.h +++ b/src/internet/lastfmurlhandler.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef LASTFMURLHANDLER_H -#define LASTFMURLHANDLER_H +#ifndef INTERNET_LASTFMURLHANDLER_H_ +#define INTERNET_LASTFMURLHANDLER_H_ #include "core/urlhandler.h" @@ -40,4 +42,4 @@ class LastFMUrlHandler : public UrlHandler { LastFMService* service_; }; -#endif // LASTFMURLHANDLER_H +#endif // INTERNET_LASTFMURLHANDLER_H_ diff --git a/src/internet/localredirectserver.cpp b/src/internet/localredirectserver.cpp index b961385d3..4b787b09d 100644 --- a/src/internet/localredirectserver.cpp +++ b/src/internet/localredirectserver.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "localredirectserver.h" #include diff --git a/src/internet/localredirectserver.h b/src/internet/localredirectserver.h index c919dbbf7..4e27525f9 100644 --- a/src/internet/localredirectserver.h +++ b/src/internet/localredirectserver.h @@ -1,5 +1,23 @@ -#ifndef LOCALREDIRECTSERVER_H -#define LOCALREDIRECTSERVER_H +/* This file is part of Clementine. + Copyright 2012, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_LOCALREDIRECTSERVER_H_ +#define INTERNET_LOCALREDIRECTSERVER_H_ #include #include @@ -10,8 +28,9 @@ class QTcpSocket; class LocalRedirectServer : public QObject { Q_OBJECT + public: - LocalRedirectServer(QObject* parent = nullptr); + explicit LocalRedirectServer(QObject* parent = nullptr); // Causes the server to listen for _one_ request. void Listen(); @@ -22,7 +41,7 @@ class LocalRedirectServer : public QObject { // Returns the URL requested by the OAuth redirect. const QUrl& request_url() const { return request_url_; } -signals: + signals: void Finished(); private slots: @@ -39,4 +58,4 @@ signals: QUrl request_url_; }; -#endif // LOCALREDIRECTSERVER_H +#endif // INTERNET_LOCALREDIRECTSERVER_H_ diff --git a/src/internet/magnatunedownloaddialog.cpp b/src/internet/magnatunedownloaddialog.cpp index 5a171a7af..8e7ab4478 100644 --- a/src/internet/magnatunedownloaddialog.cpp +++ b/src/internet/magnatunedownloaddialog.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, 2012, David Sansome + Copyright 2011-2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -227,7 +229,7 @@ void MagnatuneDownloadDialog::DownloadFinished() { } void MagnatuneDownloadDialog::DownloadProgress(qint64 received, qint64 total) { - int percent = float(received) / total * 100; + int percent = static_cast(received) / total * 100; ui_->albums->topLevelItem(next_row_)->setData(1, Qt::DisplayRole, percent); } diff --git a/src/internet/magnatunedownloaddialog.h b/src/internet/magnatunedownloaddialog.h index 89ecdd3b0..22b4d1dd3 100644 --- a/src/internet/magnatunedownloaddialog.h +++ b/src/internet/magnatunedownloaddialog.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef MAGNATUNEDOWNLOADDIALOG_H -#define MAGNATUNEDOWNLOADDIALOG_H +#ifndef INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ +#define INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ #include @@ -34,13 +36,14 @@ class QXmlStreamReader; class MagnatuneDownloadDialog : public QDialog { Q_OBJECT + public: - MagnatuneDownloadDialog(MagnatuneService* service, QWidget* parent = nullptr); + explicit MagnatuneDownloadDialog(MagnatuneService* service, QWidget* parent = nullptr); ~MagnatuneDownloadDialog(); void Show(const SongList& songs); -signals: + signals: void Finished(const QStringList& albums); public slots: @@ -76,4 +79,4 @@ signals: int next_row_; }; -#endif // MAGNATUNEDOWNLOADDIALOG_H +#endif // INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ diff --git a/src/internet/magnatuneplaylistitem.cpp b/src/internet/magnatuneplaylistitem.cpp index c582517c6..b60027509 100644 --- a/src/internet/magnatuneplaylistitem.cpp +++ b/src/internet/magnatuneplaylistitem.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/magnatuneplaylistitem.h b/src/internet/magnatuneplaylistitem.h index e6b0f3ba2..f2edc3f17 100644 --- a/src/internet/magnatuneplaylistitem.h +++ b/src/internet/magnatuneplaylistitem.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010, John Maguire + Copyright 2010, David Sansome + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,19 +17,19 @@ along with Clementine. If not, see . */ -#ifndef MAGNATUNEPLAYLISTITEM_H -#define MAGNATUNEPLAYLISTITEM_H +#ifndef INTERNET_MAGNATUNEPLAYLISTITEM_H_ +#define INTERNET_MAGNATUNEPLAYLISTITEM_H_ #include "library/libraryplaylistitem.h" class MagnatunePlaylistItem : public LibraryPlaylistItem { public: - MagnatunePlaylistItem(const QString& type); - MagnatunePlaylistItem(const Song& song); + explicit MagnatunePlaylistItem(const QString& type); + explicit MagnatunePlaylistItem(const Song& song); bool InitFromQuery(const SqlRow& query); QUrl Url() const; }; -#endif // MAGNATUNEPLAYLISTITEM_H +#endif // INTERNET_MAGNATUNEPLAYLISTITEM_H_ diff --git a/src/internet/magnatuneservice.cpp b/src/internet/magnatuneservice.cpp index a776eec12..25af13da8 100644 --- a/src/internet/magnatuneservice.cpp +++ b/src/internet/magnatuneservice.cpp @@ -1,5 +1,11 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2013, David Sansome + Copyright 2011, Arnaud Bienner + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2012, 2014, John Maguire + Copyright 2013, Alan Briolat + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -159,7 +165,7 @@ void MagnatuneService::ReloadDatabaseFinished() { load_database_task_id_ = 0; if (reply->error() != QNetworkReply::NoError) { - // TODO: Error handling + // TODO(David Sansome): Error handling qLog(Error) << reply->errorString(); return; } @@ -238,7 +244,7 @@ Song MagnatuneService::ReadTrack(QXmlStreamReader& reader) { return song; } -// TODO: Replace with readElementText(SkipChildElements) in Qt 4.6 +// TODO(David Sansome): Replace with readElementText(SkipChildElements) in Qt 4.6 QString MagnatuneService::ReadElementText(QXmlStreamReader& reader) { int level = 1; QString ret; diff --git a/src/internet/magnatuneservice.h b/src/internet/magnatuneservice.h index 4050d926c..32f9a2789 100644 --- a/src/internet/magnatuneservice.h +++ b/src/internet/magnatuneservice.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef MAGNATUNESERVICE_H -#define MAGNATUNESERVICE_H +#ifndef INTERNET_MAGNATUNESERVICE_H_ +#define INTERNET_MAGNATUNESERVICE_H_ #include @@ -86,7 +88,7 @@ class MagnatuneService : public InternetService { QUrl ModifyUrl(const QUrl& url) const; -signals: + signals: void DownloadFinished(const QStringList& albums); private slots: @@ -127,4 +129,4 @@ signals: QNetworkAccessManager* network_; }; -#endif // MAGNATUNESERVICE_H +#endif // INTERNET_MAGNATUNESERVICE_H_ diff --git a/src/internet/magnatunesettingspage.cpp b/src/internet/magnatunesettingspage.cpp index e87db600a..1118bfca8 100644 --- a/src/internet/magnatunesettingspage.cpp +++ b/src/internet/magnatunesettingspage.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011, Andrea Decorte + Copyright 2011, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/magnatunesettingspage.h b/src/internet/magnatunesettingspage.h index e9231ee8e..31d6b56ca 100644 --- a/src/internet/magnatunesettingspage.h +++ b/src/internet/magnatunesettingspage.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2011, David Sansome + Copyright 2011, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef MAGNATUNESETTINGSPAGE_H -#define MAGNATUNESETTINGSPAGE_H +#ifndef INTERNET_MAGNATUNESETTINGSPAGE_H_ +#define INTERNET_MAGNATUNESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -29,7 +31,7 @@ class Ui_MagnatuneSettingsPage; class MagnatuneSettingsPage : public SettingsPage { Q_OBJECT public: - MagnatuneSettingsPage(SettingsDialog* dialog); + explicit MagnatuneSettingsPage(SettingsDialog* dialog); ~MagnatuneSettingsPage(); void Load(); @@ -52,4 +54,4 @@ class MagnatuneSettingsPage : public SettingsPage { bool logged_in_; }; -#endif // MAGNATUNESETTINGSPAGE_H +#endif // INTERNET_MAGNATUNESETTINGSPAGE_H_ diff --git a/src/internet/magnatuneurlhandler.cpp b/src/internet/magnatuneurlhandler.cpp index c98ca552b..f281ecb38 100644 --- a/src/internet/magnatuneurlhandler.cpp +++ b/src/internet/magnatuneurlhandler.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/magnatuneurlhandler.h b/src/internet/magnatuneurlhandler.h index e971c05fb..17505c2d1 100644 --- a/src/internet/magnatuneurlhandler.h +++ b/src/internet/magnatuneurlhandler.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef MAGNATUNEURLHANDLER_H -#define MAGNATUNEURLHANDLER_H +#ifndef INTERNET_MAGNATUNEURLHANDLER_H_ +#define INTERNET_MAGNATUNEURLHANDLER_H_ #include "core/urlhandler.h" @@ -34,4 +36,4 @@ class MagnatuneUrlHandler : public UrlHandler { MagnatuneService* service_; }; -#endif // MAGNATUNEURLHANDLER_H +#endif // INTERNET_MAGNATUNEURLHANDLER_H_ diff --git a/src/internet/oauthenticator.cpp b/src/internet/oauthenticator.cpp index d86ade803..ba8dc9144 100644 --- a/src/internet/oauthenticator.cpp +++ b/src/internet/oauthenticator.cpp @@ -1,3 +1,23 @@ +/* This file is part of Clementine. + Copyright 2012-2014, John Maguire + Copyright 2012, 2014, David Sansome + Copyright 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "oauthenticator.h" #include @@ -10,7 +30,8 @@ #include "core/logging.h" #include "internet/localredirectserver.h" -const char* OAuthenticator::kRemoteURL = "https://clementine-data.appspot.com/skydrive"; +const char* OAuthenticator::kRemoteURL = + "https://clementine-data.appspot.com/skydrive"; OAuthenticator::OAuthenticator(const QString& client_id, const QString& client_secret, @@ -73,8 +94,7 @@ void OAuthenticator::RequestAccessToken(const QByteArray& code, const QUrl& url) { typedef QPair Param; QList parameters; - parameters << Param("code", code) - << Param("client_id", client_id_) + parameters << Param("code", code) << Param("client_id", client_id_) << Param("client_secret", client_secret_) << Param("grant_type", "authorization_code") // Even though we don't use this URI anymore, it must match the diff --git a/src/internet/oauthenticator.h b/src/internet/oauthenticator.h index 274b0383c..233085d23 100644 --- a/src/internet/oauthenticator.h +++ b/src/internet/oauthenticator.h @@ -1,5 +1,25 @@ -#ifndef OAUTHENTICATOR_H -#define OAUTHENTICATOR_H +/* This file is part of Clementine. + Copyright 2012, David Sansome + Copyright 2012, 2014, John Maguire + Copyright 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_OAUTHENTICATOR_H_ +#define INTERNET_OAUTHENTICATOR_H_ #include #include @@ -11,6 +31,7 @@ class QTcpSocket; class OAuthenticator : public QObject { Q_OBJECT + public: enum class RedirectStyle { // Redirect to localhost immediately. @@ -40,7 +61,7 @@ class OAuthenticator : public QObject { const QDateTime& expiry_time() const { return expiry_time_; } -signals: + signals: void Finished(); private slots: @@ -67,4 +88,4 @@ signals: RedirectStyle redirect_style_; }; -#endif +#endif // INTERNET_OAUTHENTICATOR_H_ diff --git a/src/internet/savedradio.cpp b/src/internet/savedradio.cpp index 64ce750ff..dd4d78959 100644 --- a/src/internet/savedradio.cpp +++ b/src/internet/savedradio.cpp @@ -1,5 +1,10 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2014, Arnaud Bienner + Copyright 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/savedradio.h b/src/internet/savedradio.h index d96a5e524..762d09a5c 100644 --- a/src/internet/savedradio.h +++ b/src/internet/savedradio.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2012, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef SAVEDRADIO_H -#define SAVEDRADIO_H +#ifndef INTERNET_SAVEDRADIO_H_ +#define INTERNET_SAVEDRADIO_H_ #include @@ -33,11 +36,13 @@ class SavedRadio : public InternetService { SavedRadio(Application* app, InternetModel* parent); ~SavedRadio(); - enum ItemType { Type_Stream = 2000, }; + enum ItemType { + Type_Stream = 2000, + }; struct Stream { - Stream(const QUrl& url, const QString& name = QString()) - : url_(url), name_(name) {} + explicit Stream(const QUrl& url, const QString& name = QString()) + : url_(url), name_(name) {} // For QList::contains bool operator==(const Stream& other) const { return url_ == other.url_; } @@ -59,7 +64,7 @@ class SavedRadio : public InternetService { StreamList Streams() const { return streams_; } -signals: + signals: void ShowAddStreamDialog(); void StreamsChanged(); @@ -84,4 +89,4 @@ signals: std::unique_ptr edit_dialog_; }; -#endif // SAVEDRADIO_H +#endif // INTERNET_SAVEDRADIO_H_ diff --git a/src/internet/scrobbler.h b/src/internet/scrobbler.h index 9beece9fa..e2c987710 100644 --- a/src/internet/scrobbler.h +++ b/src/internet/scrobbler.h @@ -1,5 +1,23 @@ -#ifndef SCROBBLER_H -#define SCROBBLER_H +/* This file is part of Clementine. + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SCROBBLER_H_ +#define INTERNET_SCROBBLER_H_ #include @@ -9,7 +27,7 @@ class Scrobbler : public QObject { Q_OBJECT public: - Scrobbler(QObject* parent = nullptr) {} + explicit Scrobbler(QObject* parent = nullptr) {} virtual bool IsAuthenticated() const = 0; virtual bool IsScrobblingEnabled() const = 0; @@ -24,7 +42,7 @@ class Scrobbler : public QObject { virtual void ToggleScrobbling() = 0; virtual void ShowConfig() = 0; -signals: + signals: void AuthenticationComplete(bool success, const QString& error_message); void ScrobblingEnabledChanged(bool value); void ButtonVisibilityChanged(bool value); @@ -33,4 +51,4 @@ signals: void ScrobbleError(int value); }; -#endif // SCROBBLER_H +#endif // INTERNET_SCROBBLER_H_ diff --git a/src/internet/seafileservice.cpp b/src/internet/seafileservice.cpp index 7f1672a0d..e5d5d56d1 100644 --- a/src/internet/seafileservice.cpp +++ b/src/internet/seafileservice.cpp @@ -1,3 +1,23 @@ +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "seafileservice.h" #include @@ -26,7 +46,7 @@ static const char* kFileUrl = "/api2/repos/%1/file/"; static const char* kFileContentUrl = "/api2/repos/%1/file/detail/"; static const int kMaxTries = 10; -} +} // namespace SeafileService::SeafileService(Application* app, InternetModel* parent) : CloudFileService(app, parent, kServiceName, kSettingsGroup, @@ -212,9 +232,8 @@ void SeafileService::UpdateLibrariesInProgress( SeafileTree::Entry(library.value(), library.key(), SeafileTree::Entry::LIBRARY), "/"); - } // If not, we can destroy the library from the tree - else { + } else { // If the library was not in the tree, it's not a problem because // DeleteEntry won't do anything DeleteEntry(library.key(), "/", @@ -531,8 +550,7 @@ void SeafileService::DeleteEntry(const QString& library, const QString& path, bool SeafileService::CheckReply(QNetworkReply** reply, int tries) { if (!(*reply)) { return false; - } - else if (tries > kMaxTries) { + } else if (tries > kMaxTries) { (*reply)->deleteLater(); return false; } diff --git a/src/internet/seafileservice.h b/src/internet/seafileservice.h index 3cad45d10..ce56c8c4e 100644 --- a/src/internet/seafileservice.h +++ b/src/internet/seafileservice.h @@ -1,3 +1,22 @@ +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + /* Contacts (for explanations, congratulations, insults) : * - * @@ -23,8 +42,8 @@ * - Stop Tagreader when user changes the library */ -#ifndef SEAFILESERVICE_H -#define SEAFILESERVICE_H +#ifndef INTERNET_SEAFILESERVICE_H_ +#define INTERNET_SEAFILESERVICE_H_ #include "cloudfileservice.h" @@ -39,6 +58,7 @@ class QNetworkRequest; // Interface between the seafile server and Clementine class SeafileService : public CloudFileService { Q_OBJECT + public: enum ApiError { NO_ERROR = 200, NOT_FOUND = 404, TOO_MANY_REQUESTS = 429 }; @@ -62,7 +82,7 @@ class SeafileService : public CloudFileService { void Connect(); void ForgetCredentials(); -signals: + signals: void Connected(); // QMap, key : library's id, value : library's name void GetLibrariesFinishedSignal(QMap); @@ -129,4 +149,4 @@ signals: QString library_updated_; }; -#endif // SEAFILESERVICE_H +#endif // INTERNET_SEAFILESERVICE_H_ diff --git a/src/internet/seafilesettingspage.cpp b/src/internet/seafilesettingspage.cpp index e146a1726..df27fbb98 100644 --- a/src/internet/seafilesettingspage.cpp +++ b/src/internet/seafilesettingspage.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/seafilesettingspage.h b/src/internet/seafilesettingspage.h index a0902498d..6ac7c53a0 100644 --- a/src/internet/seafilesettingspage.h +++ b/src/internet/seafilesettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef SEAFILESETTINGSPAGE_H -#define SEAFILESETTINGSPAGE_H +#ifndef INTERNET_SEAFILESETTINGSPAGE_H_ +#define INTERNET_SEAFILESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -30,7 +31,7 @@ class SeafileSettingsPage : public SettingsPage { Q_OBJECT public: - SeafileSettingsPage(SettingsDialog* dialog); + explicit SeafileSettingsPage(SettingsDialog* dialog); ~SeafileSettingsPage(); void Load(); @@ -47,4 +48,4 @@ class SeafileSettingsPage : public SettingsPage { SeafileService* service_; }; -#endif // SEAFILESETTINGSPAGE_H +#endif // INTERNET_SEAFILESETTINGSPAGE_H_ diff --git a/src/internet/seafiletree.cpp b/src/internet/seafiletree.cpp index 44dc6bdd8..82479e9f4 100644 --- a/src/internet/seafiletree.cpp +++ b/src/internet/seafiletree.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "seafiletree.h" #include @@ -184,9 +202,8 @@ QList> SeafileTree::GetRecursiveFilesOfDir( if (item->entry().is_file()) { files.append(qMakePair(path, item->entry())); - } // Get files of the dir - else { + } else { for (TreeItem* child_item : item->children()) { if (child_item->entry().is_file()) { files.append(qMakePair(path, child_item->entry())); diff --git a/src/internet/seafiletree.h b/src/internet/seafiletree.h index 23dde0538..61e4d1b7b 100644 --- a/src/internet/seafiletree.h +++ b/src/internet/seafiletree.h @@ -1,9 +1,27 @@ +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + /* Contacts (for explanations, congratulations, insults) : * - */ -#ifndef SEAFILETREE_H -#define SEAFILETREE_H +#ifndef INTERNET_SEAFILETREE_H_ +#define INTERNET_SEAFILETREE_H_ #include #include @@ -30,7 +48,7 @@ class SeafileTree : public QObject { const Type& type = NONE) : name_(name), id_(id), type_(type) {} Entry(const Entry& entry) - : name_(entry.name()), id_(entry.id()), type_(entry.type()) {} + : name_(entry.name()), id_(entry.id()), type_(entry.type()) {} ~Entry(); QString name() const; @@ -72,7 +90,7 @@ class SeafileTree : public QObject { const QList& children = QList()) : entry_(entry), children_(children) {} TreeItem(const TreeItem& copy) - : entry_(copy.entry()), children_(copy.children()) {} + : entry_(copy.entry()), children_(copy.children()) {} ~TreeItem(); TreeItem* child(int i) const; @@ -137,7 +155,7 @@ class SeafileTree : public QObject { // Print the tree in the debug log void Print() const; -signals: + signals: // Entry to delete in the tree void ToDelete(const QString& library, const QString& path, const SeafileTree::Entry& entry); @@ -164,4 +182,4 @@ QDataStream& operator>>(QDataStream& in, SeafileTree::Entry& entry); QDataStream& operator<<(QDataStream& out, SeafileTree::TreeItem* item); QDataStream& operator>>(QDataStream& in, SeafileTree::TreeItem*& item); -#endif // SEAFILETREE_H +#endif // INTERNET_SEAFILETREE_H_ diff --git a/src/internet/seafileurlhandler.cpp b/src/internet/seafileurlhandler.cpp index 31025da48..b2c6f3ed5 100644 --- a/src/internet/seafileurlhandler.cpp +++ b/src/internet/seafileurlhandler.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "seafileurlhandler.h" #include "seafileservice.h" @@ -9,8 +27,8 @@ UrlHandler::LoadResult SeafileUrlHandler::StartLoading(const QUrl& url) { QString file_library_and_path = url.path(); QRegExp reg("/([^/]+)(/.*)$"); - if(reg.indexIn(file_library_and_path) == -1) { - qLog(Debug) << "Can't find repo and file path in " << url; + if (reg.indexIn(file_library_and_path) == -1) { + qLog(Debug) << "Can't find repo and file path in " << url; } QString library = reg.cap(1); diff --git a/src/internet/seafileurlhandler.h b/src/internet/seafileurlhandler.h index e378d8833..9493e763a 100644 --- a/src/internet/seafileurlhandler.h +++ b/src/internet/seafileurlhandler.h @@ -1,5 +1,23 @@ -#ifndef SEAFILEURLHANDLER_H -#define SEAFILEURLHANDLER_H +/* This file is part of Clementine. + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SEAFILEURLHANDLER_H_ +#define INTERNET_SEAFILEURLHANDLER_H_ #include "core/urlhandler.h" @@ -8,7 +26,7 @@ class SeafileService; class SeafileUrlHandler : public UrlHandler { Q_OBJECT public: - SeafileUrlHandler(SeafileService* service, QObject* parent = nullptr); + explicit SeafileUrlHandler(SeafileService* service, QObject* parent = nullptr); QString scheme() const { return "seafile"; } QIcon icon() const { return QIcon(":/providers/seafile.png"); } @@ -18,4 +36,4 @@ class SeafileUrlHandler : public UrlHandler { SeafileService* service_; }; -#endif // SEAFILEURLHANDLER_H +#endif // INTERNET_SEAFILEURLHANDLER_H_ diff --git a/src/internet/searchboxwidget.cpp b/src/internet/searchboxwidget.cpp index 11fa26344..6d0207df0 100644 --- a/src/internet/searchboxwidget.cpp +++ b/src/internet/searchboxwidget.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, Arnaud Bienner + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,9 +61,8 @@ void SearchBoxWidget::FocusOnFilter(QKeyEvent* event) { QApplication::sendEvent(ui_->filter, event); } -void SearchBoxWidget::SetText(const QString &text) -{ - ui_->filter->setText(text); +void SearchBoxWidget::SetText(const QString& text) { + ui_->filter->setText(text); } void SearchBoxWidget::keyReleaseEvent(QKeyEvent* e) { diff --git a/src/internet/searchboxwidget.h b/src/internet/searchboxwidget.h index 1762eb3f3..a4787a37f 100644 --- a/src/internet/searchboxwidget.h +++ b/src/internet/searchboxwidget.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, Arnaud Bienner + Copyright 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef SEARCHBOXWIDGET_H -#define SEARCHBOXWIDGET_H +#ifndef INTERNET_SEARCHBOXWIDGET_H_ +#define INTERNET_SEARCHBOXWIDGET_H_ #include @@ -31,12 +34,12 @@ class SearchBoxWidget : public QWidget { Q_OBJECT public: - SearchBoxWidget(InternetService* service); + explicit SearchBoxWidget(InternetService* service); ~SearchBoxWidget(); DidYouMean* did_you_mean() { return did_you_mean_; } -signals: + signals: void TextChanged(const QString& text); public slots: @@ -53,4 +56,4 @@ signals: DidYouMean* did_you_mean_; }; -#endif // SEARCHBOXWIDGET_H +#endif // INTERNET_SEARCHBOXWIDGET_H_ diff --git a/src/internet/skydriveservice.cpp b/src/internet/skydriveservice.cpp index d80b2cfae..2126a9f9f 100644 --- a/src/internet/skydriveservice.cpp +++ b/src/internet/skydriveservice.cpp @@ -1,3 +1,22 @@ +/* This file is part of Clementine. + Copyright 2012-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "skydriveservice.h" #include diff --git a/src/internet/skydriveservice.h b/src/internet/skydriveservice.h index 5599ee60c..a7f866167 100644 --- a/src/internet/skydriveservice.h +++ b/src/internet/skydriveservice.h @@ -1,5 +1,24 @@ -#ifndef SKYDRIVESERVICE_H -#define SKYDRIVESERVICE_H +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SKYDRIVESERVICE_H_ +#define INTERNET_SKYDRIVESERVICE_H_ #include "cloudfileservice.h" @@ -43,4 +62,4 @@ class SkydriveService : public CloudFileService { QDateTime expiry_time_; }; -#endif // SKYDRIVESERVICE_H +#endif // INTERNET_SKYDRIVESERVICE_H_ diff --git a/src/internet/skydrivesettingspage.cpp b/src/internet/skydrivesettingspage.cpp index e7a6b33c4..20f111687 100644 --- a/src/internet/skydrivesettingspage.cpp +++ b/src/internet/skydrivesettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/skydrivesettingspage.h b/src/internet/skydrivesettingspage.h index 4b27cc487..2761a94ec 100644 --- a/src/internet/skydrivesettingspage.h +++ b/src/internet/skydrivesettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, John Maguire + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, David Sansome Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef SKYDRIVESETTINGSPAGE_H -#define SKYDRIVESETTINGSPAGE_H +#ifndef INTERNET_SKYDRIVESETTINGSPAGE_H_ +#define INTERNET_SKYDRIVESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -30,7 +31,7 @@ class SkydriveSettingsPage : public SettingsPage { Q_OBJECT public: - SkydriveSettingsPage(SettingsDialog* parent = nullptr); + explicit SkydriveSettingsPage(SettingsDialog* parent = nullptr); ~SkydriveSettingsPage(); void Load(); @@ -50,4 +51,4 @@ class SkydriveSettingsPage : public SettingsPage { SkydriveService* service_; }; -#endif // SKYDRIVESETTINGSPAGE_H +#endif // INTERNET_SKYDRIVESETTINGSPAGE_H_ diff --git a/src/internet/skydriveurlhandler.cpp b/src/internet/skydriveurlhandler.cpp index ae00ed3d9..faaf189de 100644 --- a/src/internet/skydriveurlhandler.cpp +++ b/src/internet/skydriveurlhandler.cpp @@ -1,3 +1,21 @@ +/* This file is part of Clementine. + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "skydriveurlhandler.h" #include "skydriveservice.h" diff --git a/src/internet/skydriveurlhandler.h b/src/internet/skydriveurlhandler.h index 1e7e61d15..a789a01a7 100644 --- a/src/internet/skydriveurlhandler.h +++ b/src/internet/skydriveurlhandler.h @@ -1,5 +1,23 @@ -#ifndef SKYDRIVEURLHANDLER_H -#define SKYDRIVEURLHANDLER_H +/* This file is part of Clementine. + Copyright 2012, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SKYDRIVEURLHANDLER_H_ +#define INTERNET_SKYDRIVEURLHANDLER_H_ #include "core/urlhandler.h" @@ -7,8 +25,9 @@ class SkydriveService; class SkydriveUrlHandler : public UrlHandler { Q_OBJECT + public: - SkydriveUrlHandler(SkydriveService* service, QObject* parent = nullptr); + explicit SkydriveUrlHandler(SkydriveService* service, QObject* parent = nullptr); QString scheme() const { return "skydrive"; } QIcon icon() const { return QIcon(":providers/skydrive.png"); } @@ -18,4 +37,4 @@ class SkydriveUrlHandler : public UrlHandler { SkydriveService* service_; }; -#endif // SKYDRIVEURLHANDLER_H +#endif // INTERNET_SKYDRIVEURLHANDLER_H_ diff --git a/src/internet/somafmservice.cpp b/src/internet/somafmservice.cpp index 8d7db7a30..346980078 100644 --- a/src/internet/somafmservice.cpp +++ b/src/internet/somafmservice.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2013, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011, Paweł Bara + Copyright 2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -124,7 +128,7 @@ void SomaFMServiceBase::RefreshStreamsFinished(QNetworkReply* reply, reply->deleteLater(); if (reply->error() != QNetworkReply::NoError) { - // TODO: Error handling + // TODO(David Sansome): Error handling qLog(Error) << reply->errorString(); return; } diff --git a/src/internet/somafmservice.h b/src/internet/somafmservice.h index 9c34e1c89..025a95fe1 100644 --- a/src/internet/somafmservice.h +++ b/src/internet/somafmservice.h @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2010-2013, David Sansome + Copyright 2010, 2014, John Maguire + Copyright 2011, Tyler Rhodes + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef SOMAFMSERVICE_H -#define SOMAFMSERVICE_H +#ifndef INTERNET_SOMAFMSERVICE_H_ +#define INTERNET_SOMAFMSERVICE_H_ #include @@ -39,7 +42,9 @@ class SomaFMServiceBase : public InternetService { const QIcon& icon); ~SomaFMServiceBase(); - enum ItemType { Type_Stream = 2000, }; + enum ItemType { + Type_Stream = 2000, + }; struct Stream { QString title_; @@ -67,7 +72,7 @@ class SomaFMServiceBase : public InternetService { bool IsStreamListStale() const { return streams_.IsStale(); } StreamList Streams(); -signals: + signals: void StreamsChanged(); private slots: @@ -114,4 +119,4 @@ QDataStream& operator<<(QDataStream& out, const SomaFMService::Stream& stream); QDataStream& operator>>(QDataStream& in, SomaFMService::Stream& stream); Q_DECLARE_METATYPE(SomaFMService::Stream) -#endif // SOMAFMSERVICE_H +#endif // INTERNET_SOMAFMSERVICE_H_ diff --git a/src/internet/somafmurlhandler.cpp b/src/internet/somafmurlhandler.cpp index 2e4f1cba7..a0ed32b59 100644 --- a/src/internet/somafmurlhandler.cpp +++ b/src/internet/somafmurlhandler.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011-2013, David Sansome + Copyright 2012, Olaf Christ + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +64,7 @@ void SomaFMUrlHandler::LoadPlaylistFinished() { original_url.setScheme(scheme()); if (reply->error() != QNetworkReply::NoError) { - // TODO: Error handling + // TODO((David Sansome): Error handling qLog(Error) << reply->errorString(); emit AsyncLoadComplete(LoadResult(original_url, LoadResult::NoMoreTracks)); return; diff --git a/src/internet/somafmurlhandler.h b/src/internet/somafmurlhandler.h index e2919393e..82eff48aa 100644 --- a/src/internet/somafmurlhandler.h +++ b/src/internet/somafmurlhandler.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2013, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef SOMAFMURLHANDLER_H -#define SOMAFMURLHANDLER_H +#ifndef INTERNET_SOMAFMURLHANDLER_H_ +#define INTERNET_SOMAFMURLHANDLER_H_ #include "core/urlhandler.h" @@ -44,4 +46,4 @@ class SomaFMUrlHandler : public UrlHandler { int task_id_; }; -#endif // SOMAFMURLHANDLER_H +#endif // INTERNET_SOMAFMURLHANDLER_H_ diff --git a/src/internet/soundcloudservice.cpp b/src/internet/soundcloudservice.cpp index 82cbfce3f..ba8038106 100644 --- a/src/internet/soundcloudservice.cpp +++ b/src/internet/soundcloudservice.cpp @@ -1,5 +1,8 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, 2014, Arnaud Bienner + Copyright 2014, maximko + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,7 +77,6 @@ SoundCloudService::SoundCloudService(Application* app, InternetModel* parent) search_box_(new SearchBoxWidget(this)), search_delay_(new QTimer(this)), next_pending_search_id_(0) { - search_delay_->setInterval(kSearchDelayMsec); search_delay_->setSingleShot(true); connect(search_delay_, SIGNAL(timeout()), SLOT(DoSearch())); @@ -119,30 +121,26 @@ void SoundCloudService::EnsureItemsCreated() { InternetModel::Role_PlayBehaviour); root_->appendRow(search_); } - if (!user_tracks_ && !user_activities_ &&!user_playlists_ && IsLoggedIn()) { - user_activities_ = - new QStandardItem(tr("Activities stream")); + if (!user_tracks_ && !user_activities_ && !user_playlists_ && IsLoggedIn()) { + user_activities_ = new QStandardItem(tr("Activities stream")); user_activities_->setData(InternetModel::PlayBehaviour_MultipleItems, - InternetModel::Role_PlayBehaviour); + InternetModel::Role_PlayBehaviour); root_->appendRow(user_activities_); - user_playlists_ = - new QStandardItem(tr("Playlists")); + user_playlists_ = new QStandardItem(tr("Playlists")); root_->appendRow(user_playlists_); - user_tracks_ = - new QStandardItem(tr("Tracks")); + user_tracks_ = new QStandardItem(tr("Tracks")); user_tracks_->setData(InternetModel::PlayBehaviour_MultipleItems, - InternetModel::Role_PlayBehaviour); + InternetModel::Role_PlayBehaviour); root_->appendRow(user_tracks_); - RetrieveUserData(); // at least, try to (this will do nothing if user isn't logged) + RetrieveUserData(); // at least, try to (this will do nothing if user isn't + // logged) } } -QWidget* SoundCloudService::HeaderWidget() const { - return search_box_; -} +QWidget* SoundCloudService::HeaderWidget() const { return search_box_; } void SoundCloudService::ShowConfig() { app_->OpenSettingsDialogAtPage(SettingsDialog::Page_SoundCloud); @@ -154,7 +152,8 @@ void SoundCloudService::Homepage() { void SoundCloudService::Connect() { OAuthenticator* oauth = new OAuthenticator( - kApiClientId, kApiClientSecret, OAuthenticator::RedirectStyle::REMOTE_WITH_STATE, this); + kApiClientId, kApiClientSecret, + OAuthenticator::RedirectStyle::REMOTE_WITH_STATE, this); oauth->StartAuthorisation(kOAuthEndpoint, kOAuthTokenEndpoint, kOAuthScope); @@ -200,12 +199,9 @@ void SoundCloudService::Logout() { access_token_.clear(); s.remove("access_token"); pending_playlists_requests_.clear(); - if (user_activities_) - root_->removeRow(user_activities_->row()); - if (user_tracks_) - root_->removeRow(user_tracks_->row()); - if (user_playlists_) - root_->removeRow(user_playlists_->row()); + if (user_activities_) root_->removeRow(user_activities_->row()); + if (user_tracks_) root_->removeRow(user_tracks_->row()); + if (user_playlists_) root_->removeRow(user_playlists_->row()); user_activities_ = nullptr; user_tracks_ = nullptr; user_playlists_ = nullptr; @@ -261,7 +257,6 @@ void SoundCloudService::RetrieveUserPlaylists() { QNetworkReply* reply = CreateRequest("me/playlists", parameters); NewClosure(reply, SIGNAL(finished()), this, SLOT(UserPlaylistsRetrieved(QNetworkReply*)), reply); - } void SoundCloudService::UserPlaylistsRetrieved(QNetworkReply* reply) { @@ -374,7 +369,6 @@ QStandardItem* SoundCloudService::CreatePlaylistItem(const QString& playlist_nam QNetworkReply* SoundCloudService::CreateRequest(const QString& ressource_name, const QList& params) { - QUrl url(kUrl); url.setPath(ressource_name); @@ -394,7 +388,8 @@ QNetworkReply* SoundCloudService::CreateRequest(const QString& ressource_name, QVariant SoundCloudService::ExtractResult(QNetworkReply* reply) { if (reply->error() != QNetworkReply::NoError) { - qLog(Error) << "Error when retrieving SoundCloud results:" << reply->errorString() << QString(" (%1)").arg(reply->error()); + qLog(Error) << "Error when retrieving SoundCloud results:" + << reply->errorString() << QString(" (%1)").arg(reply->error()); if (reply->error() == QNetworkReply::ContentAccessDenied || reply->error() == QNetworkReply::ContentOperationNotPermittedError || reply->error() == QNetworkReply::ContentNotFoundError || @@ -413,21 +408,22 @@ QVariant SoundCloudService::ExtractResult(QNetworkReply* reply) { return result; } -void SoundCloudService::RetrievePlaylist(int playlist_id, QStandardItem* playlist_item) { +void SoundCloudService::RetrievePlaylist(int playlist_id, + QStandardItem* playlist_item) { const int request_id = next_retrieve_playlist_id_++; - pending_playlists_requests_.insert( - request_id, - PlaylistInfo(playlist_id, playlist_item)); + pending_playlists_requests_.insert(request_id, + PlaylistInfo(playlist_id, playlist_item)); QList parameters; parameters << Param("oauth_token", access_token_); - QNetworkReply* reply = CreateRequest("playlists/" + QString::number(playlist_id), parameters); + QNetworkReply* reply = + CreateRequest("playlists/" + QString::number(playlist_id), parameters); NewClosure(reply, SIGNAL(finished()), this, SLOT(PlaylistRetrieved(QNetworkReply*, int)), reply, request_id); } -void SoundCloudService::PlaylistRetrieved(QNetworkReply* reply, int request_id) { - if (!pending_playlists_requests_.contains(request_id)) - return; +void SoundCloudService::PlaylistRetrieved(QNetworkReply* reply, + int request_id) { + if (!pending_playlists_requests_.contains(request_id)) return; PlaylistInfo playlist_info = pending_playlists_requests_.take(request_id); QVariant res = ExtractResult(reply); SongList songs = ExtractSongs(res.toMap()["tracks"]); diff --git a/src/internet/soundcloudservice.h b/src/internet/soundcloudservice.h index 48fec7ec0..05340c8a3 100644 --- a/src/internet/soundcloudservice.h +++ b/src/internet/soundcloudservice.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2012, David Sansome + Copyright 2012, 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef SOUNDCLOUDSERVICE_H -#define SOUNDCLOUDSERVICE_H +#ifndef INTERNET_SOUNDCLOUDSERVICE_H_ +#define INTERNET_SOUNDCLOUDSERVICE_H_ #include "internetmodel.h" #include "internetservice.h" @@ -30,6 +32,7 @@ class QNetworkReply; class SoundCloudService : public InternetService { Q_OBJECT + public: SoundCloudService(Application* app, InternetModel* parent); ~SoundCloudService(); @@ -38,7 +41,7 @@ class SoundCloudService : public InternetService { QStandardItem* CreateRootItem(); void LazyPopulate(QStandardItem* parent); - // TODO + // TODO(Arnaud Bienner) // QList playlistitem_actions(const Song& song); void ShowContextMenu(const QPoint& global_pos); QWidget* HeaderWidget() const; @@ -75,8 +78,7 @@ class SoundCloudService : public InternetService { private: struct PlaylistInfo { PlaylistInfo() {} - PlaylistInfo(int id, QStandardItem* item) - : id_(id), item_(item) {} + PlaylistInfo(int id, QStandardItem* item) : id_(id), item_(item) {} int id_; QStandardItem* item_; @@ -97,7 +99,7 @@ class SoundCloudService : public InternetService { QStandardItem* CreatePlaylistItem(const QString& playlist_name); QNetworkReply* CreateRequest(const QString& ressource_name, - const QList >& params); + const QList>& params); // Convenient function for extracting result from reply QVariant ExtractResult(QNetworkReply* reply); // Returns items directly, as activities can be playlists or songs @@ -142,4 +144,4 @@ class SoundCloudService : public InternetService { static const char* kApiClientSecret; }; -#endif // SOUNDCLOUDSERVICE_H +#endif // INTERNET_SOUNDCLOUDSERVICE_H_ diff --git a/src/internet/soundcloudsettingspage.cpp b/src/internet/soundcloudsettingspage.cpp index 2813d361b..8b4eb97c9 100644 --- a/src/internet/soundcloudsettingspage.cpp +++ b/src/internet/soundcloudsettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2014, David Sansome + Copyright 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/soundcloudsettingspage.h b/src/internet/soundcloudsettingspage.h index 568c44b1e..8c8dbb70c 100644 --- a/src/internet/soundcloudsettingspage.h +++ b/src/internet/soundcloudsettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2014, David Sansome + Copyright 2014, Arnaud Bienner + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef SOUNDCLOUDSETTINGSPAGE_H -#define SOUNDCLOUDSETTINGSPAGE_H +#ifndef INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ +#define INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -27,7 +28,7 @@ class SoundCloudSettingsPage : public SettingsPage { Q_OBJECT public: - SoundCloudSettingsPage(SettingsDialog* parent = nullptr); + explicit SoundCloudSettingsPage(SettingsDialog* parent = nullptr); ~SoundCloudSettingsPage(); void Load(); @@ -47,4 +48,4 @@ class SoundCloudSettingsPage : public SettingsPage { SoundCloudService* service_; }; -#endif // SOUNDCLOUDSETTINGSPAGE_H +#endif // INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp index b51c63ef7..dd8604bcf 100644 --- a/src/internet/spotifyblobdownloader.cpp +++ b/src/internet/spotifyblobdownloader.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/spotifyblobdownloader.h b/src/internet/spotifyblobdownloader.h index 974cdff88..b6b64190e 100644 --- a/src/internet/spotifyblobdownloader.h +++ b/src/internet/spotifyblobdownloader.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef SPOTIFYBLOBDOWNLOADER_H -#define SPOTIFYBLOBDOWNLOADER_H +#ifndef INTERNET_SPOTIFYBLOBDOWNLOADER_H_ +#define INTERNET_SPOTIFYBLOBDOWNLOADER_H_ #include @@ -38,7 +40,7 @@ class SpotifyBlobDownloader : public QObject { void Start(); -signals: + signals: void Finished(); private slots: @@ -60,4 +62,4 @@ signals: QProgressDialog* progress_; }; -#endif // SPOTIFYBLOBDOWNLOADER_H +#endif // INTERNET_SPOTIFYBLOBDOWNLOADER_H_ diff --git a/src/internet/spotifyserver.cpp b/src/internet/spotifyserver.cpp index 6e8a54cf0..dd87063dc 100644 --- a/src/internet/spotifyserver.cpp +++ b/src/internet/spotifyserver.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, 2014, John Maguire + Copyright 2011-2012, 2014, David Sansome + Copyright 2014, Arnaud Bienner + Copyright 2014, pie.or.paj + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/spotifyserver.h b/src/internet/spotifyserver.h index f360304cd..0221e308f 100644 --- a/src/internet/spotifyserver.h +++ b/src/internet/spotifyserver.h @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011-2012, 2014, John Maguire + Copyright 2011-2012, 2014, David Sansome + Copyright 2014, Arnaud Bienner + Copyright 2014, pie.or.paj + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef SPOTIFYSERVER_H -#define SPOTIFYSERVER_H +#ifndef INTERNET_SPOTIFYSERVER_H_ +#define INTERNET_SPOTIFYSERVER_H_ #include "spotifymessages.pb.h" #include "core/messagehandler.h" @@ -31,7 +35,7 @@ class SpotifyServer : public AbstractMessageHandler { Q_OBJECT public: - SpotifyServer(QObject* parent = nullptr); + explicit SpotifyServer(QObject* parent = nullptr); void Init(); void Login(const QString& username, const QString& password, @@ -61,7 +65,7 @@ class SpotifyServer : public AbstractMessageHandler { void StartPlayback(const QString& uri, quint16 port); void Seek(qint64 offset_nsec); -signals: + signals: void LoginCompleted(bool success, const QString& error, pb::spotify::LoginResponse_Error error_code); void PlaylistsUpdated(const pb::spotify::Playlists& playlists); @@ -94,4 +98,4 @@ signals: QList queued_messages_; }; -#endif // SPOTIFYSERVER_H +#endif // INTERNET_SPOTIFYSERVER_H_ diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp index af19eb8da..78611068f 100644 --- a/src/internet/spotifyservice.cpp +++ b/src/internet/spotifyservice.cpp @@ -1,3 +1,26 @@ +/* This file is part of Clementine. + Copyright 2011-2014, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011-2012, 2014, John Maguire + Copyright 2012, 2014, Arnaud Bienner + Copyright 2014, Chocobozzz + Copyright 2014, pie.or.paj + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "blobversion.h" #include "config.h" #include "internetmodel.h" @@ -761,11 +784,11 @@ void SpotifyService::DropMimeData(const QMimeData* data, const QModelIndex& index) { QVariant q_playlist_index = index.data(Role_UserPlaylistIndex); if (!q_playlist_index.isValid()) { - // In case song was dropped on a playlist item, not on the playlist title/root element + // In case song was dropped on a playlist item, not on the playlist + // title/root element q_playlist_index = index.parent().data(Role_UserPlaylistIndex); } - if (!q_playlist_index.isValid()) - return; + if (!q_playlist_index.isValid()) return; AddSongsToPlaylist(q_playlist_index.toInt(), data->urls()); } diff --git a/src/internet/spotifyservice.h b/src/internet/spotifyservice.h index f94308a4c..5c236f0ef 100644 --- a/src/internet/spotifyservice.h +++ b/src/internet/spotifyservice.h @@ -1,5 +1,26 @@ -#ifndef SPOTIFYSERVICE_H -#define SPOTIFYSERVICE_H +/* This file is part of Clementine. + Copyright 2011, Tyler Rhodes + Copyright 2011-2012, 2014, Arnaud Bienner + Copyright 2011-2012, 2014, John Maguire + Copyright 2011-2012, 2014, David Sansome + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SPOTIFYSERVICE_H_ +#define INTERNET_SPOTIFYSERVICE_H_ #include "internetmodel.h" #include "internetservice.h" @@ -28,7 +49,9 @@ class SpotifyService : public InternetService { Type_Toplist, }; - enum Role { Role_UserPlaylistIndex = InternetModel::RoleCount, }; + enum Role { + Role_UserPlaylistIndex = InternetModel::RoleCount, + }; // Values are persisted - don't change. enum LoginState { @@ -72,7 +95,7 @@ class SpotifyService : public InternetService { static void SongFromProtobuf(const pb::spotify::Track& track, Song* song); -signals: + signals: void BlobStateChanged(); void LoginFinished(bool success); void ImageLoaded(const QString& id, const QImage& image); @@ -161,4 +184,4 @@ signals: bool volume_normalisation_; }; -#endif +#endif // INTERNET_SPOTIFYSERVICE_H_ diff --git a/src/internet/spotifysettingspage.cpp b/src/internet/spotifysettingspage.cpp index 011457674..480c37ac4 100644 --- a/src/internet/spotifysettingspage.cpp +++ b/src/internet/spotifysettingspage.cpp @@ -1,5 +1,9 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, Tyler Rhodes + Copyright 2011, Andrea Decorte + Copyright 2011-2013, David Sansome + Copyright 2011-2012, 2014, John Maguire + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/spotifysettingspage.h b/src/internet/spotifysettingspage.h index 68ac10c29..6625bfe39 100644 --- a/src/internet/spotifysettingspage.h +++ b/src/internet/spotifysettingspage.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2010, David Sansome + Copyright 2011, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef SPOTIFYSETTINGSPAGE_H -#define SPOTIFYSETTINGSPAGE_H +#ifndef INTERNET_SPOTIFYSETTINGSPAGE_H_ +#define INTERNET_SPOTIFYSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -28,7 +30,7 @@ class SpotifySettingsPage : public SettingsPage { Q_OBJECT public: - SpotifySettingsPage(SettingsDialog* dialog); + explicit SpotifySettingsPage(SettingsDialog* dialog); ~SpotifySettingsPage(); void Load(); @@ -55,4 +57,4 @@ class SpotifySettingsPage : public SettingsPage { QString original_password_; }; -#endif // SPOTIFYSETTINGSPAGE_H +#endif // INTERNET_SPOTIFYSETTINGSPAGE_H_ diff --git a/src/internet/subsonicservice.cpp b/src/internet/subsonicservice.cpp index afeb437b3..689bba31d 100644 --- a/src/internet/subsonicservice.cpp +++ b/src/internet/subsonicservice.cpp @@ -1,3 +1,25 @@ +/* This file is part of Clementine. + Copyright 2011-2013, Alan Briolat + Copyright 2013, David Sansome + Copyright 2013, Ross Wolfson + Copyright 2013-2014, John Maguire + Copyright 2014, Chocobozzz + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "subsonicservice.h" #include @@ -241,7 +263,7 @@ void SubsonicService::ReloadDatabaseFinished() { void SubsonicService::OnLoginStateChanged( SubsonicService::LoginState newstate) { - // TODO: library refresh logic? + // TODO(Alan Briolat): library refresh logic? } void SubsonicService::OnPingFinished(QNetworkReply* reply) { @@ -422,7 +444,7 @@ void SubsonicLibraryScanner::OnGetAlbumFinished(QNetworkReply* reply) { reader.readNextStartElement(); Q_ASSERT(reader.name() == "subsonic-response"); if (reader.attributes().value("status") != "ok") { - // TODO: error handling + // TODO(Alan Briolat): error handling return; } diff --git a/src/internet/subsonicservice.h b/src/internet/subsonicservice.h index d05d90ab2..50a013a9f 100644 --- a/src/internet/subsonicservice.h +++ b/src/internet/subsonicservice.h @@ -1,5 +1,26 @@ -#ifndef SUBSONICSERVICE_H -#define SUBSONICSERVICE_H +/* This file is part of Clementine. + Copyright 2011-2013, Alan Briolat + Copyright 2013, Ross Wolfson + Copyright 2013, David Sansome + Copyright 2013-2014, John Maguire + Copyright 2014, Krzysztof Sobiecki + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SUBSONICSERVICE_H_ +#define INTERNET_SUBSONICSERVICE_H_ #include @@ -52,9 +73,15 @@ class SubsonicService : public InternetService { ApiError_NotFound = 70, }; - enum Type { Type_Artist = InternetModel::TypeCount, Type_Album, Type_Track, }; + enum Type { + Type_Artist = InternetModel::TypeCount, + Type_Album, + Type_Track, + }; - enum Role { Role_Id = InternetModel::RoleCount, }; + enum Role { + Role_Id = InternetModel::RoleCount, + }; typedef QMap RequestOptions; @@ -92,7 +119,7 @@ class SubsonicService : public InternetService { static const int kMaxRedirects; -signals: + signals: void LoginStateChanged(SubsonicService::LoginState newstate); private: @@ -140,7 +167,7 @@ class SubsonicLibraryScanner : public QObject { Q_OBJECT public: - SubsonicLibraryScanner(SubsonicService* service, QObject* parent = nullptr); + explicit SubsonicLibraryScanner(SubsonicService* service, QObject* parent = nullptr); ~SubsonicLibraryScanner(); void Scan(); @@ -149,7 +176,7 @@ class SubsonicLibraryScanner : public QObject { static const int kAlbumChunkSize; static const int kConcurrentRequests; -signals: + signals: void ScanFinished(); private slots: @@ -169,4 +196,4 @@ signals: SongList songs_; }; -#endif // SUBSONICSERVICE_H +#endif // INTERNET_SUBSONICSERVICE_H_ diff --git a/src/internet/subsonicsettingspage.cpp b/src/internet/subsonicsettingspage.cpp index cafa9d607..970920faf 100644 --- a/src/internet/subsonicsettingspage.cpp +++ b/src/internet/subsonicsettingspage.cpp @@ -1,3 +1,23 @@ +/* This file is part of Clementine. + Copyright 2011, 2013, Alan Briolat + Copyright 2013, Ross Wolfson + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "subsonicsettingspage.h" #include "ui_subsonicsettingspage.h" #include "core/logging.h" diff --git a/src/internet/subsonicsettingspage.h b/src/internet/subsonicsettingspage.h index 111f43140..5de4fe7fa 100644 --- a/src/internet/subsonicsettingspage.h +++ b/src/internet/subsonicsettingspage.h @@ -1,5 +1,24 @@ -#ifndef SUBSONICSETTINGSPAGE_H -#define SUBSONICSETTINGSPAGE_H +/* This file is part of Clementine. + Copyright 2011, 2013, Alan Briolat + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SUBSONICSETTINGSPAGE_H_ +#define INTERNET_SUBSONICSETTINGSPAGE_H_ #include "ui/settingspage.h" #include "subsonicservice.h" @@ -10,7 +29,7 @@ class SubsonicSettingsPage : public SettingsPage { Q_OBJECT public: - SubsonicSettingsPage(SettingsDialog* dialog); + explicit SubsonicSettingsPage(SettingsDialog* dialog); ~SubsonicSettingsPage(); void Load(); @@ -29,4 +48,4 @@ class SubsonicSettingsPage : public SettingsPage { SubsonicService* service_; }; -#endif // SUBSONICSETTINGSPAGE_H +#endif // INTERNET_SUBSONICSETTINGSPAGE_H_ diff --git a/src/internet/subsonicurlhandler.cpp b/src/internet/subsonicurlhandler.cpp index ba348868a..d133f291c 100644 --- a/src/internet/subsonicurlhandler.cpp +++ b/src/internet/subsonicurlhandler.cpp @@ -1,3 +1,22 @@ +/* This file is part of Clementine. + Copyright 2012-2013, Alan Briolat + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + #include "subsonicservice.h" #include "subsonicurlhandler.h" diff --git a/src/internet/subsonicurlhandler.h b/src/internet/subsonicurlhandler.h index 0b5117d5c..8ad2100d8 100644 --- a/src/internet/subsonicurlhandler.h +++ b/src/internet/subsonicurlhandler.h @@ -1,5 +1,24 @@ -#ifndef SUBSONICURLHANDLER_H -#define SUBSONICURLHANDLER_H +/* This file is part of Clementine. + Copyright 2012-2013, Alan Briolat + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef INTERNET_SUBSONICURLHANDLER_H_ +#define INTERNET_SUBSONICURLHANDLER_H_ #include "core/urlhandler.h" @@ -20,4 +39,4 @@ class SubsonicUrlHandler : public UrlHandler { SubsonicService* service_; }; -#endif // SUBSONICURLHANDLER_H +#endif // INTERNET_SUBSONICURLHANDLER_H_ diff --git a/src/internet/vkconnection.cpp b/src/internet/vkconnection.cpp index a3bf55d33..46523cfbb 100644 --- a/src/internet/vkconnection.cpp +++ b/src/internet/vkconnection.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. Copyright 2014, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Ivan Leontiev Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/vkconnection.h b/src/internet/vkconnection.h index 1ce81e7fb..e2cac5622 100644 --- a/src/internet/vkconnection.h +++ b/src/internet/vkconnection.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2014, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef VKCONNECTION_H -#define VKCONNECTION_H +#ifndef INTERNET_VKCONNECTION_H_ +#define INTERNET_VKCONNECTION_H_ #include "vreen/client.h" #include "vreen/connection.h" @@ -28,32 +29,27 @@ class VkConnection : public Vreen::Connection { Q_ENUMS(DisplayType) Q_FLAGS(Scopes) -public: - enum DisplayType { - Page, - Popup, - Touch, - Wap - }; + public: + enum DisplayType { Page, Popup, Touch, Wap }; enum Scope { - Notify = 0x1, - Friends = 0x2, - Photos = 0x4, - Audio = 0x8, - Video = 0x10, - Docs = 0x20, - Notes = 0x40, - Pages = 0x80, - Status = 0x100, - Offers = 0x200, - Questions = 0x400, - Wall = 0x800, - Groups = 0x1000, - Messages = 0x2000, + Notify = 0x1, + Friends = 0x2, + Photos = 0x4, + Audio = 0x8, + Video = 0x10, + Docs = 0x20, + Notes = 0x40, + Pages = 0x80, + Status = 0x100, + Offers = 0x200, + Questions = 0x400, + Wall = 0x800, + Groups = 0x1000, + Messages = 0x2000, Notifications = 0x4000, - Stats = 0x8000, - Ads = 0x10000, - Offline = 0x20000 + Stats = 0x8000, + Ads = 0x10000, + Offline = 0x20000 }; Q_DECLARE_FLAGS(Scopes, Scope) @@ -67,16 +63,16 @@ public: void clear(); bool hasAccount(); -protected: + protected: QNetworkRequest makeRequest(const QString& method, const QVariantMap& args = QVariantMap()); void decorateRequest(QNetworkRequest& request); -private slots: + private slots: void codeRecived(LocalRedirectServer* server, QUrl redirect_uri); void accessTokenRecived(QNetworkReply* reply); -private: + private: void requestAccessToken(); void setConnectionState(Vreen::Client::State state); void saveToken(); @@ -91,4 +87,4 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(VkConnection::Scopes) -#endif // VKCONNECTION_H +#endif // INTERNET_VKCONNECTION_H_ diff --git a/src/internet/vkmusiccache.cpp b/src/internet/vkmusiccache.cpp index 8a93430fe..541db2b16 100644 --- a/src/internet/vkmusiccache.cpp +++ b/src/internet/vkmusiccache.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Maltsev Vlad + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/vkmusiccache.h b/src/internet/vkmusiccache.h index 11b02a385..71567ab10 100644 --- a/src/internet/vkmusiccache.h +++ b/src/internet/vkmusiccache.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Maltsev Vlad + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef VKMUSICCACHE_H -#define VKMUSICCACHE_H +#ifndef INTERNET_VKMUSICCACHE_H_ +#define INTERNET_VKMUSICCACHE_H_ #include #include @@ -75,4 +76,4 @@ class VkMusicCache : public QObject { QNetworkReply* reply_; }; -#endif // VKMUSICCACHE_H +#endif // INTERNET_VKMUSICCACHE_H_ diff --git a/src/internet/vksearchdialog.cpp b/src/internet/vksearchdialog.cpp index 19533156b..0f99b5385 100644 --- a/src/internet/vksearchdialog.cpp +++ b/src/internet/vksearchdialog.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,10 +25,10 @@ #include "ui_vksearchdialog.h" VkSearchDialog::VkSearchDialog(VkService* service, QWidget* parent) - : QDialog(parent), - ui(new Ui::VkSearchDialog), - service_(service), - last_search_(SearchID(SearchID::UserOrGroup)) { + : QDialog(parent), + ui(new Ui::VkSearchDialog), + service_(service), + last_search_(SearchID(SearchID::UserOrGroup)) { ui->setupUi(this); timer = new QTimer(this); @@ -53,12 +54,11 @@ VkSearchDialog::VkSearchDialog(VkService* service, QWidget* parent) popup->setFocusPolicy(Qt::NoFocus); popup->setFocusProxy(parent); - connect(popup, SIGNAL(itemSelectionChanged()), - SLOT(selectionChanged())); - connect(popup, SIGNAL(clicked(QModelIndex)), - SLOT(selected())); + connect(popup, SIGNAL(itemSelectionChanged()), SLOT(selectionChanged())); + connect(popup, SIGNAL(clicked(QModelIndex)), SLOT(selected())); - connect(this, SIGNAL(Find(QString)), service_, SLOT(FindUserOrGroup(QString))); + connect(this, SIGNAL(Find(QString)), service_, + SLOT(FindUserOrGroup(QString))); connect(service_, SIGNAL(UserOrGroupSearchResult(SearchID, MusicOwnerList)), this, SLOT(ReceiveResults(SearchID, MusicOwnerList))); @@ -70,9 +70,7 @@ VkSearchDialog::~VkSearchDialog() { delete popup; } -void VkSearchDialog::suggest() { - emit Find(ui->searchLine->text()); -} +void VkSearchDialog::suggest() { emit Find(ui->searchLine->text()); } void VkSearchDialog::selected() { selectionChanged(); @@ -81,13 +79,14 @@ void VkSearchDialog::selected() { popup->hide(); } -void VkSearchDialog::ReceiveResults(const SearchID& id, const MusicOwnerList& owners) { +void VkSearchDialog::ReceiveResults(const SearchID& id, + const MusicOwnerList& owners) { if (id.id() > last_search_.id()) { popup->setUpdatesEnabled(false); popup->clear(); if (owners.count() > 0) { - for (const MusicOwner &own : owners) { + for (const MusicOwner& own : owners) { popup->addTopLevelItem(createItem(own)); } } else { @@ -98,8 +97,8 @@ void VkSearchDialog::ReceiveResults(const SearchID& id, const MusicOwnerList& ow popup->resizeColumnToContents(0); int ch = popup->columnWidth(0); - if (ch > 0.8*ui->searchLine->width()) { - popup->setColumnWidth(0, qRound(0.8*ui->searchLine->width())); + if (ch > 0.8 * ui->searchLine->width()) { + popup->setColumnWidth(0, qRound(0.8 * ui->searchLine->width())); } popup->resizeColumnToContents(1); popup->adjustSize(); @@ -151,29 +150,29 @@ bool VkSearchDialog::eventFilter(QObject* obj, QEvent* ev) { int key = static_cast(ev)->key(); switch (key) { - case Qt::Key_Enter: - case Qt::Key_Return: - selected(); - break; + case Qt::Key_Enter: + case Qt::Key_Return: + selected(); + break; - case Qt::Key_Escape: - ui->searchLine->setFocus(); - popup->hide(); - consumed = true; - break; + case Qt::Key_Escape: + ui->searchLine->setFocus(); + popup->hide(); + consumed = true; + break; - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_Home: - case Qt::Key_End: - case Qt::Key_PageUp: - case Qt::Key_PageDown: - break; + case Qt::Key_Up: + case Qt::Key_Down: + case Qt::Key_Home: + case Qt::Key_End: + case Qt::Key_PageUp: + case Qt::Key_PageDown: + break; - default: - ui->searchLine->setFocus(); - ui->searchLine->event(ev); - break; + default: + ui->searchLine->setFocus(); + ui->searchLine->event(ev); + break; } return consumed; diff --git a/src/internet/vksearchdialog.h b/src/internet/vksearchdialog.h index cff826ff7..f2d142790 100644 --- a/src/internet/vksearchdialog.h +++ b/src/internet/vksearchdialog.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef VKSEARCHDIALOG_H -#define VKSEARCHDIALOG_H +#ifndef INTERNET_VKSEARCHDIALOG_H_ +#define INTERNET_VKSEARCHDIALOG_H_ #include #include @@ -31,26 +32,26 @@ class VkSearchDialog; class VkSearchDialog : public QDialog { Q_OBJECT -public: + public: explicit VkSearchDialog(VkService* service, QWidget* parent = 0); ~VkSearchDialog(); MusicOwner found() const; -signals: + signals: void Find(const QString& query); -public slots: + public slots: void ReceiveResults(const SearchID& id, const MusicOwnerList& owners); -protected: + protected: void showEvent(QShowEvent*); -private slots: + private slots: void selectionChanged(); void suggest(); void selected(); -private: + private: bool eventFilter(QObject* obj, QEvent* ev); QTreeWidgetItem* createItem(const MusicOwner& own); @@ -62,4 +63,4 @@ private: QTimer* timer; }; -#endif // VKSEARCHDIALOG_H +#endif // INTERNET_VKSEARCHDIALOG_H_ diff --git a/src/internet/vkservice.cpp b/src/internet/vkservice.cpp index d80f4e035..1471cf1b1 100644 --- a/src/internet/vkservice.cpp +++ b/src/internet/vkservice.cpp @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Ivan Leontiev Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -816,7 +818,7 @@ QStandardItem* VkService::AppendAlbumList(QStandardItem* parent, bool myself) { if (myself) { item = new QStandardItem(QIcon(":vk/discography.png"), tr("My Albums")); - // TODO: Do this better. We have incomplete MusicOwner instance + // TODO(Ivan Leontiev): Do this better. We have incomplete MusicOwner instance // for logged in user. owner.setId(UserID()); my_albums_item_ = item; @@ -874,7 +876,7 @@ QStandardItem* VkService::AppendMusic(QStandardItem* parent, bool myself) { if (myself) { item = new QStandardItem(QIcon(":vk/my_music.png"), tr("My Music")); - // TODO: Do this better. We have incomplete MusicOwner instance + // TODO(Ivan Leontiev): Do this better. We have incomplete MusicOwner instance // for logged in user. owner.setId(UserID()); my_music_item_ = item; diff --git a/src/internet/vkservice.h b/src/internet/vkservice.h index 7bbdc2bf5..9c8566d5e 100644 --- a/src/internet/vkservice.h +++ b/src/internet/vkservice.h @@ -1,5 +1,7 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Ivan Leontiev Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef VKSERVICE_H -#define VKSERVICE_H +#ifndef INTERNET_VKSERVICE_H_ +#define INTERNET_VKSERVICE_H_ #include @@ -179,7 +181,7 @@ class VkService : public InternetService { QString cacheFilename() const { return cacheFilename_; } bool isLoveAddToMyMusic() const { return love_is_add_to_mymusic_; } -signals: + signals: void NameUpdated(const QString& name); void ConnectionStateChanged(Vreen::Client::State state); void LoginSuccess(bool success); @@ -318,4 +320,4 @@ signals: QString cacheFilename_; }; -#endif // VKSERVICE_H +#endif // INTERNET_VKSERVICE_H_ diff --git a/src/internet/vksettingspage.cpp b/src/internet/vksettingspage.cpp index 2d48a1d9a..fd31087ae 100644 --- a/src/internet/vksettingspage.cpp +++ b/src/internet/vksettingspage.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Maltsev Vlad + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/vksettingspage.h b/src/internet/vksettingspage.h index 3090ab2db..5d867db9d 100644 --- a/src/internet/vksettingspage.h +++ b/src/internet/vksettingspage.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, Maltsev Vlad Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef VKSETTINGSPAGE_H -#define VKSETTINGSPAGE_H +#ifndef INTERNET_VKSETTINGSPAGE_H_ +#define INTERNET_VKSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -29,14 +30,14 @@ class Ui_VkSettingsPage; class VkSettingsPage : public SettingsPage { Q_OBJECT -public: + public: explicit VkSettingsPage(SettingsDialog* parent); ~VkSettingsPage(); void Load(); void Save(); -private slots: + private slots: void LoginSuccess(bool success); void Login(); @@ -45,11 +46,11 @@ private slots: void CacheDirBrowse(); void ResetCasheFilenames(); -private: + private: void LoginWidgets(); void LogoutWidgets(); Ui_VkSettingsPage* ui_; VkService* service_; }; -#endif // VKSETTINGSPAGE_H +#endif // INTERNET_VKSETTINGSPAGE_H_ diff --git a/src/internet/vkurlhandler.cpp b/src/internet/vkurlhandler.cpp index 5368897d2..17ade9ed4 100644 --- a/src/internet/vkurlhandler.cpp +++ b/src/internet/vkurlhandler.cpp @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Maltsev Vlad + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/vkurlhandler.h b/src/internet/vkurlhandler.h index e25d25d26..11bcd88d3 100644 --- a/src/internet/vkurlhandler.h +++ b/src/internet/vkurlhandler.h @@ -1,5 +1,6 @@ /* This file is part of Clementine. - Copyright 2013, Vlad Maltsev + Copyright 2014, Maltsev Vlad + Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef VKURLHANDLER_H -#define VKURLHANDLER_H +#ifndef INTERNET_VKURLHANDLER_H_ +#define INTERNET_VKURLHANDLER_H_ #include "core/urlhandler.h" #include @@ -40,4 +41,4 @@ class VkUrlHandler : public UrlHandler { VkService* service_; }; -#endif // VKURLHANDLER_H +#endif // INTERNET_VKURLHANDLER_H_ From 93a286a2721a0b878f316365a8650a91e44da628 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Thu, 18 Dec 2014 00:39:20 +0100 Subject: [PATCH 4/8] Move files around and make subdirectories inside src/internet, move src/podcasts to src/internet --- src/CMakeLists.txt | 14 +++++++------- src/internet/{ => box}/boxservice.cpp | 0 src/internet/{ => box}/boxservice.h | 0 src/internet/{ => box}/boxsettingspage.cpp | 2 +- src/internet/{ => box}/boxsettingspage.h | 0 src/internet/{ => box}/boxsettingspage.ui | 0 src/internet/{ => box}/boxurlhandler.cpp | 0 src/internet/{ => box}/boxurlhandler.h | 0 .../{ => cloudfile}/cloudfilesearchprovider.cpp | 0 .../{ => cloudfile}/cloudfilesearchprovider.h | 0 src/internet/{ => cloudfile}/cloudfileservice.cpp | 0 src/internet/{ => cloudfile}/cloudfileservice.h | 0 src/internet/{ => core}/geolocator.cpp | 0 src/internet/{ => core}/geolocator.h | 0 src/internet/{ => core}/internetmimedata.h | 0 src/internet/{ => core}/internetmodel.cpp | 2 +- src/internet/{ => core}/internetmodel.h | 0 src/internet/{ => core}/internetplaylistitem.cpp | 0 src/internet/{ => core}/internetplaylistitem.h | 0 src/internet/{ => core}/internetservice.cpp | 0 src/internet/{ => core}/internetservice.h | 0 .../{ => core}/internetshowsettingspage.cpp | 0 src/internet/{ => core}/internetshowsettingspage.h | 0 .../{ => core}/internetshowsettingspage.ui | 0 src/internet/{ => core}/internetsongmimedata.h | 0 src/internet/{ => core}/internetview.cpp | 0 src/internet/{ => core}/internetview.h | 0 src/internet/{ => core}/internetviewcontainer.cpp | 0 src/internet/{ => core}/internetviewcontainer.h | 0 src/internet/{ => core}/internetviewcontainer.ui | 0 src/internet/{ => core}/localredirectserver.cpp | 0 src/internet/{ => core}/localredirectserver.h | 0 src/internet/{ => core}/oauthenticator.cpp | 0 src/internet/{ => core}/oauthenticator.h | 0 src/internet/{ => core}/scrobbler.h | 0 src/internet/{ => core}/searchboxwidget.cpp | 0 src/internet/{ => core}/searchboxwidget.h | 0 src/internet/{ => core}/searchboxwidget.ui | 0 .../{ => digitally}/digitallyimportedclient.cpp | 0 .../{ => digitally}/digitallyimportedclient.h | 0 .../digitallyimportedservicebase.cpp | 0 .../{ => digitally}/digitallyimportedservicebase.h | 0 .../digitallyimportedsettingspage.cpp | 0 .../digitallyimportedsettingspage.h | 0 .../digitallyimportedsettingspage.ui | 0 .../digitallyimportedurlhandler.cpp | 0 .../{ => digitally}/digitallyimportedurlhandler.h | 0 .../{ => dropbox}/dropboxauthenticator.cpp | 0 src/internet/{ => dropbox}/dropboxauthenticator.h | 0 src/internet/{ => dropbox}/dropboxservice.cpp | 0 src/internet/{ => dropbox}/dropboxservice.h | 0 src/internet/{ => dropbox}/dropboxsettingspage.cpp | 0 src/internet/{ => dropbox}/dropboxsettingspage.h | 0 src/internet/{ => dropbox}/dropboxsettingspage.ui | 0 src/internet/{ => dropbox}/dropboxurlhandler.cpp | 0 src/internet/{ => dropbox}/dropboxurlhandler.h | 0 .../{ => googledrive}/googledriveclient.cpp | 0 src/internet/{ => googledrive}/googledriveclient.h | 0 .../{ => googledrive}/googledriveservice.cpp | 0 .../{ => googledrive}/googledriveservice.h | 0 .../{ => googledrive}/googledrivesettingspage.cpp | 0 .../{ => googledrive}/googledrivesettingspage.h | 0 .../{ => googledrive}/googledrivesettingspage.ui | 0 .../{ => googledrive}/googledriveurlhandler.cpp | 0 .../{ => googledrive}/googledriveurlhandler.h | 0 .../{ => grooveshark}/groovesharkradio.cpp | 0 src/internet/{ => grooveshark}/groovesharkradio.h | 0 .../{ => grooveshark}/groovesharkservice.cpp | 0 .../{ => grooveshark}/groovesharkservice.h | 0 .../{ => grooveshark}/groovesharksettingspage.cpp | 0 .../{ => grooveshark}/groovesharksettingspage.h | 0 .../{ => grooveshark}/groovesharksettingspage.ui | 0 .../{ => grooveshark}/groovesharkurlhandler.cpp | 0 .../{ => grooveshark}/groovesharkurlhandler.h | 0 src/internet/{ => icecast}/icecastbackend.cpp | 0 src/internet/{ => icecast}/icecastbackend.h | 0 src/internet/{ => icecast}/icecastfilterwidget.cpp | 0 src/internet/{ => icecast}/icecastfilterwidget.h | 0 src/internet/{ => icecast}/icecastfilterwidget.ui | 0 src/internet/{ => icecast}/icecastitem.h | 0 src/internet/{ => icecast}/icecastmodel.cpp | 0 src/internet/{ => icecast}/icecastmodel.h | 0 src/internet/{ => icecast}/icecastservice.cpp | 0 src/internet/{ => icecast}/icecastservice.h | 0 src/internet/{ => internetradio}/savedradio.cpp | 0 src/internet/{ => internetradio}/savedradio.h | 0 .../{ => jamendo}/jamendodynamicplaylist.cpp | 0 .../{ => jamendo}/jamendodynamicplaylist.h | 0 src/internet/{ => jamendo}/jamendoplaylistitem.cpp | 0 src/internet/{ => jamendo}/jamendoplaylistitem.h | 0 src/internet/{ => jamendo}/jamendoservice.cpp | 0 src/internet/{ => jamendo}/jamendoservice.h | 0 src/internet/{ => lastfm}/fixlastfm.cpp | 0 src/internet/{ => lastfm}/fixlastfm.h | 0 src/internet/{ => lastfm}/lastfmcompat.cpp | 0 src/internet/{ => lastfm}/lastfmcompat.h | 0 src/internet/{ => lastfm}/lastfmservice.cpp | 0 src/internet/{ => lastfm}/lastfmservice.h | 0 src/internet/{ => lastfm}/lastfmsettingspage.cpp | 0 src/internet/{ => lastfm}/lastfmsettingspage.h | 0 src/internet/{ => lastfm}/lastfmsettingspage.ui | 0 src/internet/{ => lastfm}/lastfmurlhandler.h | 0 .../{ => magnatune}/magnatunedownloaddialog.cpp | 0 .../{ => magnatune}/magnatunedownloaddialog.h | 0 .../{ => magnatune}/magnatunedownloaddialog.ui | 0 .../{ => magnatune}/magnatuneplaylistitem.cpp | 0 .../{ => magnatune}/magnatuneplaylistitem.h | 0 src/internet/{ => magnatune}/magnatuneservice.cpp | 0 src/internet/{ => magnatune}/magnatuneservice.h | 0 .../{ => magnatune}/magnatunesettingspage.cpp | 0 .../{ => magnatune}/magnatunesettingspage.h | 0 .../{ => magnatune}/magnatunesettingspage.ui | 0 .../{ => magnatune}/magnatuneurlhandler.cpp | 0 src/internet/{ => magnatune}/magnatuneurlhandler.h | 0 src/{ => internet}/podcasts/addpodcastbyurl.cpp | 0 src/{ => internet}/podcasts/addpodcastbyurl.h | 0 src/{ => internet}/podcasts/addpodcastbyurl.ui | 0 src/{ => internet}/podcasts/addpodcastdialog.cpp | 0 src/{ => internet}/podcasts/addpodcastdialog.h | 0 src/{ => internet}/podcasts/addpodcastdialog.ui | 0 src/{ => internet}/podcasts/addpodcastpage.cpp | 0 src/{ => internet}/podcasts/addpodcastpage.h | 0 src/{ => internet}/podcasts/fixedopmlpage.cpp | 0 src/{ => internet}/podcasts/fixedopmlpage.h | 0 src/{ => internet}/podcasts/gpoddersearchpage.cpp | 0 src/{ => internet}/podcasts/gpoddersearchpage.h | 0 src/{ => internet}/podcasts/gpoddersearchpage.ui | 0 src/{ => internet}/podcasts/gpoddersync.cpp | 0 src/{ => internet}/podcasts/gpoddersync.h | 0 .../podcasts/gpoddertoptagsmodel.cpp | 0 src/{ => internet}/podcasts/gpoddertoptagsmodel.h | 0 src/{ => internet}/podcasts/gpoddertoptagspage.cpp | 0 src/{ => internet}/podcasts/gpoddertoptagspage.h | 0 src/{ => internet}/podcasts/itunessearchpage.cpp | 0 src/{ => internet}/podcasts/itunessearchpage.h | 0 src/{ => internet}/podcasts/itunessearchpage.ui | 0 src/{ => internet}/podcasts/opmlcontainer.h | 0 src/{ => internet}/podcasts/podcast.cpp | 0 src/{ => internet}/podcasts/podcast.h | 0 src/{ => internet}/podcasts/podcastbackend.cpp | 0 src/{ => internet}/podcasts/podcastbackend.h | 0 src/{ => internet}/podcasts/podcastdeleter.cpp | 0 src/{ => internet}/podcasts/podcastdeleter.h | 0 .../podcasts/podcastdiscoverymodel.cpp | 0 .../podcasts/podcastdiscoverymodel.h | 0 src/{ => internet}/podcasts/podcastdownloader.cpp | 0 src/{ => internet}/podcasts/podcastdownloader.h | 0 src/{ => internet}/podcasts/podcastepisode.cpp | 0 src/{ => internet}/podcasts/podcastepisode.h | 0 src/{ => internet}/podcasts/podcastinfowidget.cpp | 0 src/{ => internet}/podcasts/podcastinfowidget.h | 0 src/{ => internet}/podcasts/podcastinfowidget.ui | 0 src/{ => internet}/podcasts/podcastparser.cpp | 0 src/{ => internet}/podcasts/podcastparser.h | 0 src/{ => internet}/podcasts/podcastservice.cpp | 0 src/{ => internet}/podcasts/podcastservice.h | 0 .../podcasts/podcastservicemodel.cpp | 0 src/{ => internet}/podcasts/podcastservicemodel.h | 0 .../podcasts/podcastsettingspage.cpp | 0 src/{ => internet}/podcasts/podcastsettingspage.h | 0 src/{ => internet}/podcasts/podcastsettingspage.ui | 0 src/{ => internet}/podcasts/podcastupdater.cpp | 0 src/{ => internet}/podcasts/podcastupdater.h | 0 src/{ => internet}/podcasts/podcasturlloader.cpp | 0 src/{ => internet}/podcasts/podcasturlloader.h | 0 src/internet/{ => seafile}/seafileservice.cpp | 0 src/internet/{ => seafile}/seafileservice.h | 0 src/internet/{ => seafile}/seafilesettingspage.cpp | 0 src/internet/{ => seafile}/seafilesettingspage.h | 0 src/internet/{ => seafile}/seafilesettingspage.ui | 0 src/internet/{ => seafile}/seafiletree.cpp | 0 src/internet/{ => seafile}/seafiletree.h | 0 src/internet/{ => seafile}/seafileurlhandler.cpp | 0 src/internet/{ => seafile}/seafileurlhandler.h | 0 src/internet/{ => skydrive}/skydriveservice.cpp | 0 src/internet/{ => skydrive}/skydriveservice.h | 0 .../{ => skydrive}/skydrivesettingspage.cpp | 0 src/internet/{ => skydrive}/skydrivesettingspage.h | 0 .../{ => skydrive}/skydrivesettingspage.ui | 0 src/internet/{ => skydrive}/skydriveurlhandler.cpp | 0 src/internet/{ => skydrive}/skydriveurlhandler.h | 0 src/internet/{ => somafm}/somafmservice.cpp | 0 src/internet/{ => somafm}/somafmservice.h | 0 src/internet/{ => somafm}/somafmurlhandler.cpp | 0 src/internet/{ => somafm}/somafmurlhandler.h | 0 .../{ => soundcloud}/soundcloudservice.cpp | 0 src/internet/{ => soundcloud}/soundcloudservice.h | 0 .../{ => soundcloud}/soundcloudsettingspage.cpp | 0 .../{ => soundcloud}/soundcloudsettingspage.h | 0 .../{ => soundcloud}/soundcloudsettingspage.ui | 0 .../{ => spotify}/spotifyblobdownloader.cpp | 0 src/internet/{ => spotify}/spotifyblobdownloader.h | 0 src/internet/{ => spotify}/spotifyserver.cpp | 0 src/internet/{ => spotify}/spotifyserver.h | 0 src/internet/{ => spotify}/spotifyservice.cpp | 0 src/internet/{ => spotify}/spotifyservice.h | 0 src/internet/{ => spotify}/spotifysettingspage.cpp | 0 src/internet/{ => spotify}/spotifysettingspage.h | 0 src/internet/{ => spotify}/spotifysettingspage.ui | 0 src/internet/{ => subsonic}/subsonicservice.cpp | 0 src/internet/{ => subsonic}/subsonicservice.h | 0 .../{ => subsonic}/subsonicsettingspage.cpp | 0 src/internet/{ => subsonic}/subsonicsettingspage.h | 0 .../{ => subsonic}/subsonicsettingspage.ui | 0 src/internet/{ => subsonic}/subsonicurlhandler.cpp | 0 src/internet/{ => subsonic}/subsonicurlhandler.h | 0 src/internet/{ => vk}/vkconnection.cpp | 0 src/internet/{ => vk}/vkconnection.h | 0 src/internet/{ => vk}/vkmusiccache.cpp | 0 src/internet/{ => vk}/vkmusiccache.h | 0 src/internet/{ => vk}/vksearchdialog.cpp | 0 src/internet/{ => vk}/vksearchdialog.h | 0 src/internet/{ => vk}/vksearchdialog.ui | 0 src/internet/{ => vk}/vkservice.cpp | 0 src/internet/{ => vk}/vkservice.h | 0 src/internet/{ => vk}/vksettingspage.cpp | 0 src/internet/{ => vk}/vksettingspage.h | 0 src/internet/{ => vk}/vksettingspage.ui | 0 src/internet/{ => vk}/vkurlhandler.cpp | 0 src/internet/{ => vk}/vkurlhandler.h | 0 220 files changed, 9 insertions(+), 9 deletions(-) rename src/internet/{ => box}/boxservice.cpp (100%) rename src/internet/{ => box}/boxservice.h (100%) rename src/internet/{ => box}/boxsettingspage.cpp (98%) rename src/internet/{ => box}/boxsettingspage.h (100%) rename src/internet/{ => box}/boxsettingspage.ui (100%) rename src/internet/{ => box}/boxurlhandler.cpp (100%) rename src/internet/{ => box}/boxurlhandler.h (100%) rename src/internet/{ => cloudfile}/cloudfilesearchprovider.cpp (100%) rename src/internet/{ => cloudfile}/cloudfilesearchprovider.h (100%) rename src/internet/{ => cloudfile}/cloudfileservice.cpp (100%) rename src/internet/{ => cloudfile}/cloudfileservice.h (100%) rename src/internet/{ => core}/geolocator.cpp (100%) rename src/internet/{ => core}/geolocator.h (100%) rename src/internet/{ => core}/internetmimedata.h (100%) rename src/internet/{ => core}/internetmodel.cpp (99%) rename src/internet/{ => core}/internetmodel.h (100%) rename src/internet/{ => core}/internetplaylistitem.cpp (100%) rename src/internet/{ => core}/internetplaylistitem.h (100%) rename src/internet/{ => core}/internetservice.cpp (100%) rename src/internet/{ => core}/internetservice.h (100%) rename src/internet/{ => core}/internetshowsettingspage.cpp (100%) rename src/internet/{ => core}/internetshowsettingspage.h (100%) rename src/internet/{ => core}/internetshowsettingspage.ui (100%) rename src/internet/{ => core}/internetsongmimedata.h (100%) rename src/internet/{ => core}/internetview.cpp (100%) rename src/internet/{ => core}/internetview.h (100%) rename src/internet/{ => core}/internetviewcontainer.cpp (100%) rename src/internet/{ => core}/internetviewcontainer.h (100%) rename src/internet/{ => core}/internetviewcontainer.ui (100%) rename src/internet/{ => core}/localredirectserver.cpp (100%) rename src/internet/{ => core}/localredirectserver.h (100%) rename src/internet/{ => core}/oauthenticator.cpp (100%) rename src/internet/{ => core}/oauthenticator.h (100%) rename src/internet/{ => core}/scrobbler.h (100%) rename src/internet/{ => core}/searchboxwidget.cpp (100%) rename src/internet/{ => core}/searchboxwidget.h (100%) rename src/internet/{ => core}/searchboxwidget.ui (100%) rename src/internet/{ => digitally}/digitallyimportedclient.cpp (100%) rename src/internet/{ => digitally}/digitallyimportedclient.h (100%) rename src/internet/{ => digitally}/digitallyimportedservicebase.cpp (100%) rename src/internet/{ => digitally}/digitallyimportedservicebase.h (100%) rename src/internet/{ => digitally}/digitallyimportedsettingspage.cpp (100%) rename src/internet/{ => digitally}/digitallyimportedsettingspage.h (100%) rename src/internet/{ => digitally}/digitallyimportedsettingspage.ui (100%) rename src/internet/{ => digitally}/digitallyimportedurlhandler.cpp (100%) rename src/internet/{ => digitally}/digitallyimportedurlhandler.h (100%) rename src/internet/{ => dropbox}/dropboxauthenticator.cpp (100%) rename src/internet/{ => dropbox}/dropboxauthenticator.h (100%) rename src/internet/{ => dropbox}/dropboxservice.cpp (100%) rename src/internet/{ => dropbox}/dropboxservice.h (100%) rename src/internet/{ => dropbox}/dropboxsettingspage.cpp (100%) rename src/internet/{ => dropbox}/dropboxsettingspage.h (100%) rename src/internet/{ => dropbox}/dropboxsettingspage.ui (100%) rename src/internet/{ => dropbox}/dropboxurlhandler.cpp (100%) rename src/internet/{ => dropbox}/dropboxurlhandler.h (100%) rename src/internet/{ => googledrive}/googledriveclient.cpp (100%) rename src/internet/{ => googledrive}/googledriveclient.h (100%) rename src/internet/{ => googledrive}/googledriveservice.cpp (100%) rename src/internet/{ => googledrive}/googledriveservice.h (100%) rename src/internet/{ => googledrive}/googledrivesettingspage.cpp (100%) rename src/internet/{ => googledrive}/googledrivesettingspage.h (100%) rename src/internet/{ => googledrive}/googledrivesettingspage.ui (100%) rename src/internet/{ => googledrive}/googledriveurlhandler.cpp (100%) rename src/internet/{ => googledrive}/googledriveurlhandler.h (100%) rename src/internet/{ => grooveshark}/groovesharkradio.cpp (100%) rename src/internet/{ => grooveshark}/groovesharkradio.h (100%) rename src/internet/{ => grooveshark}/groovesharkservice.cpp (100%) rename src/internet/{ => grooveshark}/groovesharkservice.h (100%) rename src/internet/{ => grooveshark}/groovesharksettingspage.cpp (100%) rename src/internet/{ => grooveshark}/groovesharksettingspage.h (100%) rename src/internet/{ => grooveshark}/groovesharksettingspage.ui (100%) rename src/internet/{ => grooveshark}/groovesharkurlhandler.cpp (100%) rename src/internet/{ => grooveshark}/groovesharkurlhandler.h (100%) rename src/internet/{ => icecast}/icecastbackend.cpp (100%) rename src/internet/{ => icecast}/icecastbackend.h (100%) rename src/internet/{ => icecast}/icecastfilterwidget.cpp (100%) rename src/internet/{ => icecast}/icecastfilterwidget.h (100%) rename src/internet/{ => icecast}/icecastfilterwidget.ui (100%) rename src/internet/{ => icecast}/icecastitem.h (100%) rename src/internet/{ => icecast}/icecastmodel.cpp (100%) rename src/internet/{ => icecast}/icecastmodel.h (100%) rename src/internet/{ => icecast}/icecastservice.cpp (100%) rename src/internet/{ => icecast}/icecastservice.h (100%) rename src/internet/{ => internetradio}/savedradio.cpp (100%) rename src/internet/{ => internetradio}/savedradio.h (100%) rename src/internet/{ => jamendo}/jamendodynamicplaylist.cpp (100%) rename src/internet/{ => jamendo}/jamendodynamicplaylist.h (100%) rename src/internet/{ => jamendo}/jamendoplaylistitem.cpp (100%) rename src/internet/{ => jamendo}/jamendoplaylistitem.h (100%) rename src/internet/{ => jamendo}/jamendoservice.cpp (100%) rename src/internet/{ => jamendo}/jamendoservice.h (100%) rename src/internet/{ => lastfm}/fixlastfm.cpp (100%) rename src/internet/{ => lastfm}/fixlastfm.h (100%) rename src/internet/{ => lastfm}/lastfmcompat.cpp (100%) rename src/internet/{ => lastfm}/lastfmcompat.h (100%) rename src/internet/{ => lastfm}/lastfmservice.cpp (100%) rename src/internet/{ => lastfm}/lastfmservice.h (100%) rename src/internet/{ => lastfm}/lastfmsettingspage.cpp (100%) rename src/internet/{ => lastfm}/lastfmsettingspage.h (100%) rename src/internet/{ => lastfm}/lastfmsettingspage.ui (100%) rename src/internet/{ => lastfm}/lastfmurlhandler.h (100%) rename src/internet/{ => magnatune}/magnatunedownloaddialog.cpp (100%) rename src/internet/{ => magnatune}/magnatunedownloaddialog.h (100%) rename src/internet/{ => magnatune}/magnatunedownloaddialog.ui (100%) rename src/internet/{ => magnatune}/magnatuneplaylistitem.cpp (100%) rename src/internet/{ => magnatune}/magnatuneplaylistitem.h (100%) rename src/internet/{ => magnatune}/magnatuneservice.cpp (100%) rename src/internet/{ => magnatune}/magnatuneservice.h (100%) rename src/internet/{ => magnatune}/magnatunesettingspage.cpp (100%) rename src/internet/{ => magnatune}/magnatunesettingspage.h (100%) rename src/internet/{ => magnatune}/magnatunesettingspage.ui (100%) rename src/internet/{ => magnatune}/magnatuneurlhandler.cpp (100%) rename src/internet/{ => magnatune}/magnatuneurlhandler.h (100%) rename src/{ => internet}/podcasts/addpodcastbyurl.cpp (100%) rename src/{ => internet}/podcasts/addpodcastbyurl.h (100%) rename src/{ => internet}/podcasts/addpodcastbyurl.ui (100%) rename src/{ => internet}/podcasts/addpodcastdialog.cpp (100%) rename src/{ => internet}/podcasts/addpodcastdialog.h (100%) rename src/{ => internet}/podcasts/addpodcastdialog.ui (100%) rename src/{ => internet}/podcasts/addpodcastpage.cpp (100%) rename src/{ => internet}/podcasts/addpodcastpage.h (100%) rename src/{ => internet}/podcasts/fixedopmlpage.cpp (100%) rename src/{ => internet}/podcasts/fixedopmlpage.h (100%) rename src/{ => internet}/podcasts/gpoddersearchpage.cpp (100%) rename src/{ => internet}/podcasts/gpoddersearchpage.h (100%) rename src/{ => internet}/podcasts/gpoddersearchpage.ui (100%) rename src/{ => internet}/podcasts/gpoddersync.cpp (100%) rename src/{ => internet}/podcasts/gpoddersync.h (100%) rename src/{ => internet}/podcasts/gpoddertoptagsmodel.cpp (100%) rename src/{ => internet}/podcasts/gpoddertoptagsmodel.h (100%) rename src/{ => internet}/podcasts/gpoddertoptagspage.cpp (100%) rename src/{ => internet}/podcasts/gpoddertoptagspage.h (100%) rename src/{ => internet}/podcasts/itunessearchpage.cpp (100%) rename src/{ => internet}/podcasts/itunessearchpage.h (100%) rename src/{ => internet}/podcasts/itunessearchpage.ui (100%) rename src/{ => internet}/podcasts/opmlcontainer.h (100%) rename src/{ => internet}/podcasts/podcast.cpp (100%) rename src/{ => internet}/podcasts/podcast.h (100%) rename src/{ => internet}/podcasts/podcastbackend.cpp (100%) rename src/{ => internet}/podcasts/podcastbackend.h (100%) rename src/{ => internet}/podcasts/podcastdeleter.cpp (100%) rename src/{ => internet}/podcasts/podcastdeleter.h (100%) rename src/{ => internet}/podcasts/podcastdiscoverymodel.cpp (100%) rename src/{ => internet}/podcasts/podcastdiscoverymodel.h (100%) rename src/{ => internet}/podcasts/podcastdownloader.cpp (100%) rename src/{ => internet}/podcasts/podcastdownloader.h (100%) rename src/{ => internet}/podcasts/podcastepisode.cpp (100%) rename src/{ => internet}/podcasts/podcastepisode.h (100%) rename src/{ => internet}/podcasts/podcastinfowidget.cpp (100%) rename src/{ => internet}/podcasts/podcastinfowidget.h (100%) rename src/{ => internet}/podcasts/podcastinfowidget.ui (100%) rename src/{ => internet}/podcasts/podcastparser.cpp (100%) rename src/{ => internet}/podcasts/podcastparser.h (100%) rename src/{ => internet}/podcasts/podcastservice.cpp (100%) rename src/{ => internet}/podcasts/podcastservice.h (100%) rename src/{ => internet}/podcasts/podcastservicemodel.cpp (100%) rename src/{ => internet}/podcasts/podcastservicemodel.h (100%) rename src/{ => internet}/podcasts/podcastsettingspage.cpp (100%) rename src/{ => internet}/podcasts/podcastsettingspage.h (100%) rename src/{ => internet}/podcasts/podcastsettingspage.ui (100%) rename src/{ => internet}/podcasts/podcastupdater.cpp (100%) rename src/{ => internet}/podcasts/podcastupdater.h (100%) rename src/{ => internet}/podcasts/podcasturlloader.cpp (100%) rename src/{ => internet}/podcasts/podcasturlloader.h (100%) rename src/internet/{ => seafile}/seafileservice.cpp (100%) rename src/internet/{ => seafile}/seafileservice.h (100%) rename src/internet/{ => seafile}/seafilesettingspage.cpp (100%) rename src/internet/{ => seafile}/seafilesettingspage.h (100%) rename src/internet/{ => seafile}/seafilesettingspage.ui (100%) rename src/internet/{ => seafile}/seafiletree.cpp (100%) rename src/internet/{ => seafile}/seafiletree.h (100%) rename src/internet/{ => seafile}/seafileurlhandler.cpp (100%) rename src/internet/{ => seafile}/seafileurlhandler.h (100%) rename src/internet/{ => skydrive}/skydriveservice.cpp (100%) rename src/internet/{ => skydrive}/skydriveservice.h (100%) rename src/internet/{ => skydrive}/skydrivesettingspage.cpp (100%) rename src/internet/{ => skydrive}/skydrivesettingspage.h (100%) rename src/internet/{ => skydrive}/skydrivesettingspage.ui (100%) rename src/internet/{ => skydrive}/skydriveurlhandler.cpp (100%) rename src/internet/{ => skydrive}/skydriveurlhandler.h (100%) rename src/internet/{ => somafm}/somafmservice.cpp (100%) rename src/internet/{ => somafm}/somafmservice.h (100%) rename src/internet/{ => somafm}/somafmurlhandler.cpp (100%) rename src/internet/{ => somafm}/somafmurlhandler.h (100%) rename src/internet/{ => soundcloud}/soundcloudservice.cpp (100%) rename src/internet/{ => soundcloud}/soundcloudservice.h (100%) rename src/internet/{ => soundcloud}/soundcloudsettingspage.cpp (100%) rename src/internet/{ => soundcloud}/soundcloudsettingspage.h (100%) rename src/internet/{ => soundcloud}/soundcloudsettingspage.ui (100%) rename src/internet/{ => spotify}/spotifyblobdownloader.cpp (100%) rename src/internet/{ => spotify}/spotifyblobdownloader.h (100%) rename src/internet/{ => spotify}/spotifyserver.cpp (100%) rename src/internet/{ => spotify}/spotifyserver.h (100%) rename src/internet/{ => spotify}/spotifyservice.cpp (100%) rename src/internet/{ => spotify}/spotifyservice.h (100%) rename src/internet/{ => spotify}/spotifysettingspage.cpp (100%) rename src/internet/{ => spotify}/spotifysettingspage.h (100%) rename src/internet/{ => spotify}/spotifysettingspage.ui (100%) rename src/internet/{ => subsonic}/subsonicservice.cpp (100%) rename src/internet/{ => subsonic}/subsonicservice.h (100%) rename src/internet/{ => subsonic}/subsonicsettingspage.cpp (100%) rename src/internet/{ => subsonic}/subsonicsettingspage.h (100%) rename src/internet/{ => subsonic}/subsonicsettingspage.ui (100%) rename src/internet/{ => subsonic}/subsonicurlhandler.cpp (100%) rename src/internet/{ => subsonic}/subsonicurlhandler.h (100%) rename src/internet/{ => vk}/vkconnection.cpp (100%) rename src/internet/{ => vk}/vkconnection.h (100%) rename src/internet/{ => vk}/vkmusiccache.cpp (100%) rename src/internet/{ => vk}/vkmusiccache.h (100%) rename src/internet/{ => vk}/vksearchdialog.cpp (100%) rename src/internet/{ => vk}/vksearchdialog.h (100%) rename src/internet/{ => vk}/vksearchdialog.ui (100%) rename src/internet/{ => vk}/vkservice.cpp (100%) rename src/internet/{ => vk}/vkservice.h (100%) rename src/internet/{ => vk}/vksettingspage.cpp (100%) rename src/internet/{ => vk}/vksettingspage.h (100%) rename src/internet/{ => vk}/vksettingspage.ui (100%) rename src/internet/{ => vk}/vkurlhandler.cpp (100%) rename src/internet/{ => vk}/vkurlhandler.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 195010201..334e5e23f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1131,15 +1131,15 @@ optional_source(HAVE_SKYDRIVE # Box support optional_source(HAVE_BOX SOURCES - internet/boxservice.cpp - internet/boxsettingspage.cpp - internet/boxurlhandler.cpp + internet/box/boxservice.cpp + internet/box/boxsettingspage.cpp + internet/box/boxurlhandler.cpp HEADERS - internet/boxservice.h - internet/boxsettingspage.h - internet/boxurlhandler.h + internet/box/boxservice.h + internet/box/boxsettingspage.h + internet/box/boxurlhandler.h UI - internet/boxsettingspage.ui + internet/box/boxsettingspage.ui ) # Vk.com support diff --git a/src/internet/boxservice.cpp b/src/internet/box/boxservice.cpp similarity index 100% rename from src/internet/boxservice.cpp rename to src/internet/box/boxservice.cpp diff --git a/src/internet/boxservice.h b/src/internet/box/boxservice.h similarity index 100% rename from src/internet/boxservice.h rename to src/internet/box/boxservice.h diff --git a/src/internet/boxsettingspage.cpp b/src/internet/box/boxsettingspage.cpp similarity index 98% rename from src/internet/boxsettingspage.cpp rename to src/internet/box/boxsettingspage.cpp index 2a12002b3..fb46c1c56 100644 --- a/src/internet/boxsettingspage.cpp +++ b/src/internet/box/boxsettingspage.cpp @@ -22,7 +22,7 @@ #include "ui_boxsettingspage.h" #include "core/application.h" -#include "internet/boxservice.h" +#include "internet/box/boxservice.h" #include "internet/internetmodel.h" #include "ui/settingsdialog.h" diff --git a/src/internet/boxsettingspage.h b/src/internet/box/boxsettingspage.h similarity index 100% rename from src/internet/boxsettingspage.h rename to src/internet/box/boxsettingspage.h diff --git a/src/internet/boxsettingspage.ui b/src/internet/box/boxsettingspage.ui similarity index 100% rename from src/internet/boxsettingspage.ui rename to src/internet/box/boxsettingspage.ui diff --git a/src/internet/boxurlhandler.cpp b/src/internet/box/boxurlhandler.cpp similarity index 100% rename from src/internet/boxurlhandler.cpp rename to src/internet/box/boxurlhandler.cpp diff --git a/src/internet/boxurlhandler.h b/src/internet/box/boxurlhandler.h similarity index 100% rename from src/internet/boxurlhandler.h rename to src/internet/box/boxurlhandler.h diff --git a/src/internet/cloudfilesearchprovider.cpp b/src/internet/cloudfile/cloudfilesearchprovider.cpp similarity index 100% rename from src/internet/cloudfilesearchprovider.cpp rename to src/internet/cloudfile/cloudfilesearchprovider.cpp diff --git a/src/internet/cloudfilesearchprovider.h b/src/internet/cloudfile/cloudfilesearchprovider.h similarity index 100% rename from src/internet/cloudfilesearchprovider.h rename to src/internet/cloudfile/cloudfilesearchprovider.h diff --git a/src/internet/cloudfileservice.cpp b/src/internet/cloudfile/cloudfileservice.cpp similarity index 100% rename from src/internet/cloudfileservice.cpp rename to src/internet/cloudfile/cloudfileservice.cpp diff --git a/src/internet/cloudfileservice.h b/src/internet/cloudfile/cloudfileservice.h similarity index 100% rename from src/internet/cloudfileservice.h rename to src/internet/cloudfile/cloudfileservice.h diff --git a/src/internet/geolocator.cpp b/src/internet/core/geolocator.cpp similarity index 100% rename from src/internet/geolocator.cpp rename to src/internet/core/geolocator.cpp diff --git a/src/internet/geolocator.h b/src/internet/core/geolocator.h similarity index 100% rename from src/internet/geolocator.h rename to src/internet/core/geolocator.h diff --git a/src/internet/internetmimedata.h b/src/internet/core/internetmimedata.h similarity index 100% rename from src/internet/internetmimedata.h rename to src/internet/core/internetmimedata.h diff --git a/src/internet/internetmodel.cpp b/src/internet/core/internetmodel.cpp similarity index 99% rename from src/internet/internetmodel.cpp rename to src/internet/core/internetmodel.cpp index 243d452af..2bf5f606e 100644 --- a/src/internet/internetmodel.cpp +++ b/src/internet/core/internetmodel.cpp @@ -56,7 +56,7 @@ #include "skydriveservice.h" #endif #ifdef HAVE_BOX -#include "boxservice.h" +#include "internet/box/boxservice.h" #endif #ifdef HAVE_VK #include "vkservice.h" diff --git a/src/internet/internetmodel.h b/src/internet/core/internetmodel.h similarity index 100% rename from src/internet/internetmodel.h rename to src/internet/core/internetmodel.h diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/core/internetplaylistitem.cpp similarity index 100% rename from src/internet/internetplaylistitem.cpp rename to src/internet/core/internetplaylistitem.cpp diff --git a/src/internet/internetplaylistitem.h b/src/internet/core/internetplaylistitem.h similarity index 100% rename from src/internet/internetplaylistitem.h rename to src/internet/core/internetplaylistitem.h diff --git a/src/internet/internetservice.cpp b/src/internet/core/internetservice.cpp similarity index 100% rename from src/internet/internetservice.cpp rename to src/internet/core/internetservice.cpp diff --git a/src/internet/internetservice.h b/src/internet/core/internetservice.h similarity index 100% rename from src/internet/internetservice.h rename to src/internet/core/internetservice.h diff --git a/src/internet/internetshowsettingspage.cpp b/src/internet/core/internetshowsettingspage.cpp similarity index 100% rename from src/internet/internetshowsettingspage.cpp rename to src/internet/core/internetshowsettingspage.cpp diff --git a/src/internet/internetshowsettingspage.h b/src/internet/core/internetshowsettingspage.h similarity index 100% rename from src/internet/internetshowsettingspage.h rename to src/internet/core/internetshowsettingspage.h diff --git a/src/internet/internetshowsettingspage.ui b/src/internet/core/internetshowsettingspage.ui similarity index 100% rename from src/internet/internetshowsettingspage.ui rename to src/internet/core/internetshowsettingspage.ui diff --git a/src/internet/internetsongmimedata.h b/src/internet/core/internetsongmimedata.h similarity index 100% rename from src/internet/internetsongmimedata.h rename to src/internet/core/internetsongmimedata.h diff --git a/src/internet/internetview.cpp b/src/internet/core/internetview.cpp similarity index 100% rename from src/internet/internetview.cpp rename to src/internet/core/internetview.cpp diff --git a/src/internet/internetview.h b/src/internet/core/internetview.h similarity index 100% rename from src/internet/internetview.h rename to src/internet/core/internetview.h diff --git a/src/internet/internetviewcontainer.cpp b/src/internet/core/internetviewcontainer.cpp similarity index 100% rename from src/internet/internetviewcontainer.cpp rename to src/internet/core/internetviewcontainer.cpp diff --git a/src/internet/internetviewcontainer.h b/src/internet/core/internetviewcontainer.h similarity index 100% rename from src/internet/internetviewcontainer.h rename to src/internet/core/internetviewcontainer.h diff --git a/src/internet/internetviewcontainer.ui b/src/internet/core/internetviewcontainer.ui similarity index 100% rename from src/internet/internetviewcontainer.ui rename to src/internet/core/internetviewcontainer.ui diff --git a/src/internet/localredirectserver.cpp b/src/internet/core/localredirectserver.cpp similarity index 100% rename from src/internet/localredirectserver.cpp rename to src/internet/core/localredirectserver.cpp diff --git a/src/internet/localredirectserver.h b/src/internet/core/localredirectserver.h similarity index 100% rename from src/internet/localredirectserver.h rename to src/internet/core/localredirectserver.h diff --git a/src/internet/oauthenticator.cpp b/src/internet/core/oauthenticator.cpp similarity index 100% rename from src/internet/oauthenticator.cpp rename to src/internet/core/oauthenticator.cpp diff --git a/src/internet/oauthenticator.h b/src/internet/core/oauthenticator.h similarity index 100% rename from src/internet/oauthenticator.h rename to src/internet/core/oauthenticator.h diff --git a/src/internet/scrobbler.h b/src/internet/core/scrobbler.h similarity index 100% rename from src/internet/scrobbler.h rename to src/internet/core/scrobbler.h diff --git a/src/internet/searchboxwidget.cpp b/src/internet/core/searchboxwidget.cpp similarity index 100% rename from src/internet/searchboxwidget.cpp rename to src/internet/core/searchboxwidget.cpp diff --git a/src/internet/searchboxwidget.h b/src/internet/core/searchboxwidget.h similarity index 100% rename from src/internet/searchboxwidget.h rename to src/internet/core/searchboxwidget.h diff --git a/src/internet/searchboxwidget.ui b/src/internet/core/searchboxwidget.ui similarity index 100% rename from src/internet/searchboxwidget.ui rename to src/internet/core/searchboxwidget.ui diff --git a/src/internet/digitallyimportedclient.cpp b/src/internet/digitally/digitallyimportedclient.cpp similarity index 100% rename from src/internet/digitallyimportedclient.cpp rename to src/internet/digitally/digitallyimportedclient.cpp diff --git a/src/internet/digitallyimportedclient.h b/src/internet/digitally/digitallyimportedclient.h similarity index 100% rename from src/internet/digitallyimportedclient.h rename to src/internet/digitally/digitallyimportedclient.h diff --git a/src/internet/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp similarity index 100% rename from src/internet/digitallyimportedservicebase.cpp rename to src/internet/digitally/digitallyimportedservicebase.cpp diff --git a/src/internet/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h similarity index 100% rename from src/internet/digitallyimportedservicebase.h rename to src/internet/digitally/digitallyimportedservicebase.h diff --git a/src/internet/digitallyimportedsettingspage.cpp b/src/internet/digitally/digitallyimportedsettingspage.cpp similarity index 100% rename from src/internet/digitallyimportedsettingspage.cpp rename to src/internet/digitally/digitallyimportedsettingspage.cpp diff --git a/src/internet/digitallyimportedsettingspage.h b/src/internet/digitally/digitallyimportedsettingspage.h similarity index 100% rename from src/internet/digitallyimportedsettingspage.h rename to src/internet/digitally/digitallyimportedsettingspage.h diff --git a/src/internet/digitallyimportedsettingspage.ui b/src/internet/digitally/digitallyimportedsettingspage.ui similarity index 100% rename from src/internet/digitallyimportedsettingspage.ui rename to src/internet/digitally/digitallyimportedsettingspage.ui diff --git a/src/internet/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp similarity index 100% rename from src/internet/digitallyimportedurlhandler.cpp rename to src/internet/digitally/digitallyimportedurlhandler.cpp diff --git a/src/internet/digitallyimportedurlhandler.h b/src/internet/digitally/digitallyimportedurlhandler.h similarity index 100% rename from src/internet/digitallyimportedurlhandler.h rename to src/internet/digitally/digitallyimportedurlhandler.h diff --git a/src/internet/dropboxauthenticator.cpp b/src/internet/dropbox/dropboxauthenticator.cpp similarity index 100% rename from src/internet/dropboxauthenticator.cpp rename to src/internet/dropbox/dropboxauthenticator.cpp diff --git a/src/internet/dropboxauthenticator.h b/src/internet/dropbox/dropboxauthenticator.h similarity index 100% rename from src/internet/dropboxauthenticator.h rename to src/internet/dropbox/dropboxauthenticator.h diff --git a/src/internet/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp similarity index 100% rename from src/internet/dropboxservice.cpp rename to src/internet/dropbox/dropboxservice.cpp diff --git a/src/internet/dropboxservice.h b/src/internet/dropbox/dropboxservice.h similarity index 100% rename from src/internet/dropboxservice.h rename to src/internet/dropbox/dropboxservice.h diff --git a/src/internet/dropboxsettingspage.cpp b/src/internet/dropbox/dropboxsettingspage.cpp similarity index 100% rename from src/internet/dropboxsettingspage.cpp rename to src/internet/dropbox/dropboxsettingspage.cpp diff --git a/src/internet/dropboxsettingspage.h b/src/internet/dropbox/dropboxsettingspage.h similarity index 100% rename from src/internet/dropboxsettingspage.h rename to src/internet/dropbox/dropboxsettingspage.h diff --git a/src/internet/dropboxsettingspage.ui b/src/internet/dropbox/dropboxsettingspage.ui similarity index 100% rename from src/internet/dropboxsettingspage.ui rename to src/internet/dropbox/dropboxsettingspage.ui diff --git a/src/internet/dropboxurlhandler.cpp b/src/internet/dropbox/dropboxurlhandler.cpp similarity index 100% rename from src/internet/dropboxurlhandler.cpp rename to src/internet/dropbox/dropboxurlhandler.cpp diff --git a/src/internet/dropboxurlhandler.h b/src/internet/dropbox/dropboxurlhandler.h similarity index 100% rename from src/internet/dropboxurlhandler.h rename to src/internet/dropbox/dropboxurlhandler.h diff --git a/src/internet/googledriveclient.cpp b/src/internet/googledrive/googledriveclient.cpp similarity index 100% rename from src/internet/googledriveclient.cpp rename to src/internet/googledrive/googledriveclient.cpp diff --git a/src/internet/googledriveclient.h b/src/internet/googledrive/googledriveclient.h similarity index 100% rename from src/internet/googledriveclient.h rename to src/internet/googledrive/googledriveclient.h diff --git a/src/internet/googledriveservice.cpp b/src/internet/googledrive/googledriveservice.cpp similarity index 100% rename from src/internet/googledriveservice.cpp rename to src/internet/googledrive/googledriveservice.cpp diff --git a/src/internet/googledriveservice.h b/src/internet/googledrive/googledriveservice.h similarity index 100% rename from src/internet/googledriveservice.h rename to src/internet/googledrive/googledriveservice.h diff --git a/src/internet/googledrivesettingspage.cpp b/src/internet/googledrive/googledrivesettingspage.cpp similarity index 100% rename from src/internet/googledrivesettingspage.cpp rename to src/internet/googledrive/googledrivesettingspage.cpp diff --git a/src/internet/googledrivesettingspage.h b/src/internet/googledrive/googledrivesettingspage.h similarity index 100% rename from src/internet/googledrivesettingspage.h rename to src/internet/googledrive/googledrivesettingspage.h diff --git a/src/internet/googledrivesettingspage.ui b/src/internet/googledrive/googledrivesettingspage.ui similarity index 100% rename from src/internet/googledrivesettingspage.ui rename to src/internet/googledrive/googledrivesettingspage.ui diff --git a/src/internet/googledriveurlhandler.cpp b/src/internet/googledrive/googledriveurlhandler.cpp similarity index 100% rename from src/internet/googledriveurlhandler.cpp rename to src/internet/googledrive/googledriveurlhandler.cpp diff --git a/src/internet/googledriveurlhandler.h b/src/internet/googledrive/googledriveurlhandler.h similarity index 100% rename from src/internet/googledriveurlhandler.h rename to src/internet/googledrive/googledriveurlhandler.h diff --git a/src/internet/groovesharkradio.cpp b/src/internet/grooveshark/groovesharkradio.cpp similarity index 100% rename from src/internet/groovesharkradio.cpp rename to src/internet/grooveshark/groovesharkradio.cpp diff --git a/src/internet/groovesharkradio.h b/src/internet/grooveshark/groovesharkradio.h similarity index 100% rename from src/internet/groovesharkradio.h rename to src/internet/grooveshark/groovesharkradio.h diff --git a/src/internet/groovesharkservice.cpp b/src/internet/grooveshark/groovesharkservice.cpp similarity index 100% rename from src/internet/groovesharkservice.cpp rename to src/internet/grooveshark/groovesharkservice.cpp diff --git a/src/internet/groovesharkservice.h b/src/internet/grooveshark/groovesharkservice.h similarity index 100% rename from src/internet/groovesharkservice.h rename to src/internet/grooveshark/groovesharkservice.h diff --git a/src/internet/groovesharksettingspage.cpp b/src/internet/grooveshark/groovesharksettingspage.cpp similarity index 100% rename from src/internet/groovesharksettingspage.cpp rename to src/internet/grooveshark/groovesharksettingspage.cpp diff --git a/src/internet/groovesharksettingspage.h b/src/internet/grooveshark/groovesharksettingspage.h similarity index 100% rename from src/internet/groovesharksettingspage.h rename to src/internet/grooveshark/groovesharksettingspage.h diff --git a/src/internet/groovesharksettingspage.ui b/src/internet/grooveshark/groovesharksettingspage.ui similarity index 100% rename from src/internet/groovesharksettingspage.ui rename to src/internet/grooveshark/groovesharksettingspage.ui diff --git a/src/internet/groovesharkurlhandler.cpp b/src/internet/grooveshark/groovesharkurlhandler.cpp similarity index 100% rename from src/internet/groovesharkurlhandler.cpp rename to src/internet/grooveshark/groovesharkurlhandler.cpp diff --git a/src/internet/groovesharkurlhandler.h b/src/internet/grooveshark/groovesharkurlhandler.h similarity index 100% rename from src/internet/groovesharkurlhandler.h rename to src/internet/grooveshark/groovesharkurlhandler.h diff --git a/src/internet/icecastbackend.cpp b/src/internet/icecast/icecastbackend.cpp similarity index 100% rename from src/internet/icecastbackend.cpp rename to src/internet/icecast/icecastbackend.cpp diff --git a/src/internet/icecastbackend.h b/src/internet/icecast/icecastbackend.h similarity index 100% rename from src/internet/icecastbackend.h rename to src/internet/icecast/icecastbackend.h diff --git a/src/internet/icecastfilterwidget.cpp b/src/internet/icecast/icecastfilterwidget.cpp similarity index 100% rename from src/internet/icecastfilterwidget.cpp rename to src/internet/icecast/icecastfilterwidget.cpp diff --git a/src/internet/icecastfilterwidget.h b/src/internet/icecast/icecastfilterwidget.h similarity index 100% rename from src/internet/icecastfilterwidget.h rename to src/internet/icecast/icecastfilterwidget.h diff --git a/src/internet/icecastfilterwidget.ui b/src/internet/icecast/icecastfilterwidget.ui similarity index 100% rename from src/internet/icecastfilterwidget.ui rename to src/internet/icecast/icecastfilterwidget.ui diff --git a/src/internet/icecastitem.h b/src/internet/icecast/icecastitem.h similarity index 100% rename from src/internet/icecastitem.h rename to src/internet/icecast/icecastitem.h diff --git a/src/internet/icecastmodel.cpp b/src/internet/icecast/icecastmodel.cpp similarity index 100% rename from src/internet/icecastmodel.cpp rename to src/internet/icecast/icecastmodel.cpp diff --git a/src/internet/icecastmodel.h b/src/internet/icecast/icecastmodel.h similarity index 100% rename from src/internet/icecastmodel.h rename to src/internet/icecast/icecastmodel.h diff --git a/src/internet/icecastservice.cpp b/src/internet/icecast/icecastservice.cpp similarity index 100% rename from src/internet/icecastservice.cpp rename to src/internet/icecast/icecastservice.cpp diff --git a/src/internet/icecastservice.h b/src/internet/icecast/icecastservice.h similarity index 100% rename from src/internet/icecastservice.h rename to src/internet/icecast/icecastservice.h diff --git a/src/internet/savedradio.cpp b/src/internet/internetradio/savedradio.cpp similarity index 100% rename from src/internet/savedradio.cpp rename to src/internet/internetradio/savedradio.cpp diff --git a/src/internet/savedradio.h b/src/internet/internetradio/savedradio.h similarity index 100% rename from src/internet/savedradio.h rename to src/internet/internetradio/savedradio.h diff --git a/src/internet/jamendodynamicplaylist.cpp b/src/internet/jamendo/jamendodynamicplaylist.cpp similarity index 100% rename from src/internet/jamendodynamicplaylist.cpp rename to src/internet/jamendo/jamendodynamicplaylist.cpp diff --git a/src/internet/jamendodynamicplaylist.h b/src/internet/jamendo/jamendodynamicplaylist.h similarity index 100% rename from src/internet/jamendodynamicplaylist.h rename to src/internet/jamendo/jamendodynamicplaylist.h diff --git a/src/internet/jamendoplaylistitem.cpp b/src/internet/jamendo/jamendoplaylistitem.cpp similarity index 100% rename from src/internet/jamendoplaylistitem.cpp rename to src/internet/jamendo/jamendoplaylistitem.cpp diff --git a/src/internet/jamendoplaylistitem.h b/src/internet/jamendo/jamendoplaylistitem.h similarity index 100% rename from src/internet/jamendoplaylistitem.h rename to src/internet/jamendo/jamendoplaylistitem.h diff --git a/src/internet/jamendoservice.cpp b/src/internet/jamendo/jamendoservice.cpp similarity index 100% rename from src/internet/jamendoservice.cpp rename to src/internet/jamendo/jamendoservice.cpp diff --git a/src/internet/jamendoservice.h b/src/internet/jamendo/jamendoservice.h similarity index 100% rename from src/internet/jamendoservice.h rename to src/internet/jamendo/jamendoservice.h diff --git a/src/internet/fixlastfm.cpp b/src/internet/lastfm/fixlastfm.cpp similarity index 100% rename from src/internet/fixlastfm.cpp rename to src/internet/lastfm/fixlastfm.cpp diff --git a/src/internet/fixlastfm.h b/src/internet/lastfm/fixlastfm.h similarity index 100% rename from src/internet/fixlastfm.h rename to src/internet/lastfm/fixlastfm.h diff --git a/src/internet/lastfmcompat.cpp b/src/internet/lastfm/lastfmcompat.cpp similarity index 100% rename from src/internet/lastfmcompat.cpp rename to src/internet/lastfm/lastfmcompat.cpp diff --git a/src/internet/lastfmcompat.h b/src/internet/lastfm/lastfmcompat.h similarity index 100% rename from src/internet/lastfmcompat.h rename to src/internet/lastfm/lastfmcompat.h diff --git a/src/internet/lastfmservice.cpp b/src/internet/lastfm/lastfmservice.cpp similarity index 100% rename from src/internet/lastfmservice.cpp rename to src/internet/lastfm/lastfmservice.cpp diff --git a/src/internet/lastfmservice.h b/src/internet/lastfm/lastfmservice.h similarity index 100% rename from src/internet/lastfmservice.h rename to src/internet/lastfm/lastfmservice.h diff --git a/src/internet/lastfmsettingspage.cpp b/src/internet/lastfm/lastfmsettingspage.cpp similarity index 100% rename from src/internet/lastfmsettingspage.cpp rename to src/internet/lastfm/lastfmsettingspage.cpp diff --git a/src/internet/lastfmsettingspage.h b/src/internet/lastfm/lastfmsettingspage.h similarity index 100% rename from src/internet/lastfmsettingspage.h rename to src/internet/lastfm/lastfmsettingspage.h diff --git a/src/internet/lastfmsettingspage.ui b/src/internet/lastfm/lastfmsettingspage.ui similarity index 100% rename from src/internet/lastfmsettingspage.ui rename to src/internet/lastfm/lastfmsettingspage.ui diff --git a/src/internet/lastfmurlhandler.h b/src/internet/lastfm/lastfmurlhandler.h similarity index 100% rename from src/internet/lastfmurlhandler.h rename to src/internet/lastfm/lastfmurlhandler.h diff --git a/src/internet/magnatunedownloaddialog.cpp b/src/internet/magnatune/magnatunedownloaddialog.cpp similarity index 100% rename from src/internet/magnatunedownloaddialog.cpp rename to src/internet/magnatune/magnatunedownloaddialog.cpp diff --git a/src/internet/magnatunedownloaddialog.h b/src/internet/magnatune/magnatunedownloaddialog.h similarity index 100% rename from src/internet/magnatunedownloaddialog.h rename to src/internet/magnatune/magnatunedownloaddialog.h diff --git a/src/internet/magnatunedownloaddialog.ui b/src/internet/magnatune/magnatunedownloaddialog.ui similarity index 100% rename from src/internet/magnatunedownloaddialog.ui rename to src/internet/magnatune/magnatunedownloaddialog.ui diff --git a/src/internet/magnatuneplaylistitem.cpp b/src/internet/magnatune/magnatuneplaylistitem.cpp similarity index 100% rename from src/internet/magnatuneplaylistitem.cpp rename to src/internet/magnatune/magnatuneplaylistitem.cpp diff --git a/src/internet/magnatuneplaylistitem.h b/src/internet/magnatune/magnatuneplaylistitem.h similarity index 100% rename from src/internet/magnatuneplaylistitem.h rename to src/internet/magnatune/magnatuneplaylistitem.h diff --git a/src/internet/magnatuneservice.cpp b/src/internet/magnatune/magnatuneservice.cpp similarity index 100% rename from src/internet/magnatuneservice.cpp rename to src/internet/magnatune/magnatuneservice.cpp diff --git a/src/internet/magnatuneservice.h b/src/internet/magnatune/magnatuneservice.h similarity index 100% rename from src/internet/magnatuneservice.h rename to src/internet/magnatune/magnatuneservice.h diff --git a/src/internet/magnatunesettingspage.cpp b/src/internet/magnatune/magnatunesettingspage.cpp similarity index 100% rename from src/internet/magnatunesettingspage.cpp rename to src/internet/magnatune/magnatunesettingspage.cpp diff --git a/src/internet/magnatunesettingspage.h b/src/internet/magnatune/magnatunesettingspage.h similarity index 100% rename from src/internet/magnatunesettingspage.h rename to src/internet/magnatune/magnatunesettingspage.h diff --git a/src/internet/magnatunesettingspage.ui b/src/internet/magnatune/magnatunesettingspage.ui similarity index 100% rename from src/internet/magnatunesettingspage.ui rename to src/internet/magnatune/magnatunesettingspage.ui diff --git a/src/internet/magnatuneurlhandler.cpp b/src/internet/magnatune/magnatuneurlhandler.cpp similarity index 100% rename from src/internet/magnatuneurlhandler.cpp rename to src/internet/magnatune/magnatuneurlhandler.cpp diff --git a/src/internet/magnatuneurlhandler.h b/src/internet/magnatune/magnatuneurlhandler.h similarity index 100% rename from src/internet/magnatuneurlhandler.h rename to src/internet/magnatune/magnatuneurlhandler.h diff --git a/src/podcasts/addpodcastbyurl.cpp b/src/internet/podcasts/addpodcastbyurl.cpp similarity index 100% rename from src/podcasts/addpodcastbyurl.cpp rename to src/internet/podcasts/addpodcastbyurl.cpp diff --git a/src/podcasts/addpodcastbyurl.h b/src/internet/podcasts/addpodcastbyurl.h similarity index 100% rename from src/podcasts/addpodcastbyurl.h rename to src/internet/podcasts/addpodcastbyurl.h diff --git a/src/podcasts/addpodcastbyurl.ui b/src/internet/podcasts/addpodcastbyurl.ui similarity index 100% rename from src/podcasts/addpodcastbyurl.ui rename to src/internet/podcasts/addpodcastbyurl.ui diff --git a/src/podcasts/addpodcastdialog.cpp b/src/internet/podcasts/addpodcastdialog.cpp similarity index 100% rename from src/podcasts/addpodcastdialog.cpp rename to src/internet/podcasts/addpodcastdialog.cpp diff --git a/src/podcasts/addpodcastdialog.h b/src/internet/podcasts/addpodcastdialog.h similarity index 100% rename from src/podcasts/addpodcastdialog.h rename to src/internet/podcasts/addpodcastdialog.h diff --git a/src/podcasts/addpodcastdialog.ui b/src/internet/podcasts/addpodcastdialog.ui similarity index 100% rename from src/podcasts/addpodcastdialog.ui rename to src/internet/podcasts/addpodcastdialog.ui diff --git a/src/podcasts/addpodcastpage.cpp b/src/internet/podcasts/addpodcastpage.cpp similarity index 100% rename from src/podcasts/addpodcastpage.cpp rename to src/internet/podcasts/addpodcastpage.cpp diff --git a/src/podcasts/addpodcastpage.h b/src/internet/podcasts/addpodcastpage.h similarity index 100% rename from src/podcasts/addpodcastpage.h rename to src/internet/podcasts/addpodcastpage.h diff --git a/src/podcasts/fixedopmlpage.cpp b/src/internet/podcasts/fixedopmlpage.cpp similarity index 100% rename from src/podcasts/fixedopmlpage.cpp rename to src/internet/podcasts/fixedopmlpage.cpp diff --git a/src/podcasts/fixedopmlpage.h b/src/internet/podcasts/fixedopmlpage.h similarity index 100% rename from src/podcasts/fixedopmlpage.h rename to src/internet/podcasts/fixedopmlpage.h diff --git a/src/podcasts/gpoddersearchpage.cpp b/src/internet/podcasts/gpoddersearchpage.cpp similarity index 100% rename from src/podcasts/gpoddersearchpage.cpp rename to src/internet/podcasts/gpoddersearchpage.cpp diff --git a/src/podcasts/gpoddersearchpage.h b/src/internet/podcasts/gpoddersearchpage.h similarity index 100% rename from src/podcasts/gpoddersearchpage.h rename to src/internet/podcasts/gpoddersearchpage.h diff --git a/src/podcasts/gpoddersearchpage.ui b/src/internet/podcasts/gpoddersearchpage.ui similarity index 100% rename from src/podcasts/gpoddersearchpage.ui rename to src/internet/podcasts/gpoddersearchpage.ui diff --git a/src/podcasts/gpoddersync.cpp b/src/internet/podcasts/gpoddersync.cpp similarity index 100% rename from src/podcasts/gpoddersync.cpp rename to src/internet/podcasts/gpoddersync.cpp diff --git a/src/podcasts/gpoddersync.h b/src/internet/podcasts/gpoddersync.h similarity index 100% rename from src/podcasts/gpoddersync.h rename to src/internet/podcasts/gpoddersync.h diff --git a/src/podcasts/gpoddertoptagsmodel.cpp b/src/internet/podcasts/gpoddertoptagsmodel.cpp similarity index 100% rename from src/podcasts/gpoddertoptagsmodel.cpp rename to src/internet/podcasts/gpoddertoptagsmodel.cpp diff --git a/src/podcasts/gpoddertoptagsmodel.h b/src/internet/podcasts/gpoddertoptagsmodel.h similarity index 100% rename from src/podcasts/gpoddertoptagsmodel.h rename to src/internet/podcasts/gpoddertoptagsmodel.h diff --git a/src/podcasts/gpoddertoptagspage.cpp b/src/internet/podcasts/gpoddertoptagspage.cpp similarity index 100% rename from src/podcasts/gpoddertoptagspage.cpp rename to src/internet/podcasts/gpoddertoptagspage.cpp diff --git a/src/podcasts/gpoddertoptagspage.h b/src/internet/podcasts/gpoddertoptagspage.h similarity index 100% rename from src/podcasts/gpoddertoptagspage.h rename to src/internet/podcasts/gpoddertoptagspage.h diff --git a/src/podcasts/itunessearchpage.cpp b/src/internet/podcasts/itunessearchpage.cpp similarity index 100% rename from src/podcasts/itunessearchpage.cpp rename to src/internet/podcasts/itunessearchpage.cpp diff --git a/src/podcasts/itunessearchpage.h b/src/internet/podcasts/itunessearchpage.h similarity index 100% rename from src/podcasts/itunessearchpage.h rename to src/internet/podcasts/itunessearchpage.h diff --git a/src/podcasts/itunessearchpage.ui b/src/internet/podcasts/itunessearchpage.ui similarity index 100% rename from src/podcasts/itunessearchpage.ui rename to src/internet/podcasts/itunessearchpage.ui diff --git a/src/podcasts/opmlcontainer.h b/src/internet/podcasts/opmlcontainer.h similarity index 100% rename from src/podcasts/opmlcontainer.h rename to src/internet/podcasts/opmlcontainer.h diff --git a/src/podcasts/podcast.cpp b/src/internet/podcasts/podcast.cpp similarity index 100% rename from src/podcasts/podcast.cpp rename to src/internet/podcasts/podcast.cpp diff --git a/src/podcasts/podcast.h b/src/internet/podcasts/podcast.h similarity index 100% rename from src/podcasts/podcast.h rename to src/internet/podcasts/podcast.h diff --git a/src/podcasts/podcastbackend.cpp b/src/internet/podcasts/podcastbackend.cpp similarity index 100% rename from src/podcasts/podcastbackend.cpp rename to src/internet/podcasts/podcastbackend.cpp diff --git a/src/podcasts/podcastbackend.h b/src/internet/podcasts/podcastbackend.h similarity index 100% rename from src/podcasts/podcastbackend.h rename to src/internet/podcasts/podcastbackend.h diff --git a/src/podcasts/podcastdeleter.cpp b/src/internet/podcasts/podcastdeleter.cpp similarity index 100% rename from src/podcasts/podcastdeleter.cpp rename to src/internet/podcasts/podcastdeleter.cpp diff --git a/src/podcasts/podcastdeleter.h b/src/internet/podcasts/podcastdeleter.h similarity index 100% rename from src/podcasts/podcastdeleter.h rename to src/internet/podcasts/podcastdeleter.h diff --git a/src/podcasts/podcastdiscoverymodel.cpp b/src/internet/podcasts/podcastdiscoverymodel.cpp similarity index 100% rename from src/podcasts/podcastdiscoverymodel.cpp rename to src/internet/podcasts/podcastdiscoverymodel.cpp diff --git a/src/podcasts/podcastdiscoverymodel.h b/src/internet/podcasts/podcastdiscoverymodel.h similarity index 100% rename from src/podcasts/podcastdiscoverymodel.h rename to src/internet/podcasts/podcastdiscoverymodel.h diff --git a/src/podcasts/podcastdownloader.cpp b/src/internet/podcasts/podcastdownloader.cpp similarity index 100% rename from src/podcasts/podcastdownloader.cpp rename to src/internet/podcasts/podcastdownloader.cpp diff --git a/src/podcasts/podcastdownloader.h b/src/internet/podcasts/podcastdownloader.h similarity index 100% rename from src/podcasts/podcastdownloader.h rename to src/internet/podcasts/podcastdownloader.h diff --git a/src/podcasts/podcastepisode.cpp b/src/internet/podcasts/podcastepisode.cpp similarity index 100% rename from src/podcasts/podcastepisode.cpp rename to src/internet/podcasts/podcastepisode.cpp diff --git a/src/podcasts/podcastepisode.h b/src/internet/podcasts/podcastepisode.h similarity index 100% rename from src/podcasts/podcastepisode.h rename to src/internet/podcasts/podcastepisode.h diff --git a/src/podcasts/podcastinfowidget.cpp b/src/internet/podcasts/podcastinfowidget.cpp similarity index 100% rename from src/podcasts/podcastinfowidget.cpp rename to src/internet/podcasts/podcastinfowidget.cpp diff --git a/src/podcasts/podcastinfowidget.h b/src/internet/podcasts/podcastinfowidget.h similarity index 100% rename from src/podcasts/podcastinfowidget.h rename to src/internet/podcasts/podcastinfowidget.h diff --git a/src/podcasts/podcastinfowidget.ui b/src/internet/podcasts/podcastinfowidget.ui similarity index 100% rename from src/podcasts/podcastinfowidget.ui rename to src/internet/podcasts/podcastinfowidget.ui diff --git a/src/podcasts/podcastparser.cpp b/src/internet/podcasts/podcastparser.cpp similarity index 100% rename from src/podcasts/podcastparser.cpp rename to src/internet/podcasts/podcastparser.cpp diff --git a/src/podcasts/podcastparser.h b/src/internet/podcasts/podcastparser.h similarity index 100% rename from src/podcasts/podcastparser.h rename to src/internet/podcasts/podcastparser.h diff --git a/src/podcasts/podcastservice.cpp b/src/internet/podcasts/podcastservice.cpp similarity index 100% rename from src/podcasts/podcastservice.cpp rename to src/internet/podcasts/podcastservice.cpp diff --git a/src/podcasts/podcastservice.h b/src/internet/podcasts/podcastservice.h similarity index 100% rename from src/podcasts/podcastservice.h rename to src/internet/podcasts/podcastservice.h diff --git a/src/podcasts/podcastservicemodel.cpp b/src/internet/podcasts/podcastservicemodel.cpp similarity index 100% rename from src/podcasts/podcastservicemodel.cpp rename to src/internet/podcasts/podcastservicemodel.cpp diff --git a/src/podcasts/podcastservicemodel.h b/src/internet/podcasts/podcastservicemodel.h similarity index 100% rename from src/podcasts/podcastservicemodel.h rename to src/internet/podcasts/podcastservicemodel.h diff --git a/src/podcasts/podcastsettingspage.cpp b/src/internet/podcasts/podcastsettingspage.cpp similarity index 100% rename from src/podcasts/podcastsettingspage.cpp rename to src/internet/podcasts/podcastsettingspage.cpp diff --git a/src/podcasts/podcastsettingspage.h b/src/internet/podcasts/podcastsettingspage.h similarity index 100% rename from src/podcasts/podcastsettingspage.h rename to src/internet/podcasts/podcastsettingspage.h diff --git a/src/podcasts/podcastsettingspage.ui b/src/internet/podcasts/podcastsettingspage.ui similarity index 100% rename from src/podcasts/podcastsettingspage.ui rename to src/internet/podcasts/podcastsettingspage.ui diff --git a/src/podcasts/podcastupdater.cpp b/src/internet/podcasts/podcastupdater.cpp similarity index 100% rename from src/podcasts/podcastupdater.cpp rename to src/internet/podcasts/podcastupdater.cpp diff --git a/src/podcasts/podcastupdater.h b/src/internet/podcasts/podcastupdater.h similarity index 100% rename from src/podcasts/podcastupdater.h rename to src/internet/podcasts/podcastupdater.h diff --git a/src/podcasts/podcasturlloader.cpp b/src/internet/podcasts/podcasturlloader.cpp similarity index 100% rename from src/podcasts/podcasturlloader.cpp rename to src/internet/podcasts/podcasturlloader.cpp diff --git a/src/podcasts/podcasturlloader.h b/src/internet/podcasts/podcasturlloader.h similarity index 100% rename from src/podcasts/podcasturlloader.h rename to src/internet/podcasts/podcasturlloader.h diff --git a/src/internet/seafileservice.cpp b/src/internet/seafile/seafileservice.cpp similarity index 100% rename from src/internet/seafileservice.cpp rename to src/internet/seafile/seafileservice.cpp diff --git a/src/internet/seafileservice.h b/src/internet/seafile/seafileservice.h similarity index 100% rename from src/internet/seafileservice.h rename to src/internet/seafile/seafileservice.h diff --git a/src/internet/seafilesettingspage.cpp b/src/internet/seafile/seafilesettingspage.cpp similarity index 100% rename from src/internet/seafilesettingspage.cpp rename to src/internet/seafile/seafilesettingspage.cpp diff --git a/src/internet/seafilesettingspage.h b/src/internet/seafile/seafilesettingspage.h similarity index 100% rename from src/internet/seafilesettingspage.h rename to src/internet/seafile/seafilesettingspage.h diff --git a/src/internet/seafilesettingspage.ui b/src/internet/seafile/seafilesettingspage.ui similarity index 100% rename from src/internet/seafilesettingspage.ui rename to src/internet/seafile/seafilesettingspage.ui diff --git a/src/internet/seafiletree.cpp b/src/internet/seafile/seafiletree.cpp similarity index 100% rename from src/internet/seafiletree.cpp rename to src/internet/seafile/seafiletree.cpp diff --git a/src/internet/seafiletree.h b/src/internet/seafile/seafiletree.h similarity index 100% rename from src/internet/seafiletree.h rename to src/internet/seafile/seafiletree.h diff --git a/src/internet/seafileurlhandler.cpp b/src/internet/seafile/seafileurlhandler.cpp similarity index 100% rename from src/internet/seafileurlhandler.cpp rename to src/internet/seafile/seafileurlhandler.cpp diff --git a/src/internet/seafileurlhandler.h b/src/internet/seafile/seafileurlhandler.h similarity index 100% rename from src/internet/seafileurlhandler.h rename to src/internet/seafile/seafileurlhandler.h diff --git a/src/internet/skydriveservice.cpp b/src/internet/skydrive/skydriveservice.cpp similarity index 100% rename from src/internet/skydriveservice.cpp rename to src/internet/skydrive/skydriveservice.cpp diff --git a/src/internet/skydriveservice.h b/src/internet/skydrive/skydriveservice.h similarity index 100% rename from src/internet/skydriveservice.h rename to src/internet/skydrive/skydriveservice.h diff --git a/src/internet/skydrivesettingspage.cpp b/src/internet/skydrive/skydrivesettingspage.cpp similarity index 100% rename from src/internet/skydrivesettingspage.cpp rename to src/internet/skydrive/skydrivesettingspage.cpp diff --git a/src/internet/skydrivesettingspage.h b/src/internet/skydrive/skydrivesettingspage.h similarity index 100% rename from src/internet/skydrivesettingspage.h rename to src/internet/skydrive/skydrivesettingspage.h diff --git a/src/internet/skydrivesettingspage.ui b/src/internet/skydrive/skydrivesettingspage.ui similarity index 100% rename from src/internet/skydrivesettingspage.ui rename to src/internet/skydrive/skydrivesettingspage.ui diff --git a/src/internet/skydriveurlhandler.cpp b/src/internet/skydrive/skydriveurlhandler.cpp similarity index 100% rename from src/internet/skydriveurlhandler.cpp rename to src/internet/skydrive/skydriveurlhandler.cpp diff --git a/src/internet/skydriveurlhandler.h b/src/internet/skydrive/skydriveurlhandler.h similarity index 100% rename from src/internet/skydriveurlhandler.h rename to src/internet/skydrive/skydriveurlhandler.h diff --git a/src/internet/somafmservice.cpp b/src/internet/somafm/somafmservice.cpp similarity index 100% rename from src/internet/somafmservice.cpp rename to src/internet/somafm/somafmservice.cpp diff --git a/src/internet/somafmservice.h b/src/internet/somafm/somafmservice.h similarity index 100% rename from src/internet/somafmservice.h rename to src/internet/somafm/somafmservice.h diff --git a/src/internet/somafmurlhandler.cpp b/src/internet/somafm/somafmurlhandler.cpp similarity index 100% rename from src/internet/somafmurlhandler.cpp rename to src/internet/somafm/somafmurlhandler.cpp diff --git a/src/internet/somafmurlhandler.h b/src/internet/somafm/somafmurlhandler.h similarity index 100% rename from src/internet/somafmurlhandler.h rename to src/internet/somafm/somafmurlhandler.h diff --git a/src/internet/soundcloudservice.cpp b/src/internet/soundcloud/soundcloudservice.cpp similarity index 100% rename from src/internet/soundcloudservice.cpp rename to src/internet/soundcloud/soundcloudservice.cpp diff --git a/src/internet/soundcloudservice.h b/src/internet/soundcloud/soundcloudservice.h similarity index 100% rename from src/internet/soundcloudservice.h rename to src/internet/soundcloud/soundcloudservice.h diff --git a/src/internet/soundcloudsettingspage.cpp b/src/internet/soundcloud/soundcloudsettingspage.cpp similarity index 100% rename from src/internet/soundcloudsettingspage.cpp rename to src/internet/soundcloud/soundcloudsettingspage.cpp diff --git a/src/internet/soundcloudsettingspage.h b/src/internet/soundcloud/soundcloudsettingspage.h similarity index 100% rename from src/internet/soundcloudsettingspage.h rename to src/internet/soundcloud/soundcloudsettingspage.h diff --git a/src/internet/soundcloudsettingspage.ui b/src/internet/soundcloud/soundcloudsettingspage.ui similarity index 100% rename from src/internet/soundcloudsettingspage.ui rename to src/internet/soundcloud/soundcloudsettingspage.ui diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotify/spotifyblobdownloader.cpp similarity index 100% rename from src/internet/spotifyblobdownloader.cpp rename to src/internet/spotify/spotifyblobdownloader.cpp diff --git a/src/internet/spotifyblobdownloader.h b/src/internet/spotify/spotifyblobdownloader.h similarity index 100% rename from src/internet/spotifyblobdownloader.h rename to src/internet/spotify/spotifyblobdownloader.h diff --git a/src/internet/spotifyserver.cpp b/src/internet/spotify/spotifyserver.cpp similarity index 100% rename from src/internet/spotifyserver.cpp rename to src/internet/spotify/spotifyserver.cpp diff --git a/src/internet/spotifyserver.h b/src/internet/spotify/spotifyserver.h similarity index 100% rename from src/internet/spotifyserver.h rename to src/internet/spotify/spotifyserver.h diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp similarity index 100% rename from src/internet/spotifyservice.cpp rename to src/internet/spotify/spotifyservice.cpp diff --git a/src/internet/spotifyservice.h b/src/internet/spotify/spotifyservice.h similarity index 100% rename from src/internet/spotifyservice.h rename to src/internet/spotify/spotifyservice.h diff --git a/src/internet/spotifysettingspage.cpp b/src/internet/spotify/spotifysettingspage.cpp similarity index 100% rename from src/internet/spotifysettingspage.cpp rename to src/internet/spotify/spotifysettingspage.cpp diff --git a/src/internet/spotifysettingspage.h b/src/internet/spotify/spotifysettingspage.h similarity index 100% rename from src/internet/spotifysettingspage.h rename to src/internet/spotify/spotifysettingspage.h diff --git a/src/internet/spotifysettingspage.ui b/src/internet/spotify/spotifysettingspage.ui similarity index 100% rename from src/internet/spotifysettingspage.ui rename to src/internet/spotify/spotifysettingspage.ui diff --git a/src/internet/subsonicservice.cpp b/src/internet/subsonic/subsonicservice.cpp similarity index 100% rename from src/internet/subsonicservice.cpp rename to src/internet/subsonic/subsonicservice.cpp diff --git a/src/internet/subsonicservice.h b/src/internet/subsonic/subsonicservice.h similarity index 100% rename from src/internet/subsonicservice.h rename to src/internet/subsonic/subsonicservice.h diff --git a/src/internet/subsonicsettingspage.cpp b/src/internet/subsonic/subsonicsettingspage.cpp similarity index 100% rename from src/internet/subsonicsettingspage.cpp rename to src/internet/subsonic/subsonicsettingspage.cpp diff --git a/src/internet/subsonicsettingspage.h b/src/internet/subsonic/subsonicsettingspage.h similarity index 100% rename from src/internet/subsonicsettingspage.h rename to src/internet/subsonic/subsonicsettingspage.h diff --git a/src/internet/subsonicsettingspage.ui b/src/internet/subsonic/subsonicsettingspage.ui similarity index 100% rename from src/internet/subsonicsettingspage.ui rename to src/internet/subsonic/subsonicsettingspage.ui diff --git a/src/internet/subsonicurlhandler.cpp b/src/internet/subsonic/subsonicurlhandler.cpp similarity index 100% rename from src/internet/subsonicurlhandler.cpp rename to src/internet/subsonic/subsonicurlhandler.cpp diff --git a/src/internet/subsonicurlhandler.h b/src/internet/subsonic/subsonicurlhandler.h similarity index 100% rename from src/internet/subsonicurlhandler.h rename to src/internet/subsonic/subsonicurlhandler.h diff --git a/src/internet/vkconnection.cpp b/src/internet/vk/vkconnection.cpp similarity index 100% rename from src/internet/vkconnection.cpp rename to src/internet/vk/vkconnection.cpp diff --git a/src/internet/vkconnection.h b/src/internet/vk/vkconnection.h similarity index 100% rename from src/internet/vkconnection.h rename to src/internet/vk/vkconnection.h diff --git a/src/internet/vkmusiccache.cpp b/src/internet/vk/vkmusiccache.cpp similarity index 100% rename from src/internet/vkmusiccache.cpp rename to src/internet/vk/vkmusiccache.cpp diff --git a/src/internet/vkmusiccache.h b/src/internet/vk/vkmusiccache.h similarity index 100% rename from src/internet/vkmusiccache.h rename to src/internet/vk/vkmusiccache.h diff --git a/src/internet/vksearchdialog.cpp b/src/internet/vk/vksearchdialog.cpp similarity index 100% rename from src/internet/vksearchdialog.cpp rename to src/internet/vk/vksearchdialog.cpp diff --git a/src/internet/vksearchdialog.h b/src/internet/vk/vksearchdialog.h similarity index 100% rename from src/internet/vksearchdialog.h rename to src/internet/vk/vksearchdialog.h diff --git a/src/internet/vksearchdialog.ui b/src/internet/vk/vksearchdialog.ui similarity index 100% rename from src/internet/vksearchdialog.ui rename to src/internet/vk/vksearchdialog.ui diff --git a/src/internet/vkservice.cpp b/src/internet/vk/vkservice.cpp similarity index 100% rename from src/internet/vkservice.cpp rename to src/internet/vk/vkservice.cpp diff --git a/src/internet/vkservice.h b/src/internet/vk/vkservice.h similarity index 100% rename from src/internet/vkservice.h rename to src/internet/vk/vkservice.h diff --git a/src/internet/vksettingspage.cpp b/src/internet/vk/vksettingspage.cpp similarity index 100% rename from src/internet/vksettingspage.cpp rename to src/internet/vk/vksettingspage.cpp diff --git a/src/internet/vksettingspage.h b/src/internet/vk/vksettingspage.h similarity index 100% rename from src/internet/vksettingspage.h rename to src/internet/vk/vksettingspage.h diff --git a/src/internet/vksettingspage.ui b/src/internet/vk/vksettingspage.ui similarity index 100% rename from src/internet/vksettingspage.ui rename to src/internet/vk/vksettingspage.ui diff --git a/src/internet/vkurlhandler.cpp b/src/internet/vk/vkurlhandler.cpp similarity index 100% rename from src/internet/vkurlhandler.cpp rename to src/internet/vk/vkurlhandler.cpp diff --git a/src/internet/vkurlhandler.h b/src/internet/vk/vkurlhandler.h similarity index 100% rename from src/internet/vkurlhandler.h rename to src/internet/vk/vkurlhandler.h From fa9ea6ec5f0335b596ac3e132e2cfb610ffb6b90 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Thu, 18 Dec 2014 23:35:21 +0100 Subject: [PATCH 5/8] Fix compilation with moved files in internet/ --- src/CMakeLists.txt | 394 +++++++++--------- src/core/application.cpp | 14 +- src/core/metatypes.cpp | 12 +- src/core/player.cpp | 2 +- src/core/song.cpp | 2 +- src/core/songloader.cpp | 10 +- src/covers/albumcoverloader.cpp | 4 +- src/covers/lastfmcoverprovider.cpp | 2 +- src/engines/gstenginepipeline.cpp | 6 +- .../digitallyimportedsearchprovider.h | 2 +- .../groovesharksearchprovider.cpp | 2 +- src/globalsearch/groovesharksearchprovider.h | 2 +- src/globalsearch/icecastsearchprovider.cpp | 2 +- src/globalsearch/savedradiosearchprovider.h | 2 +- src/globalsearch/searchprovider.cpp | 2 +- src/globalsearch/somafmsearchprovider.h | 2 +- src/globalsearch/soundcloudsearchprovider.cpp | 2 +- src/globalsearch/soundcloudsearchprovider.h | 2 +- src/globalsearch/spotifysearchprovider.cpp | 4 +- src/globalsearch/spotifysearchprovider.h | 2 +- src/globalsearch/vksearchprovider.h | 2 +- src/internet/box/boxservice.cpp | 4 +- src/internet/box/boxservice.h | 2 +- src/internet/box/boxsettingspage.cpp | 2 +- .../cloudfilesearchprovider.cpp | 6 +- .../cloudfilesearchprovider.h | 0 .../{cloudfile => core}/cloudfileservice.cpp | 6 +- .../{cloudfile => core}/cloudfileservice.h | 2 +- src/internet/core/internetmodel.cpp | 38 +- src/internet/core/internetplaylistitem.cpp | 6 +- src/internet/core/internetservice.cpp | 4 +- .../core/internetshowsettingspage.cpp | 4 +- src/internet/core/internetview.cpp | 2 +- src/internet/core/internetviewcontainer.cpp | 4 +- src/internet/core/internetviewcontainer.ui | 2 +- src/internet/core/oauthenticator.cpp | 4 +- src/internet/core/searchboxwidget.cpp | 4 +- .../digitallyimportedservicebase.cpp | 2 +- .../digitally/digitallyimportedservicebase.h | 3 +- .../digitally/digitallyimportedurlhandler.cpp | 2 +- src/internet/dropbox/dropboxauthenticator.cpp | 2 +- src/internet/dropbox/dropboxservice.cpp | 4 +- src/internet/dropbox/dropboxservice.h | 2 +- src/internet/dropbox/dropboxsettingspage.cpp | 6 +- src/internet/dropbox/dropboxurlhandler.cpp | 2 +- .../googledrive/googledriveclient.cpp | 2 +- .../googledrive/googledriveservice.cpp | 2 +- src/internet/googledrive/googledriveservice.h | 2 +- .../googledrive/googledrivesettingspage.cpp | 2 +- src/internet/grooveshark/groovesharkradio.cpp | 2 +- .../grooveshark/groovesharkservice.cpp | 4 +- src/internet/grooveshark/groovesharkservice.h | 4 +- .../grooveshark/groovesharksettingspage.cpp | 2 +- src/internet/icecast/icecastservice.cpp | 2 +- src/internet/icecast/icecastservice.h | 2 +- src/internet/internetradio/savedradio.cpp | 2 +- src/internet/internetradio/savedradio.h | 2 +- src/internet/jamendo/jamendoservice.cpp | 2 +- src/internet/jamendo/jamendoservice.h | 2 +- src/internet/lastfm/lastfmservice.cpp | 4 +- src/internet/lastfm/lastfmservice.h | 2 +- src/internet/lastfm/lastfmsettingspage.cpp | 2 +- .../magnatune/magnatunedownloaddialog.cpp | 2 +- .../magnatune/magnatuneplaylistitem.cpp | 2 +- src/internet/magnatune/magnatuneservice.cpp | 2 +- src/internet/magnatune/magnatuneservice.h | 2 +- .../magnatune/magnatunesettingspage.cpp | 2 +- src/internet/podcasts/addpodcastdialog.ui | 2 +- src/internet/podcasts/podcastservice.cpp | 6 +- src/internet/podcasts/podcastservice.h | 4 +- src/internet/podcasts/podcastservicemodel.cpp | 4 +- src/internet/podcasts/podcastsettingspage.cpp | 2 +- src/internet/seafile/seafileservice.cpp | 4 +- src/internet/seafile/seafileservice.h | 2 +- src/internet/seafile/seafilesettingspage.cpp | 2 +- src/internet/seafile/seafiletree.h | 2 +- src/internet/skydrive/skydriveservice.cpp | 4 +- src/internet/skydrive/skydriveservice.h | 2 +- .../skydrive/skydrivesettingspage.cpp | 4 +- src/internet/somafm/somafmservice.cpp | 2 +- src/internet/somafm/somafmservice.h | 2 +- src/internet/somafm/somafmurlhandler.cpp | 2 +- src/internet/soundcloud/soundcloudservice.cpp | 6 +- src/internet/soundcloud/soundcloudservice.h | 4 +- .../soundcloud/soundcloudsettingspage.cpp | 2 +- src/internet/spotify/spotifyservice.cpp | 4 +- src/internet/spotify/spotifyservice.h | 4 +- src/internet/spotify/spotifysettingspage.cpp | 2 +- src/internet/subsonic/subsonicservice.cpp | 4 +- src/internet/subsonic/subsonicservice.h | 4 +- .../subsonic/subsonicsettingspage.cpp | 2 +- src/internet/vk/vkconnection.cpp | 2 +- src/internet/vk/vkservice.cpp | 6 +- src/internet/vk/vkservice.h | 4 +- src/internet/vk/vksettingspage.cpp | 2 +- src/main.cpp | 2 +- src/networkremote/incomingdataparser.cpp | 4 +- src/playlist/playlist.cpp | 18 +- src/playlist/playlistitem.cpp | 10 +- src/playlist/playlisttabbar.cpp | 2 +- src/smartplaylists/generator.cpp | 2 +- src/songinfo/lastfmtrackinfoprovider.cpp | 2 +- src/songinfo/songkickconcerts.h | 2 +- src/songinfo/tagwidget.cpp | 6 +- src/ui/addstreamdialog.cpp | 4 +- src/ui/mainwindow.cpp | 16 +- src/ui/settingsdialog.cpp | 30 +- 107 files changed, 412 insertions(+), 411 deletions(-) rename src/internet/{cloudfile => core}/cloudfilesearchprovider.cpp (91%) rename src/internet/{cloudfile => core}/cloudfilesearchprovider.h (100%) rename src/internet/{cloudfile => core}/cloudfileservice.cpp (98%) rename src/internet/{cloudfile => core}/cloudfileservice.h (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 334e5e23f..69cf49e0a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -165,49 +165,49 @@ set(SOURCES globalsearch/suggestionwidget.cpp globalsearch/urlsearchprovider.cpp - internet/cloudfilesearchprovider.cpp - internet/cloudfileservice.cpp - internet/digitallyimportedclient.cpp - internet/digitallyimportedservicebase.cpp - internet/digitallyimportedsettingspage.cpp - internet/digitallyimportedurlhandler.cpp - internet/geolocator.cpp - internet/groovesharkradio.cpp - internet/groovesharkservice.cpp - internet/groovesharksettingspage.cpp - internet/groovesharkurlhandler.cpp - internet/icecastbackend.cpp - internet/icecastfilterwidget.cpp - internet/icecastmodel.cpp - internet/icecastservice.cpp - internet/internetmodel.cpp - internet/internetplaylistitem.cpp - internet/internetservice.cpp - internet/internetshowsettingspage.cpp - internet/internetview.cpp - internet/internetviewcontainer.cpp - internet/jamendodynamicplaylist.cpp - internet/jamendoplaylistitem.cpp - internet/jamendoservice.cpp - internet/localredirectserver.cpp - internet/magnatunedownloaddialog.cpp - internet/magnatuneplaylistitem.cpp - internet/magnatuneservice.cpp - internet/magnatunesettingspage.cpp - internet/magnatuneurlhandler.cpp - internet/oauthenticator.cpp - internet/savedradio.cpp - internet/searchboxwidget.cpp - internet/somafmservice.cpp - internet/somafmurlhandler.cpp - internet/soundcloudservice.cpp - internet/soundcloudsettingspage.cpp - internet/spotifyserver.cpp - internet/spotifyservice.cpp - internet/spotifysettingspage.cpp - internet/subsonicservice.cpp - internet/subsonicsettingspage.cpp - internet/subsonicurlhandler.cpp + internet/core/cloudfilesearchprovider.cpp + internet/core/cloudfileservice.cpp + internet/digitally/digitallyimportedclient.cpp + internet/digitally/digitallyimportedservicebase.cpp + internet/digitally/digitallyimportedsettingspage.cpp + internet/digitally/digitallyimportedurlhandler.cpp + internet/core/geolocator.cpp + internet/grooveshark/groovesharkradio.cpp + internet/grooveshark/groovesharkservice.cpp + internet/grooveshark/groovesharksettingspage.cpp + internet/grooveshark/groovesharkurlhandler.cpp + internet/icecast/icecastbackend.cpp + internet/icecast/icecastfilterwidget.cpp + internet/icecast/icecastmodel.cpp + internet/icecast/icecastservice.cpp + internet/core/internetmodel.cpp + internet/core/internetplaylistitem.cpp + internet/core/internetservice.cpp + internet/core/internetshowsettingspage.cpp + internet/core/internetview.cpp + internet/core/internetviewcontainer.cpp + internet/jamendo/jamendodynamicplaylist.cpp + internet/jamendo/jamendoplaylistitem.cpp + internet/jamendo/jamendoservice.cpp + internet/core/localredirectserver.cpp + internet/magnatune/magnatunedownloaddialog.cpp + internet/magnatune/magnatuneplaylistitem.cpp + internet/magnatune/magnatuneservice.cpp + internet/magnatune/magnatunesettingspage.cpp + internet/magnatune/magnatuneurlhandler.cpp + internet/core/oauthenticator.cpp + internet/internetradio/savedradio.cpp + internet/core/searchboxwidget.cpp + internet/somafm/somafmservice.cpp + internet/somafm/somafmurlhandler.cpp + internet/soundcloud/soundcloudservice.cpp + internet/soundcloud/soundcloudsettingspage.cpp + internet/spotify/spotifyserver.cpp + internet/spotify/spotifyservice.cpp + internet/spotify/spotifysettingspage.cpp + internet/subsonic/subsonicservice.cpp + internet/subsonic/subsonicsettingspage.cpp + internet/subsonic/subsonicurlhandler.cpp library/groupbydialog.cpp library/library.cpp @@ -270,28 +270,28 @@ set(SOURCES playlistparsers/xmlparser.cpp playlistparsers/xspfparser.cpp - podcasts/addpodcastbyurl.cpp - podcasts/addpodcastdialog.cpp - podcasts/addpodcastpage.cpp - podcasts/fixedopmlpage.cpp - podcasts/gpoddersearchpage.cpp - podcasts/gpoddersync.cpp - podcasts/gpoddertoptagsmodel.cpp - podcasts/gpoddertoptagspage.cpp - podcasts/itunessearchpage.cpp - podcasts/podcast.cpp - podcasts/podcastbackend.cpp - podcasts/podcastdiscoverymodel.cpp - podcasts/podcastdeleter.cpp - podcasts/podcastdownloader.cpp - podcasts/podcastepisode.cpp - podcasts/podcastinfowidget.cpp - podcasts/podcastservice.cpp - podcasts/podcastservicemodel.cpp - podcasts/podcastsettingspage.cpp - podcasts/podcastparser.cpp - podcasts/podcastupdater.cpp - podcasts/podcasturlloader.cpp + internet/podcasts/addpodcastbyurl.cpp + internet/podcasts/addpodcastdialog.cpp + internet/podcasts/addpodcastpage.cpp + internet/podcasts/fixedopmlpage.cpp + internet/podcasts/gpoddersearchpage.cpp + internet/podcasts/gpoddersync.cpp + internet/podcasts/gpoddertoptagsmodel.cpp + internet/podcasts/gpoddertoptagspage.cpp + internet/podcasts/itunessearchpage.cpp + internet/podcasts/podcast.cpp + internet/podcasts/podcastbackend.cpp + internet/podcasts/podcastdiscoverymodel.cpp + internet/podcasts/podcastdeleter.cpp + internet/podcasts/podcastdownloader.cpp + internet/podcasts/podcastepisode.cpp + internet/podcasts/podcastinfowidget.cpp + internet/podcasts/podcastservice.cpp + internet/podcasts/podcastservicemodel.cpp + internet/podcasts/podcastsettingspage.cpp + internet/podcasts/podcastparser.cpp + internet/podcasts/podcastupdater.cpp + internet/podcasts/podcasturlloader.cpp smartplaylists/generator.cpp smartplaylists/generatorinserter.cpp @@ -476,45 +476,45 @@ set(HEADERS globalsearch/spotifysearchprovider.h globalsearch/suggestionwidget.h - internet/cloudfileservice.h - internet/digitallyimportedclient.h - internet/digitallyimportedservicebase.h - internet/digitallyimportedsettingspage.h - internet/geolocator.h - internet/groovesharkservice.h - internet/groovesharksettingspage.h - internet/groovesharkurlhandler.h - internet/icecastbackend.h - internet/icecastfilterwidget.h - internet/icecastmodel.h - internet/icecastservice.h - internet/internetmimedata.h - internet/internetmodel.h - internet/internetservice.h - internet/internetshowsettingspage.h - internet/internetsongmimedata.h - internet/internetview.h - internet/internetviewcontainer.h - internet/jamendodynamicplaylist.h - internet/jamendoservice.h - internet/localredirectserver.h - internet/magnatunedownloaddialog.h - internet/magnatuneservice.h - internet/magnatunesettingspage.h - internet/oauthenticator.h - internet/savedradio.h - internet/scrobbler.h - internet/searchboxwidget.h - internet/somafmservice.h - internet/somafmurlhandler.h - internet/soundcloudservice.h - internet/soundcloudsettingspage.h - internet/spotifyserver.h - internet/spotifyservice.h - internet/spotifysettingspage.h - internet/subsonicservice.h - internet/subsonicsettingspage.h - internet/subsonicurlhandler.h + internet/core/cloudfileservice.h + internet/digitally/digitallyimportedclient.h + internet/digitally/digitallyimportedservicebase.h + internet/digitally/digitallyimportedsettingspage.h + internet/core/geolocator.h + internet/grooveshark/groovesharkservice.h + internet/grooveshark/groovesharksettingspage.h + internet/grooveshark/groovesharkurlhandler.h + internet/icecast/icecastbackend.h + internet/icecast/icecastfilterwidget.h + internet/icecast/icecastmodel.h + internet/icecast/icecastservice.h + internet/core/internetmimedata.h + internet/core/internetmodel.h + internet/core/internetservice.h + internet/core/internetshowsettingspage.h + internet/core/internetsongmimedata.h + internet/core/internetview.h + internet/core/internetviewcontainer.h + internet/jamendo/jamendodynamicplaylist.h + internet/jamendo/jamendoservice.h + internet/core/localredirectserver.h + internet/magnatune/magnatunedownloaddialog.h + internet/magnatune/magnatuneservice.h + internet/magnatune/magnatunesettingspage.h + internet/core/oauthenticator.h + internet/internetradio/savedradio.h + internet/core/scrobbler.h + internet/core/searchboxwidget.h + internet/somafm/somafmservice.h + internet/somafm/somafmurlhandler.h + internet/soundcloud/soundcloudservice.h + internet/soundcloud/soundcloudsettingspage.h + internet/spotify/spotifyserver.h + internet/spotify/spotifyservice.h + internet/spotify/spotifysettingspage.h + internet/subsonic/subsonicservice.h + internet/subsonic/subsonicsettingspage.h + internet/subsonic/subsonicurlhandler.h library/groupbydialog.h library/library.h @@ -568,25 +568,25 @@ set(HEADERS playlistparsers/plsparser.h playlistparsers/xspfparser.h - podcasts/addpodcastbyurl.h - podcasts/addpodcastdialog.h - podcasts/addpodcastpage.h - podcasts/fixedopmlpage.h - podcasts/gpoddersearchpage.h - podcasts/gpoddersync.h - podcasts/gpoddertoptagsmodel.h - podcasts/gpoddertoptagspage.h - podcasts/itunessearchpage.h - podcasts/podcastbackend.h - podcasts/podcastdiscoverymodel.h - podcasts/podcastdeleter.h - podcasts/podcastdownloader.h - podcasts/podcastinfowidget.h - podcasts/podcastservice.h - podcasts/podcastservicemodel.h - podcasts/podcastsettingspage.h - podcasts/podcastupdater.h - podcasts/podcasturlloader.h + internet/podcasts/addpodcastbyurl.h + internet/podcasts/addpodcastdialog.h + internet/podcasts/addpodcastpage.h + internet/podcasts/fixedopmlpage.h + internet/podcasts/gpoddersearchpage.h + internet/podcasts/gpoddersync.h + internet/podcasts/gpoddertoptagsmodel.h + internet/podcasts/gpoddertoptagspage.h + internet/podcasts/itunessearchpage.h + internet/podcasts/podcastbackend.h + internet/podcasts/podcastdiscoverymodel.h + internet/podcasts/podcastdeleter.h + internet/podcasts/podcastdownloader.h + internet/podcasts/podcastinfowidget.h + internet/podcasts/podcastservice.h + internet/podcasts/podcastservicemodel.h + internet/podcasts/podcastsettingspage.h + internet/podcasts/podcastupdater.h + internet/podcasts/podcasturlloader.h smartplaylists/generator.h smartplaylists/generatorinserter.h @@ -697,17 +697,17 @@ set(UI globalsearch/searchproviderstatuswidget.ui globalsearch/suggestionwidget.ui - internet/digitallyimportedsettingspage.ui - internet/groovesharksettingspage.ui - internet/icecastfilterwidget.ui - internet/internetshowsettingspage.ui - internet/internetviewcontainer.ui - internet/magnatunedownloaddialog.ui - internet/magnatunesettingspage.ui - internet/searchboxwidget.ui - internet/soundcloudsettingspage.ui - internet/spotifysettingspage.ui - internet/subsonicsettingspage.ui + internet/digitally/digitallyimportedsettingspage.ui + internet/grooveshark/groovesharksettingspage.ui + internet/icecast/icecastfilterwidget.ui + internet/core/internetshowsettingspage.ui + internet/core/internetviewcontainer.ui + internet/magnatune/magnatunedownloaddialog.ui + internet/magnatune/magnatunesettingspage.ui + internet/core/searchboxwidget.ui + internet/soundcloud/soundcloudsettingspage.ui + internet/spotify/spotifysettingspage.ui + internet/subsonic/subsonicsettingspage.ui library/groupbydialog.ui library/libraryfilterwidget.ui @@ -721,12 +721,12 @@ set(UI playlist/playlistsequence.ui playlist/queuemanager.ui - podcasts/addpodcastbyurl.ui - podcasts/addpodcastdialog.ui - podcasts/gpoddersearchpage.ui - podcasts/itunessearchpage.ui - podcasts/podcastinfowidget.ui - podcasts/podcastsettingspage.ui + internet/podcasts/addpodcastbyurl.ui + internet/podcasts/addpodcastdialog.ui + internet/podcasts/gpoddersearchpage.ui + internet/podcasts/itunessearchpage.ui + internet/podcasts/podcastinfowidget.ui + internet/podcasts/podcastsettingspage.ui smartplaylists/querysearchpage.ui smartplaylists/querysortpage.ui @@ -832,32 +832,32 @@ optional_source(ENABLE_VISUALISATIONS optional_source(HAVE_LIBLASTFM SOURCES covers/lastfmcoverprovider.cpp - internet/fixlastfm.cpp - internet/lastfmcompat.cpp - internet/lastfmservice.cpp - internet/lastfmsettingspage.cpp + internet/lastfm/fixlastfm.cpp + internet/lastfm/lastfmcompat.cpp + internet/lastfm/lastfmservice.cpp + internet/lastfm/lastfmsettingspage.cpp songinfo/echonestsimilarartists.cpp songinfo/echonesttags.cpp songinfo/lastfmtrackinfoprovider.cpp songinfo/tagwidget.cpp HEADERS covers/lastfmcoverprovider.h - internet/lastfmservice.h - internet/lastfmsettingspage.h + internet/lastfm/lastfmservice.h + internet/lastfm/lastfmsettingspage.h songinfo/echonestsimilarartists.h songinfo/echonesttags.h songinfo/lastfmtrackinfoprovider.h songinfo/tagwidget.h UI - internet/lastfmsettingspage.ui + internet/lastfm/lastfmsettingspage.ui ) optional_source(HAVE_SPOTIFY_DOWNLOADER SOURCES - internet/spotifyblobdownloader.cpp + internet/spotify/spotifyblobdownloader.cpp HEADERS - internet/spotifyblobdownloader.h + internet/spotify/spotifyblobdownloader.h INCLUDE_DIRECTORIES ${QCA_INCLUDE_DIRS} ) @@ -1085,47 +1085,47 @@ optional_source(HAVE_MOODBAR # Google Drive support optional_source(HAVE_GOOGLE_DRIVE SOURCES - internet/googledriveclient.cpp - internet/googledriveservice.cpp - internet/googledrivesettingspage.cpp - internet/googledriveurlhandler.cpp + internet/googledrive/googledriveclient.cpp + internet/googledrive/googledriveservice.cpp + internet/googledrive/googledrivesettingspage.cpp + internet/googledrive/googledriveurlhandler.cpp HEADERS - internet/googledriveclient.h - internet/googledriveservice.h - internet/googledrivesettingspage.h - internet/googledriveurlhandler.h + internet/googledrive/googledriveclient.h + internet/googledrive/googledriveservice.h + internet/googledrive/googledrivesettingspage.h + internet/googledrive/googledriveurlhandler.h UI - internet/googledrivesettingspage.ui + internet/googledrive/googledrivesettingspage.ui ) # Dropbox support optional_source(HAVE_DROPBOX SOURCES - internet/dropboxauthenticator.cpp - internet/dropboxservice.cpp - internet/dropboxsettingspage.cpp - internet/dropboxurlhandler.cpp + internet/dropbox/dropboxauthenticator.cpp + internet/dropbox/dropboxservice.cpp + internet/dropbox/dropboxsettingspage.cpp + internet/dropbox/dropboxurlhandler.cpp HEADERS - internet/dropboxauthenticator.h - internet/dropboxservice.h - internet/dropboxsettingspage.h - internet/dropboxurlhandler.h + internet/dropbox/dropboxauthenticator.h + internet/dropbox/dropboxservice.h + internet/dropbox/dropboxsettingspage.h + internet/dropbox/dropboxurlhandler.h UI - internet/dropboxsettingspage.ui + internet/dropbox/dropboxsettingspage.ui ) # Skydrive support optional_source(HAVE_SKYDRIVE SOURCES - internet/skydriveservice.cpp - internet/skydrivesettingspage.cpp - internet/skydriveurlhandler.cpp + internet/skydrive/skydriveservice.cpp + internet/skydrive/skydrivesettingspage.cpp + internet/skydrive/skydriveurlhandler.cpp HEADERS - internet/skydriveservice.h - internet/skydrivesettingspage.h - internet/skydriveurlhandler.h + internet/skydrive/skydriveservice.h + internet/skydrive/skydrivesettingspage.h + internet/skydrive/skydriveurlhandler.h UI - internet/skydrivesettingspage.ui + internet/skydrive/skydrivesettingspage.ui ) # Box support @@ -1148,39 +1148,39 @@ optional_source(HAVE_VK ${VREEN_INCLUDE_DIRS} SOURCES globalsearch/vksearchprovider.cpp - internet/vkconnection.cpp - internet/vkmusiccache.cpp - internet/vksearchdialog.cpp - internet/vkservice.cpp - internet/vksettingspage.cpp - internet/vkurlhandler.cpp + internet/vk/vkconnection.cpp + internet/vk/vkmusiccache.cpp + internet/vk/vksearchdialog.cpp + internet/vk/vkservice.cpp + internet/vk/vksettingspage.cpp + internet/vk/vkurlhandler.cpp HEADERS globalsearch/vksearchprovider.h - internet/vkconnection.h - internet/vkmusiccache.h - internet/vksearchdialog.h - internet/vkservice.h - internet/vksettingspage.h - internet/vkurlhandler.h + internet/vk/vkconnection.h + internet/vk/vkmusiccache.h + internet/vk/vksearchdialog.h + internet/vk/vkservice.h + internet/vk/vksettingspage.h + internet/vk/vkurlhandler.h UI - internet/vksearchdialog.ui - internet/vksettingspage.ui + internet/vk/vksearchdialog.ui + internet/vk/vksettingspage.ui ) # Seafile support optional_source(HAVE_SEAFILE SOURCES - internet/seafileservice.cpp - internet/seafilesettingspage.cpp - internet/seafileurlhandler.cpp - internet/seafiletree.cpp + internet/seafile/seafileservice.cpp + internet/seafile/seafilesettingspage.cpp + internet/seafile/seafileurlhandler.cpp + internet/seafile/seafiletree.cpp HEADERS - internet/seafileservice.h - internet/seafilesettingspage.h - internet/seafileurlhandler.h - internet/seafiletree.h + internet/seafile/seafileservice.h + internet/seafile/seafilesettingspage.h + internet/seafile/seafileurlhandler.h + internet/seafile/seafiletree.h UI - internet/seafilesettingspage.ui + internet/seafile/seafilesettingspage.ui ) diff --git a/src/core/application.cpp b/src/core/application.cpp index 6f39b866e..1e902a3d4 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -31,7 +31,7 @@ #include "covers/coverproviders.h" #include "covers/currentartloader.h" #include "devices/devicemanager.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" #include "globalsearch/globalsearch.h" #include "library/library.h" #include "library/librarybackend.h" @@ -39,14 +39,14 @@ #include "networkremote/networkremotehelper.h" #include "playlist/playlistbackend.h" #include "playlist/playlistmanager.h" -#include "podcasts/gpoddersync.h" -#include "podcasts/podcastbackend.h" -#include "podcasts/podcastdeleter.h" -#include "podcasts/podcastdownloader.h" -#include "podcasts/podcastupdater.h" +#include "internet/podcasts/gpoddersync.h" +#include "internet/podcasts/podcastbackend.h" +#include "internet/podcasts/podcastdeleter.h" +#include "internet/podcasts/podcastdownloader.h" +#include "internet/podcasts/podcastupdater.h" #ifdef HAVE_LIBLASTFM -#include "internet/lastfmservice.h" +#include "internet/lastfm/lastfmservice.h" #endif // HAVE_LIBLASTFM #ifdef HAVE_MOODBAR diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp index 22ac238f2..daf5b71f7 100644 --- a/src/core/metatypes.cpp +++ b/src/core/metatypes.cpp @@ -30,17 +30,17 @@ #include "engines/enginebase.h" #include "engines/gstengine.h" #include "globalsearch/searchprovider.h" -#include "internet/digitallyimportedclient.h" -#include "internet/geolocator.h" -#include "internet/somafmservice.h" +#include "internet/digitally/digitallyimportedclient.h" +#include "internet/core/geolocator.h" +#include "internet/somafm/somafmservice.h" #include "library/directory.h" #include "playlist/playlist.h" -#include "podcasts/podcastepisode.h" -#include "podcasts/podcast.h" +#include "internet/podcasts/podcastepisode.h" +#include "internet/podcasts/podcast.h" #include "ui/equalizer.h" #ifdef HAVE_VK -#include "internet/vkservice.h" +#include "internet/vk/vkservice.h" #endif #ifdef HAVE_DBUS diff --git a/src/core/player.cpp b/src/core/player.cpp index b2c6af130..80e01cd9a 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -45,7 +45,7 @@ #include "playlist/playlistmanager.h" #ifdef HAVE_LIBLASTFM -#include "internet/lastfmservice.h" +#include "internet/lastfm/lastfmservice.h" #endif using std::shared_ptr; diff --git a/src/core/song.cpp b/src/core/song.cpp index 9ecc895e6..0034d6b16 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -43,7 +43,7 @@ #include #ifdef HAVE_LIBLASTFM -#include "internet/fixlastfm.h" +#include "internet/lastfm/fixlastfm.h" #ifdef HAVE_LIBLASTFM1 #include #else diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index 03d761be2..d2c13f6c0 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -38,16 +38,16 @@ #include "core/song.h" #include "core/tagreaderclient.h" #include "core/timeconstants.h" -#include "internet/fixlastfm.h" -#include "internet/internetmodel.h" +#include "internet/lastfm/fixlastfm.h" +#include "internet/core/internetmodel.h" #include "library/librarybackend.h" #include "library/sqlrow.h" #include "playlistparsers/cueparser.h" #include "playlistparsers/parserbase.h" #include "playlistparsers/playlistparser.h" -#include "podcasts/podcastparser.h" -#include "podcasts/podcastservice.h" -#include "podcasts/podcasturlloader.h" +#include "internet/podcasts/podcastparser.h" +#include "internet/podcasts/podcastservice.h" +#include "internet/podcasts/podcasturlloader.h" #ifdef HAVE_AUDIOCD #include diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp index 03c3f5491..6b3d35b9c 100644 --- a/src/covers/albumcoverloader.cpp +++ b/src/covers/albumcoverloader.cpp @@ -29,8 +29,8 @@ #include "core/network.h" #include "core/tagreaderclient.h" #include "core/utilities.h" -#include "internet/internetmodel.h" -#include "internet/spotifyservice.h" +#include "internet/core/internetmodel.h" +#include "internet/spotify/spotifyservice.h" AlbumCoverLoader::AlbumCoverLoader(QObject* parent) : QObject(parent), diff --git a/src/covers/lastfmcoverprovider.cpp b/src/covers/lastfmcoverprovider.cpp index 1eef40ad9..a6ffd8396 100644 --- a/src/covers/lastfmcoverprovider.cpp +++ b/src/covers/lastfmcoverprovider.cpp @@ -22,7 +22,7 @@ #include "albumcoverfetcher.h" #include "coverprovider.h" #include "core/closure.h" -#include "internet/lastfmcompat.h" +#include "internet/lastfm/lastfmcompat.h" LastFmCoverProvider::LastFmCoverProvider(QObject* parent) : CoverProvider("last.fm", parent) {} diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp index a713efd92..7f48f1fb2 100644 --- a/src/engines/gstenginepipeline.cpp +++ b/src/engines/gstenginepipeline.cpp @@ -31,9 +31,9 @@ #include "core/mac_startup.h" #include "core/signalchecker.h" #include "core/utilities.h" -#include "internet/internetmodel.h" -#include "internet/spotifyserver.h" -#include "internet/spotifyservice.h" +#include "internet/core/internetmodel.h" +#include "internet/spotify/spotifyserver.h" +#include "internet/spotify/spotifyservice.h" const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; const int GstEnginePipeline::kFaderFudgeMsec = 2000; diff --git a/src/globalsearch/digitallyimportedsearchprovider.h b/src/globalsearch/digitallyimportedsearchprovider.h index f3346a0cb..092c344ba 100644 --- a/src/globalsearch/digitallyimportedsearchprovider.h +++ b/src/globalsearch/digitallyimportedsearchprovider.h @@ -19,7 +19,7 @@ #define DIGITALLYIMPORTEDSEARCHPROVIDER_H #include "simplesearchprovider.h" -#include "internet/digitallyimportedservicebase.h" +#include "internet/digitally/digitallyimportedservicebase.h" class DigitallyImportedSearchProvider : public SimpleSearchProvider { public: diff --git a/src/globalsearch/groovesharksearchprovider.cpp b/src/globalsearch/groovesharksearchprovider.cpp index 522e7db33..aa96a1c7b 100644 --- a/src/globalsearch/groovesharksearchprovider.cpp +++ b/src/globalsearch/groovesharksearchprovider.cpp @@ -22,7 +22,7 @@ #include "core/application.h" #include "core/logging.h" #include "covers/albumcoverloader.h" -#include "internet/groovesharkservice.h" +#include "internet/grooveshark/groovesharkservice.h" GroovesharkSearchProvider::GroovesharkSearchProvider(Application* app, QObject* parent) diff --git a/src/globalsearch/groovesharksearchprovider.h b/src/globalsearch/groovesharksearchprovider.h index 4627e902b..c4aedd119 100644 --- a/src/globalsearch/groovesharksearchprovider.h +++ b/src/globalsearch/groovesharksearchprovider.h @@ -20,7 +20,7 @@ #include "searchprovider.h" #include "covers/albumcoverloaderoptions.h" -#include "internet/groovesharkservice.h" +#include "internet/grooveshark/groovesharkservice.h" class AlbumCoverLoader; diff --git a/src/globalsearch/icecastsearchprovider.cpp b/src/globalsearch/icecastsearchprovider.cpp index ab78db194..763533f3b 100644 --- a/src/globalsearch/icecastsearchprovider.cpp +++ b/src/globalsearch/icecastsearchprovider.cpp @@ -16,7 +16,7 @@ */ #include "icecastsearchprovider.h" -#include "internet/icecastbackend.h" +#include "internet/icecast/icecastbackend.h" IcecastSearchProvider::IcecastSearchProvider(IcecastBackend* backend, Application* app, QObject* parent) diff --git a/src/globalsearch/savedradiosearchprovider.h b/src/globalsearch/savedradiosearchprovider.h index 9d5ce2498..0623eedee 100644 --- a/src/globalsearch/savedradiosearchprovider.h +++ b/src/globalsearch/savedradiosearchprovider.h @@ -19,7 +19,7 @@ #define SAVEDRADIOSEARCHPROVIDER_H #include "simplesearchprovider.h" -#include "internet/savedradio.h" +#include "internet/internetradio/savedradio.h" class SavedRadioSearchProvider : public SimpleSearchProvider { public: diff --git a/src/globalsearch/searchprovider.cpp b/src/globalsearch/searchprovider.cpp index fe67c552d..da6acb51e 100644 --- a/src/globalsearch/searchprovider.cpp +++ b/src/globalsearch/searchprovider.cpp @@ -17,7 +17,7 @@ #include "searchprovider.h" #include "core/boundfuturewatcher.h" -#include "internet/internetsongmimedata.h" +#include "internet/core/internetsongmimedata.h" #include "playlist/songmimedata.h" #include diff --git a/src/globalsearch/somafmsearchprovider.h b/src/globalsearch/somafmsearchprovider.h index d5b06c9f2..0e231abbf 100644 --- a/src/globalsearch/somafmsearchprovider.h +++ b/src/globalsearch/somafmsearchprovider.h @@ -19,7 +19,7 @@ #define SOMAFMSEARCHPROVIDER_H #include "simplesearchprovider.h" -#include "internet/somafmservice.h" +#include "internet/somafm/somafmservice.h" class SomaFMSearchProvider : public SimpleSearchProvider { public: diff --git a/src/globalsearch/soundcloudsearchprovider.cpp b/src/globalsearch/soundcloudsearchprovider.cpp index 296c0c4d3..4284f4ef6 100644 --- a/src/globalsearch/soundcloudsearchprovider.cpp +++ b/src/globalsearch/soundcloudsearchprovider.cpp @@ -22,7 +22,7 @@ #include "core/application.h" #include "core/logging.h" #include "covers/albumcoverloader.h" -#include "internet/soundcloudservice.h" +#include "internet/soundcloud/soundcloudservice.h" SoundCloudSearchProvider::SoundCloudSearchProvider(Application* app, QObject* parent) diff --git a/src/globalsearch/soundcloudsearchprovider.h b/src/globalsearch/soundcloudsearchprovider.h index 062b69c55..9942aff27 100644 --- a/src/globalsearch/soundcloudsearchprovider.h +++ b/src/globalsearch/soundcloudsearchprovider.h @@ -20,7 +20,7 @@ #include "searchprovider.h" #include "covers/albumcoverloaderoptions.h" -#include "internet/soundcloudservice.h" +#include "internet/soundcloud/soundcloudservice.h" class AlbumCoverLoader; diff --git a/src/globalsearch/spotifysearchprovider.cpp b/src/globalsearch/spotifysearchprovider.cpp index 20e6d963e..7622b4d71 100644 --- a/src/globalsearch/spotifysearchprovider.cpp +++ b/src/globalsearch/spotifysearchprovider.cpp @@ -21,8 +21,8 @@ #include #include "core/logging.h" -#include "internet/internetmodel.h" -#include "internet/spotifyserver.h" +#include "internet/core/internetmodel.h" +#include "internet/spotify/spotifyserver.h" #include "playlist/songmimedata.h" namespace { diff --git a/src/globalsearch/spotifysearchprovider.h b/src/globalsearch/spotifysearchprovider.h index 99cc392fb..f5c32e263 100644 --- a/src/globalsearch/spotifysearchprovider.h +++ b/src/globalsearch/spotifysearchprovider.h @@ -20,7 +20,7 @@ #include "searchprovider.h" #include "spotifymessages.pb.h" -#include "internet/spotifyservice.h" +#include "internet/spotify/spotifyservice.h" class SpotifyServer; diff --git a/src/globalsearch/vksearchprovider.h b/src/globalsearch/vksearchprovider.h index 4a4e91067..38b3aa5d9 100644 --- a/src/globalsearch/vksearchprovider.h +++ b/src/globalsearch/vksearchprovider.h @@ -19,7 +19,7 @@ #ifndef VKSEARCHPROVIDER_H #define VKSEARCHPROVIDER_H -#include "internet/vkservice.h" +#include "internet/vk/vkservice.h" #include "searchprovider.h" diff --git a/src/internet/box/boxservice.cpp b/src/internet/box/boxservice.cpp index 86c4ea68d..3a39caaad 100644 --- a/src/internet/box/boxservice.cpp +++ b/src/internet/box/boxservice.cpp @@ -23,8 +23,8 @@ #include "core/application.h" #include "core/player.h" #include "core/waitforsignal.h" -#include "internet/boxurlhandler.h" -#include "internet/oauthenticator.h" +#include "internet/box/boxurlhandler.h" +#include "internet/core/oauthenticator.h" #include "library/librarybackend.h" const char* BoxService::kServiceName = "Box"; diff --git a/src/internet/box/boxservice.h b/src/internet/box/boxservice.h index a0cd5cdda..d7c54d8f2 100644 --- a/src/internet/box/boxservice.h +++ b/src/internet/box/boxservice.h @@ -19,7 +19,7 @@ #ifndef INTERNET_BOXSERVICE_H_ #define INTERNET_BOXSERVICE_H_ -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" #include diff --git a/src/internet/box/boxsettingspage.cpp b/src/internet/box/boxsettingspage.cpp index fb46c1c56..c1c860bea 100644 --- a/src/internet/box/boxsettingspage.cpp +++ b/src/internet/box/boxsettingspage.cpp @@ -23,7 +23,7 @@ #include "ui_boxsettingspage.h" #include "core/application.h" #include "internet/box/boxservice.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" #include "ui/settingsdialog.h" BoxSettingsPage::BoxSettingsPage(SettingsDialog* parent) diff --git a/src/internet/cloudfile/cloudfilesearchprovider.cpp b/src/internet/core/cloudfilesearchprovider.cpp similarity index 91% rename from src/internet/cloudfile/cloudfilesearchprovider.cpp rename to src/internet/core/cloudfilesearchprovider.cpp index e07c76f75..d1950afdd 100644 --- a/src/internet/cloudfile/cloudfilesearchprovider.cpp +++ b/src/internet/core/cloudfilesearchprovider.cpp @@ -16,9 +16,9 @@ along with Clementine. If not, see . */ -#include "internet/cloudfilesearchprovider.h" -#include "internet/cloudfileservice.h" -#include "internet/internetmodel.h" +#include "internet/core/cloudfilesearchprovider.h" +#include "internet/core/cloudfileservice.h" +#include "internet/core/internetmodel.h" CloudFileSearchProvider::CloudFileSearchProvider( LibraryBackendInterface* backend, const QString& id, const QIcon& icon, diff --git a/src/internet/cloudfile/cloudfilesearchprovider.h b/src/internet/core/cloudfilesearchprovider.h similarity index 100% rename from src/internet/cloudfile/cloudfilesearchprovider.h rename to src/internet/core/cloudfilesearchprovider.h diff --git a/src/internet/cloudfile/cloudfileservice.cpp b/src/internet/core/cloudfileservice.cpp similarity index 98% rename from src/internet/cloudfile/cloudfileservice.cpp rename to src/internet/core/cloudfileservice.cpp index f46c62559..08e4de771 100644 --- a/src/internet/cloudfile/cloudfileservice.cpp +++ b/src/internet/core/cloudfileservice.cpp @@ -18,7 +18,7 @@ along with Clementine. If not, see . */ -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" #include #include @@ -30,8 +30,8 @@ #include "core/player.h" #include "core/taskmanager.h" #include "globalsearch/globalsearch.h" -#include "internet/cloudfilesearchprovider.h" -#include "internet/internetmodel.h" +#include "internet/core/cloudfilesearchprovider.h" +#include "internet/core/internetmodel.h" #include "library/librarybackend.h" #include "library/librarymodel.h" #include "playlist/playlist.h" diff --git a/src/internet/cloudfile/cloudfileservice.h b/src/internet/core/cloudfileservice.h similarity index 98% rename from src/internet/cloudfile/cloudfileservice.h rename to src/internet/core/cloudfileservice.h index 6d78e484c..d6fce75fb 100644 --- a/src/internet/cloudfile/cloudfileservice.h +++ b/src/internet/core/cloudfileservice.h @@ -20,7 +20,7 @@ #ifndef INTERNET_CLOUDFILESERVICE_H_ #define INTERNET_CLOUDFILESERVICE_H_ -#include "internetservice.h" +#include "internet/core/internetservice.h" #include diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp index 2bf5f606e..32e0a58a7 100644 --- a/src/internet/core/internetmodel.cpp +++ b/src/internet/core/internetmodel.cpp @@ -23,46 +23,46 @@ along with Clementine. If not, see . */ -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include #include -#include "digitallyimportedservicebase.h" -#include "groovesharkservice.h" -#include "icecastservice.h" -#include "internetmimedata.h" -#include "internetservice.h" -#include "jamendoservice.h" -#include "magnatuneservice.h" -#include "savedradio.h" -#include "somafmservice.h" -#include "soundcloudservice.h" -#include "spotifyservice.h" -#include "subsonicservice.h" +#include "internet/digitally/digitallyimportedservicebase.h" +#include "internet/grooveshark/groovesharkservice.h" +#include "internet/icecast/icecastservice.h" +#include "internet/core/internetmimedata.h" +#include "internet/core/internetservice.h" +#include "internet/jamendo/jamendoservice.h" +#include "internet/magnatune/magnatuneservice.h" +#include "internet/internetradio/savedradio.h" +#include "internet/somafm/somafmservice.h" +#include "internet/soundcloud/soundcloudservice.h" +#include "internet/spotify/spotifyservice.h" +#include "internet/subsonic/subsonicservice.h" #include "core/closure.h" #include "core/logging.h" #include "core/mergedproxymodel.h" -#include "podcasts/podcastservice.h" +#include "internet/podcasts/podcastservice.h" #include "smartplaylists/generatormimedata.h" #ifdef HAVE_GOOGLE_DRIVE -#include "googledriveservice.h" +#include "internet/googledrive/googledriveservice.h" #endif #ifdef HAVE_DROPBOX -#include "dropboxservice.h" +#include "internet/dropbox/dropboxservice.h" #endif #ifdef HAVE_SKYDRIVE -#include "skydriveservice.h" +#include "internet/skydrive/skydriveservice.h" #endif #ifdef HAVE_BOX #include "internet/box/boxservice.h" #endif #ifdef HAVE_VK -#include "vkservice.h" +#include "internet/vk/vkservice.h" #endif #ifdef HAVE_SEAFILE -#include "seafileservice.h" +#include "internet/seafile/seafileservice.h" #endif using smart_playlists::Generator; diff --git a/src/internet/core/internetplaylistitem.cpp b/src/internet/core/internetplaylistitem.cpp index 6781ffa6b..d1430dca1 100644 --- a/src/internet/core/internetplaylistitem.cpp +++ b/src/internet/core/internetplaylistitem.cpp @@ -19,9 +19,9 @@ along with Clementine. If not, see . */ -#include "internetplaylistitem.h" -#include "internetservice.h" -#include "internetmodel.h" +#include "internet/core/internetplaylistitem.h" +#include "internet/core/internetservice.h" +#include "internet/core/internetmodel.h" #include "core/settingsprovider.h" #include "library/sqlrow.h" #include "playlist/playlistbackend.h" diff --git a/src/internet/core/internetservice.cpp b/src/internet/core/internetservice.cpp index d15642b81..18b3e967e 100644 --- a/src/internet/core/internetservice.cpp +++ b/src/internet/core/internetservice.cpp @@ -20,8 +20,8 @@ along with Clementine. If not, see . */ -#include "internetservice.h" -#include "internetmodel.h" +#include "internet/core/internetservice.h" +#include "internet/core/internetmodel.h" #include "core/logging.h" #include "core/mergedproxymodel.h" #include "core/mimedata.h" diff --git a/src/internet/core/internetshowsettingspage.cpp b/src/internet/core/internetshowsettingspage.cpp index 59d4b17f2..6df377921 100644 --- a/src/internet/core/internetshowsettingspage.cpp +++ b/src/internet/core/internetshowsettingspage.cpp @@ -20,8 +20,8 @@ #include "core/application.h" #include "ui/settingsdialog.h" -#include "internetservice.h" -#include "internetmodel.h" +#include "internet/core/internetservice.h" +#include "internet/core/internetmodel.h" #include diff --git a/src/internet/core/internetview.cpp b/src/internet/core/internetview.cpp index a3343b5a2..353eff276 100644 --- a/src/internet/core/internetview.cpp +++ b/src/internet/core/internetview.cpp @@ -20,7 +20,7 @@ */ #include "internetview.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/mergedproxymodel.h" #include "library/libraryview.h" diff --git a/src/internet/core/internetviewcontainer.cpp b/src/internet/core/internetviewcontainer.cpp index 38284db2f..2b7634074 100644 --- a/src/internet/core/internetviewcontainer.cpp +++ b/src/internet/core/internetviewcontainer.cpp @@ -19,8 +19,8 @@ */ #include "internetviewcontainer.h" -#include "internetmodel.h" -#include "internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" #include "ui_internetviewcontainer.h" #include "core/application.h" #include "core/mergedproxymodel.h" diff --git a/src/internet/core/internetviewcontainer.ui b/src/internet/core/internetviewcontainer.ui index 27c9d4c63..23b5cd24e 100644 --- a/src/internet/core/internetviewcontainer.ui +++ b/src/internet/core/internetviewcontainer.ui @@ -69,7 +69,7 @@ InternetView QTreeView -
internet/internetview.h
+
internet/core/internetview.h
 diff --git a/src/internet/core/oauthenticator.cpp b/src/internet/core/oauthenticator.cpp index ba8dc9144..8996da5f4 100644 --- a/src/internet/core/oauthenticator.cpp +++ b/src/internet/core/oauthenticator.cpp @@ -18,7 +18,7 @@ along with Clementine. If not, see . */ -#include "oauthenticator.h" +#include "internet/core/oauthenticator.h" #include #include @@ -28,7 +28,7 @@ #include "core/closure.h" #include "core/logging.h" -#include "internet/localredirectserver.h" +#include "internet/core/localredirectserver.h" const char* OAuthenticator::kRemoteURL = "https://clementine-data.appspot.com/skydrive"; diff --git a/src/internet/core/searchboxwidget.cpp b/src/internet/core/searchboxwidget.cpp index 6d0207df0..6c80e2db8 100644 --- a/src/internet/core/searchboxwidget.cpp +++ b/src/internet/core/searchboxwidget.cpp @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#include "internetservice.h" -#include "searchboxwidget.h" +#include "internet/core/internetservice.h" +#include "internet/core/searchboxwidget.h" #include "ui_searchboxwidget.h" #include "ui/iconloader.h" #include "widgets/didyoumean.h" diff --git a/src/internet/digitally/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp index a9266d4ee..0fafa8eec 100644 --- a/src/internet/digitally/digitallyimportedservicebase.cpp +++ b/src/internet/digitally/digitallyimportedservicebase.cpp @@ -27,7 +27,7 @@ #include "digitallyimportedclient.h" #include "digitallyimportedurlhandler.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/closure.h" #include "core/logging.h" diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h index 6cb91a4fb..fca9176b9 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -1,3 +1,4 @@ + /* This file is part of Clementine. Copyright 2011-2012, David Sansome Copyright 2012, 2014, John Maguire @@ -23,7 +24,7 @@ #include #include "digitallyimportedclient.h" -#include "internetservice.h" +#include "internet/core/internetservice.h" #include "core/cachedlist.h" class DigitallyImportedClient; diff --git a/src/internet/digitally/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp index 457c53b54..d52a94a9c 100644 --- a/src/internet/digitally/digitallyimportedurlhandler.cpp +++ b/src/internet/digitally/digitallyimportedurlhandler.cpp @@ -20,7 +20,7 @@ #include "digitallyimportedservicebase.h" #include "digitallyimportedurlhandler.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/logging.h" #include "core/taskmanager.h" diff --git a/src/internet/dropbox/dropboxauthenticator.cpp b/src/internet/dropbox/dropboxauthenticator.cpp index c69a702d7..22284ff32 100644 --- a/src/internet/dropbox/dropboxauthenticator.cpp +++ b/src/internet/dropbox/dropboxauthenticator.cpp @@ -29,7 +29,7 @@ #include "core/closure.h" #include "core/logging.h" #include "core/network.h" -#include "internet/localredirectserver.h" +#include "internet/core/localredirectserver.h" namespace { static const char* kAppKey = "qh6ca27eclt9p2k"; diff --git a/src/internet/dropbox/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp index dcff95c9f..666dbc6e7 100644 --- a/src/internet/dropbox/dropboxservice.cpp +++ b/src/internet/dropbox/dropboxservice.cpp @@ -30,8 +30,8 @@ #include "core/player.h" #include "core/utilities.h" #include "core/waitforsignal.h" -#include "internet/dropboxauthenticator.h" -#include "internet/dropboxurlhandler.h" +#include "internet/dropbox/dropboxauthenticator.h" +#include "internet/dropbox/dropboxurlhandler.h" #include "library/librarybackend.h" using Utilities::ParseRFC822DateTime; diff --git a/src/internet/dropbox/dropboxservice.h b/src/internet/dropbox/dropboxservice.h index 6df5caf74..aa4720c97 100644 --- a/src/internet/dropbox/dropboxservice.h +++ b/src/internet/dropbox/dropboxservice.h @@ -19,7 +19,7 @@ #ifndef INTERNET_DROPBOXSERVICE_H_ #define INTERNET_DROPBOXSERVICE_H_ -#include "internet/cloudfileservice.h" +#include "internet/core/cloudfileservice.h" #include "core/tagreaderclient.h" diff --git a/src/internet/dropbox/dropboxsettingspage.cpp b/src/internet/dropbox/dropboxsettingspage.cpp index 340b4d1f1..bddd0debf 100644 --- a/src/internet/dropbox/dropboxsettingspage.cpp +++ b/src/internet/dropbox/dropboxsettingspage.cpp @@ -20,9 +20,9 @@ #include "ui_dropboxsettingspage.h" #include "core/application.h" -#include "internet/dropboxauthenticator.h" -#include "internet/dropboxservice.h" -#include "internet/internetmodel.h" +#include "internet/dropbox/dropboxauthenticator.h" +#include "internet/dropbox/dropboxservice.h" +#include "internet/core/internetmodel.h" #include "ui/settingsdialog.h" DropboxSettingsPage::DropboxSettingsPage(SettingsDialog* parent) diff --git a/src/internet/dropbox/dropboxurlhandler.cpp b/src/internet/dropbox/dropboxurlhandler.cpp index dd5b8e568..a7239089c 100644 --- a/src/internet/dropbox/dropboxurlhandler.cpp +++ b/src/internet/dropbox/dropboxurlhandler.cpp @@ -18,7 +18,7 @@ #include "dropboxurlhandler.h" -#include "internet/dropboxservice.h" +#include "internet/dropbox/dropboxservice.h" DropboxUrlHandler::DropboxUrlHandler(DropboxService* service, QObject* parent) : UrlHandler(parent), service_(service) {} diff --git a/src/internet/googledrive/googledriveclient.cpp b/src/internet/googledrive/googledriveclient.cpp index 7684264e6..e93cae44f 100644 --- a/src/internet/googledrive/googledriveclient.cpp +++ b/src/internet/googledrive/googledriveclient.cpp @@ -21,7 +21,7 @@ #include -#include "oauthenticator.h" +#include "internet/core/oauthenticator.h" #include "core/closure.h" #include "core/logging.h" #include "core/network.h" diff --git a/src/internet/googledrive/googledriveservice.cpp b/src/internet/googledrive/googledriveservice.cpp index 0704fb299..d7b106677 100644 --- a/src/internet/googledrive/googledriveservice.cpp +++ b/src/internet/googledrive/googledriveservice.cpp @@ -42,7 +42,7 @@ #include "ui/iconloader.h" #include "googledriveclient.h" #include "googledriveurlhandler.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" const char* GoogleDriveService::kServiceName = "Google Drive"; const char* GoogleDriveService::kSettingsGroup = "GoogleDrive"; diff --git a/src/internet/googledrive/googledriveservice.h b/src/internet/googledrive/googledriveservice.h index b204aa0c1..6d08a5061 100644 --- a/src/internet/googledrive/googledriveservice.h +++ b/src/internet/googledrive/googledriveservice.h @@ -20,7 +20,7 @@ #ifndef INTERNET_GOOGLEDRIVESERVICE_H_ #define INTERNET_GOOGLEDRIVESERVICE_H_ -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" namespace google_drive { class Client; diff --git a/src/internet/googledrive/googledrivesettingspage.cpp b/src/internet/googledrive/googledrivesettingspage.cpp index 3c0bb5d5f..ca05cc52f 100644 --- a/src/internet/googledrive/googledrivesettingspage.cpp +++ b/src/internet/googledrive/googledrivesettingspage.cpp @@ -22,7 +22,7 @@ #include "googledrivesettingspage.h" #include "ui_googledrivesettingspage.h" #include "core/application.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" #include "ui/settingsdialog.h" #include diff --git a/src/internet/grooveshark/groovesharkradio.cpp b/src/internet/grooveshark/groovesharkradio.cpp index 2ea49712c..df5326421 100644 --- a/src/internet/grooveshark/groovesharkradio.cpp +++ b/src/internet/grooveshark/groovesharkradio.cpp @@ -21,7 +21,7 @@ #include "groovesharkservice.h" #include "core/logging.h" -#include "internet/internetplaylistitem.h" +#include "internet/core/internetplaylistitem.h" GroovesharkRadio::GroovesharkRadio(GroovesharkService* service) : service_(service), tag_id_(0), use_tag_(false), first_time_(true) {} diff --git a/src/internet/grooveshark/groovesharkservice.cpp b/src/internet/grooveshark/groovesharkservice.cpp index 6388d8a7a..0a819c7b4 100644 --- a/src/internet/grooveshark/groovesharkservice.cpp +++ b/src/internet/grooveshark/groovesharkservice.cpp @@ -41,10 +41,10 @@ #include "qtiocompressor.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "groovesharkradio.h" #include "groovesharkurlhandler.h" -#include "searchboxwidget.h" +#include "internet/core/searchboxwidget.h" #include "core/application.h" #include "core/closure.h" diff --git a/src/internet/grooveshark/groovesharkservice.h b/src/internet/grooveshark/groovesharkservice.h index 59b715b4f..335fd2e15 100644 --- a/src/internet/grooveshark/groovesharkservice.h +++ b/src/internet/grooveshark/groovesharkservice.h @@ -21,8 +21,8 @@ #ifndef INTERNET_GROOVESHARKSERVICE_H_ #define INTERNET_GROOVESHARKSERVICE_H_ -#include "internetmodel.h" -#include "internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" #include diff --git a/src/internet/grooveshark/groovesharksettingspage.cpp b/src/internet/grooveshark/groovesharksettingspage.cpp index 9daf50df6..ed68fb69b 100644 --- a/src/internet/grooveshark/groovesharksettingspage.cpp +++ b/src/internet/grooveshark/groovesharksettingspage.cpp @@ -20,7 +20,7 @@ #include "groovesharkservice.h" #include "groovesharksettingspage.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/logging.h" #include "core/network.h" #include "ui_groovesharksettingspage.h" diff --git a/src/internet/icecast/icecastservice.cpp b/src/internet/icecast/icecastservice.cpp index 55b38273c..c246f8b34 100644 --- a/src/internet/icecast/icecastservice.cpp +++ b/src/internet/icecast/icecastservice.cpp @@ -34,7 +34,7 @@ #include "icecastbackend.h" #include "icecastfilterwidget.h" #include "icecastmodel.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/closure.h" #include "core/database.h" diff --git a/src/internet/icecast/icecastservice.h b/src/internet/icecast/icecastservice.h index ab5eaa766..94e241f13 100644 --- a/src/internet/icecast/icecastservice.h +++ b/src/internet/icecast/icecastservice.h @@ -21,7 +21,7 @@ #ifndef INTERNET_ICECASTSERVICE_H_ #define INTERNET_ICECASTSERVICE_H_ -#include "internetservice.h" +#include "internet/core/internetservice.h" #include diff --git a/src/internet/internetradio/savedradio.cpp b/src/internet/internetradio/savedradio.cpp index dd4d78959..53c86abe4 100644 --- a/src/internet/internetradio/savedradio.cpp +++ b/src/internet/internetradio/savedradio.cpp @@ -20,7 +20,7 @@ along with Clementine. If not, see . */ -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "savedradio.h" #include "core/application.h" #include "core/mimedata.h" diff --git a/src/internet/internetradio/savedradio.h b/src/internet/internetradio/savedradio.h index 762d09a5c..5743b0d05 100644 --- a/src/internet/internetradio/savedradio.h +++ b/src/internet/internetradio/savedradio.h @@ -23,7 +23,7 @@ #include -#include "internetservice.h" +#include "internet/core/internetservice.h" class QMenu; diff --git a/src/internet/jamendo/jamendoservice.cpp b/src/internet/jamendo/jamendoservice.cpp index 63c1b5469..0cc2f280f 100644 --- a/src/internet/jamendo/jamendoservice.cpp +++ b/src/internet/jamendo/jamendoservice.cpp @@ -25,7 +25,7 @@ #include "jamendodynamicplaylist.h" #include "jamendoplaylistitem.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/database.h" #include "core/logging.h" diff --git a/src/internet/jamendo/jamendoservice.h b/src/internet/jamendo/jamendoservice.h index e5a19ed84..3dfa1a93b 100644 --- a/src/internet/jamendo/jamendoservice.h +++ b/src/internet/jamendo/jamendoservice.h @@ -22,7 +22,7 @@ #ifndef INTERNET_JAMENDOSERVICE_H_ #define INTERNET_JAMENDOSERVICE_H_ -#include "internetservice.h" +#include "internet/core/internetservice.h" #include diff --git a/src/internet/lastfm/lastfmservice.cpp b/src/internet/lastfm/lastfmservice.cpp index fc286f627..8ddb1de59 100644 --- a/src/internet/lastfm/lastfmservice.cpp +++ b/src/internet/lastfm/lastfmservice.cpp @@ -50,8 +50,8 @@ #endif #include "lastfmcompat.h" -#include "internetmodel.h" -#include "internetplaylistitem.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetplaylistitem.h" #include "core/application.h" #include "core/closure.h" #include "core/logging.h" diff --git a/src/internet/lastfm/lastfmservice.h b/src/internet/lastfm/lastfmservice.h index a5a3fa396..62a6c6b1a 100644 --- a/src/internet/lastfm/lastfmservice.h +++ b/src/internet/lastfm/lastfmservice.h @@ -34,7 +34,7 @@ uint qHash(const lastfm::Track& track); #include "lastfmcompat.h" -#include "internet/scrobbler.h" +#include "internet/core/scrobbler.h" class Application; class LastFMUrlHandler; diff --git a/src/internet/lastfm/lastfmsettingspage.cpp b/src/internet/lastfm/lastfmsettingspage.cpp index 8c915676a..22313aece 100644 --- a/src/internet/lastfm/lastfmsettingspage.cpp +++ b/src/internet/lastfm/lastfmsettingspage.cpp @@ -28,7 +28,7 @@ #include #include "lastfmservice.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "ui/iconloader.h" diff --git a/src/internet/magnatune/magnatunedownloaddialog.cpp b/src/internet/magnatune/magnatunedownloaddialog.cpp index 8e7ab4478..c502a0682 100644 --- a/src/internet/magnatune/magnatunedownloaddialog.cpp +++ b/src/internet/magnatune/magnatunedownloaddialog.cpp @@ -33,7 +33,7 @@ #include #include "magnatuneservice.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "ui_magnatunedownloaddialog.h" #include "core/logging.h" #include "core/network.h" diff --git a/src/internet/magnatune/magnatuneplaylistitem.cpp b/src/internet/magnatune/magnatuneplaylistitem.cpp index b60027509..3442ca020 100644 --- a/src/internet/magnatune/magnatuneplaylistitem.cpp +++ b/src/internet/magnatune/magnatuneplaylistitem.cpp @@ -19,7 +19,7 @@ */ #include "magnatuneplaylistitem.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" MagnatunePlaylistItem::MagnatunePlaylistItem(const QString& type) : LibraryPlaylistItem(type) {} diff --git a/src/internet/magnatune/magnatuneservice.cpp b/src/internet/magnatune/magnatuneservice.cpp index 25af13da8..9e3058dce 100644 --- a/src/internet/magnatune/magnatuneservice.cpp +++ b/src/internet/magnatune/magnatuneservice.cpp @@ -25,7 +25,7 @@ #include "magnatuneplaylistitem.h" #include "magnatuneservice.h" #include "magnatuneurlhandler.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/database.h" #include "core/logging.h" diff --git a/src/internet/magnatune/magnatuneservice.h b/src/internet/magnatune/magnatuneservice.h index 32f9a2789..9367cf554 100644 --- a/src/internet/magnatune/magnatuneservice.h +++ b/src/internet/magnatune/magnatuneservice.h @@ -22,7 +22,7 @@ #include -#include "internetservice.h" +#include "internet/core/internetservice.h" class QNetworkAccessManager; class QSortFilterProxyModel; diff --git a/src/internet/magnatune/magnatunesettingspage.cpp b/src/internet/magnatune/magnatunesettingspage.cpp index 1118bfca8..91c017a69 100644 --- a/src/internet/magnatune/magnatunesettingspage.cpp +++ b/src/internet/magnatune/magnatunesettingspage.cpp @@ -23,7 +23,7 @@ #include "core/network.h" #include "magnatuneservice.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "ui_magnatunesettingspage.h" #include diff --git a/src/internet/podcasts/addpodcastdialog.ui b/src/internet/podcasts/addpodcastdialog.ui index fa7e7095d..c3977f552 100644 --- a/src/internet/podcasts/addpodcastdialog.ui +++ b/src/internet/podcasts/addpodcastdialog.ui @@ -211,7 +211,7 @@ PodcastInfoWidget QWidget -
podcasts/podcastinfowidget.h
+
internet/podcasts/podcastinfowidget.h
1 diff --git a/src/internet/podcasts/podcastservice.cpp b/src/internet/podcasts/podcastservice.cpp index e693b3ab4..096e2fd80 100644 --- a/src/internet/podcasts/podcastservice.cpp +++ b/src/internet/podcasts/podcastservice.cpp @@ -18,7 +18,7 @@ along with Clementine. If not, see . */ -#include "podcastservice.h" +#include "internet/podcasts/podcastservice.h" #include #include @@ -31,13 +31,13 @@ #include "devices/devicemanager.h" #include "devices/devicestatefiltermodel.h" #include "devices/deviceview.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" #include "library/libraryview.h" #include "opmlcontainer.h" #include "podcastbackend.h" #include "podcastdeleter.h" #include "podcastdownloader.h" -#include "podcastservicemodel.h" +#include "internet/podcasts/podcastservicemodel.h" #include "podcastupdater.h" #include "ui/iconloader.h" #include "ui/organisedialog.h" diff --git a/src/internet/podcasts/podcastservice.h b/src/internet/podcasts/podcastservice.h index 4ab9583cf..52663bed0 100644 --- a/src/internet/podcasts/podcastservice.h +++ b/src/internet/podcasts/podcastservice.h @@ -23,8 +23,8 @@ #include "podcastdeleter.h" #include "podcastdownloader.h" -#include "internet/internetmodel.h" -#include "internet/internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" #include #include diff --git a/src/internet/podcasts/podcastservicemodel.cpp b/src/internet/podcasts/podcastservicemodel.cpp index 2a5ec20e6..f9cac09ef 100644 --- a/src/internet/podcasts/podcastservicemodel.cpp +++ b/src/internet/podcasts/podcastservicemodel.cpp @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#include "podcastservice.h" -#include "podcastservicemodel.h" +#include "internet/podcasts/podcastservice.h" +#include "internet/podcasts/podcastservicemodel.h" #include "playlist/songmimedata.h" PodcastServiceModel::PodcastServiceModel(QObject* parent) diff --git a/src/internet/podcasts/podcastsettingspage.cpp b/src/internet/podcasts/podcastsettingspage.cpp index 0d086f0e5..3915a7836 100644 --- a/src/internet/podcasts/podcastsettingspage.cpp +++ b/src/internet/podcasts/podcastsettingspage.cpp @@ -17,7 +17,7 @@ along with Clementine. If not, see . */ -#include "podcastsettingspage.h" +#include "internet/podcasts/podcastsettingspage.h" #include "ui_podcastsettingspage.h" #include diff --git a/src/internet/seafile/seafileservice.cpp b/src/internet/seafile/seafileservice.cpp index e5d5d56d1..27a5b4bed 100644 --- a/src/internet/seafile/seafileservice.cpp +++ b/src/internet/seafile/seafileservice.cpp @@ -28,9 +28,9 @@ #include "core/application.h" #include "core/player.h" #include "core/waitforsignal.h" -#include "internet/seafileurlhandler.h" +#include "internet/seafile/seafileurlhandler.h" #include "library/librarybackend.h" -#include "internet/oauthenticator.h" +#include "internet/core/oauthenticator.h" const char* SeafileService::kServiceName = "Seafile"; const char* SeafileService::kSettingsGroup = "Seafile"; diff --git a/src/internet/seafile/seafileservice.h b/src/internet/seafile/seafileservice.h index ce56c8c4e..ab47dd5d2 100644 --- a/src/internet/seafile/seafileservice.h +++ b/src/internet/seafile/seafileservice.h @@ -45,7 +45,7 @@ #ifndef INTERNET_SEAFILESERVICE_H_ #define INTERNET_SEAFILESERVICE_H_ -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" #include #include diff --git a/src/internet/seafile/seafilesettingspage.cpp b/src/internet/seafile/seafilesettingspage.cpp index df27fbb98..c30885c54 100644 --- a/src/internet/seafile/seafilesettingspage.cpp +++ b/src/internet/seafile/seafilesettingspage.cpp @@ -26,7 +26,7 @@ #include #include "seafileservice.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/logging.h" #include "core/network.h" #include "ui_seafilesettingspage.h" diff --git a/src/internet/seafile/seafiletree.h b/src/internet/seafile/seafiletree.h index 61e4d1b7b..0c9ef139f 100644 --- a/src/internet/seafile/seafiletree.h +++ b/src/internet/seafile/seafiletree.h @@ -28,7 +28,7 @@ #include #include -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" // Reproduce the file system of Seafile server libraries // Analog to a tree diff --git a/src/internet/skydrive/skydriveservice.cpp b/src/internet/skydrive/skydriveservice.cpp index 2126a9f9f..91bfce90c 100644 --- a/src/internet/skydrive/skydriveservice.cpp +++ b/src/internet/skydrive/skydriveservice.cpp @@ -26,8 +26,8 @@ #include "core/application.h" #include "core/player.h" #include "core/waitforsignal.h" -#include "internet/oauthenticator.h" -#include "internet/skydriveurlhandler.h" +#include "internet/core/oauthenticator.h" +#include "internet/skydrive/skydriveurlhandler.h" namespace { diff --git a/src/internet/skydrive/skydriveservice.h b/src/internet/skydrive/skydriveservice.h index a7f866167..0bae32d05 100644 --- a/src/internet/skydrive/skydriveservice.h +++ b/src/internet/skydrive/skydriveservice.h @@ -20,7 +20,7 @@ #ifndef INTERNET_SKYDRIVESERVICE_H_ #define INTERNET_SKYDRIVESERVICE_H_ -#include "cloudfileservice.h" +#include "internet/core/cloudfileservice.h" #include diff --git a/src/internet/skydrive/skydrivesettingspage.cpp b/src/internet/skydrive/skydrivesettingspage.cpp index 20f111687..7dfe83ad2 100644 --- a/src/internet/skydrive/skydrivesettingspage.cpp +++ b/src/internet/skydrive/skydrivesettingspage.cpp @@ -22,8 +22,8 @@ #include "ui_skydrivesettingspage.h" #include "core/application.h" -#include "internet/skydriveservice.h" -#include "internet/internetmodel.h" +#include "internet/skydrive/skydriveservice.h" +#include "internet/core/internetmodel.h" #include "ui/settingsdialog.h" SkydriveSettingsPage::SkydriveSettingsPage(SettingsDialog* parent) diff --git a/src/internet/somafm/somafmservice.cpp b/src/internet/somafm/somafmservice.cpp index 346980078..77cdec317 100644 --- a/src/internet/somafm/somafmservice.cpp +++ b/src/internet/somafm/somafmservice.cpp @@ -21,7 +21,7 @@ #include "somafmservice.h" #include "somafmurlhandler.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "core/application.h" #include "core/closure.h" #include "core/logging.h" diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h index 025a95fe1..9607c7a2f 100644 --- a/src/internet/somafm/somafmservice.h +++ b/src/internet/somafm/somafmservice.h @@ -23,7 +23,7 @@ #include -#include "internetservice.h" +#include "internet/core/internetservice.h" #include "core/cachedlist.h" class SomaFMUrlHandler; diff --git a/src/internet/somafm/somafmurlhandler.cpp b/src/internet/somafm/somafmurlhandler.cpp index a0ed32b59..3afda66f8 100644 --- a/src/internet/somafm/somafmurlhandler.cpp +++ b/src/internet/somafm/somafmurlhandler.cpp @@ -19,7 +19,7 @@ along with Clementine. If not, see . */ -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "somafmservice.h" #include "somafmurlhandler.h" #include "core/application.h" diff --git a/src/internet/soundcloud/soundcloudservice.cpp b/src/internet/soundcloud/soundcloudservice.cpp index ba8038106..4883afa96 100644 --- a/src/internet/soundcloud/soundcloudservice.cpp +++ b/src/internet/soundcloud/soundcloudservice.cpp @@ -29,9 +29,9 @@ #include #include -#include "internetmodel.h" -#include "oauthenticator.h" -#include "searchboxwidget.h" +#include "internet/core/internetmodel.h" +#include "internet/core/oauthenticator.h" +#include "internet/core/searchboxwidget.h" #include "core/application.h" #include "core/closure.h" diff --git a/src/internet/soundcloud/soundcloudservice.h b/src/internet/soundcloud/soundcloudservice.h index 05340c8a3..83d335a4f 100644 --- a/src/internet/soundcloud/soundcloudservice.h +++ b/src/internet/soundcloud/soundcloudservice.h @@ -20,8 +20,8 @@ #ifndef INTERNET_SOUNDCLOUDSERVICE_H_ #define INTERNET_SOUNDCLOUDSERVICE_H_ -#include "internetmodel.h" -#include "internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" class NetworkAccessManager; class OAuthenticator; diff --git a/src/internet/soundcloud/soundcloudsettingspage.cpp b/src/internet/soundcloud/soundcloudsettingspage.cpp index 8b4eb97c9..4382a4f5e 100644 --- a/src/internet/soundcloud/soundcloudsettingspage.cpp +++ b/src/internet/soundcloud/soundcloudsettingspage.cpp @@ -20,7 +20,7 @@ #include "soundcloudsettingspage.h" #include "ui_soundcloudsettingspage.h" #include "core/application.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" SoundCloudSettingsPage::SoundCloudSettingsPage(SettingsDialog* parent) : SettingsPage(parent), diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp index 78611068f..0e93a3e16 100644 --- a/src/internet/spotify/spotifyservice.cpp +++ b/src/internet/spotify/spotifyservice.cpp @@ -23,8 +23,8 @@ #include "blobversion.h" #include "config.h" -#include "internetmodel.h" -#include "searchboxwidget.h" +#include "internet/core/internetmodel.h" +#include "internet/core/searchboxwidget.h" #include "spotifyserver.h" #include "spotifyservice.h" #include "core/application.h" diff --git a/src/internet/spotify/spotifyservice.h b/src/internet/spotify/spotifyservice.h index 5c236f0ef..5d446b00d 100644 --- a/src/internet/spotify/spotifyservice.h +++ b/src/internet/spotify/spotifyservice.h @@ -22,8 +22,8 @@ #ifndef INTERNET_SPOTIFYSERVICE_H_ #define INTERNET_SPOTIFYSERVICE_H_ -#include "internetmodel.h" -#include "internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" #include "spotifymessages.pb.h" #include diff --git a/src/internet/spotify/spotifysettingspage.cpp b/src/internet/spotify/spotifysettingspage.cpp index 480c37ac4..31c823f22 100644 --- a/src/internet/spotify/spotifysettingspage.cpp +++ b/src/internet/spotify/spotifysettingspage.cpp @@ -24,7 +24,7 @@ #include "config.h" #include "spotifymessages.pb.h" #include "spotifyservice.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include "ui_spotifysettingspage.h" #include "core/network.h" #include "ui/iconloader.h" diff --git a/src/internet/subsonic/subsonicservice.cpp b/src/internet/subsonic/subsonicservice.cpp index 689bba31d..a67ee8298 100644 --- a/src/internet/subsonic/subsonicservice.cpp +++ b/src/internet/subsonic/subsonicservice.cpp @@ -41,8 +41,8 @@ #include "core/utilities.h" #include "globalsearch/globalsearch.h" #include "globalsearch/librarysearchprovider.h" -#include "internet/internetmodel.h" -#include "internet/subsonicurlhandler.h" +#include "internet/core/internetmodel.h" +#include "internet/subsonic/subsonicurlhandler.h" #include "library/librarybackend.h" #include "library/libraryfilterwidget.h" #include "ui/iconloader.h" diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h index 50a013a9f..a89279263 100644 --- a/src/internet/subsonic/subsonicservice.h +++ b/src/internet/subsonic/subsonicservice.h @@ -24,8 +24,8 @@ #include -#include "internet/internetmodel.h" -#include "internet/internetservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetservice.h" class QNetworkAccessManager; class QNetworkReply; diff --git a/src/internet/subsonic/subsonicsettingspage.cpp b/src/internet/subsonic/subsonicsettingspage.cpp index 970920faf..416cc789e 100644 --- a/src/internet/subsonic/subsonicsettingspage.cpp +++ b/src/internet/subsonic/subsonicsettingspage.cpp @@ -21,7 +21,7 @@ #include "subsonicsettingspage.h" #include "ui_subsonicsettingspage.h" #include "core/logging.h" -#include "internetmodel.h" +#include "internet/core/internetmodel.h" #include diff --git a/src/internet/vk/vkconnection.cpp b/src/internet/vk/vkconnection.cpp index 46523cfbb..d7029143c 100644 --- a/src/internet/vk/vkconnection.cpp +++ b/src/internet/vk/vkconnection.cpp @@ -24,7 +24,7 @@ #include "core/closure.h" #include "core/logging.h" -#include "internet/localredirectserver.h" +#include "internet/core/localredirectserver.h" #include "vreen/utils.h" #include "vkservice.h" diff --git a/src/internet/vk/vkservice.cpp b/src/internet/vk/vkservice.cpp index 1471cf1b1..65885d546 100644 --- a/src/internet/vk/vkservice.cpp +++ b/src/internet/vk/vkservice.cpp @@ -44,9 +44,9 @@ #include "widgets/didyoumean.h" #include "globalsearch/globalsearch.h" -#include "internetmodel.h" -#include "internetplaylistitem.h" -#include "searchboxwidget.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetplaylistitem.h" +#include "internet/core/searchboxwidget.h" #include "vreen/audio.h" #include "vreen/contact.h" diff --git a/src/internet/vk/vkservice.h b/src/internet/vk/vkservice.h index 9c8566d5e..02363785f 100644 --- a/src/internet/vk/vkservice.h +++ b/src/internet/vk/vkservice.h @@ -22,8 +22,8 @@ #include -#include "internetservice.h" -#include "internetmodel.h" +#include "internet/core/internetservice.h" +#include "internet/core/internetmodel.h" #include "core/song.h" #include "vreen/audio.h" diff --git a/src/internet/vk/vksettingspage.cpp b/src/internet/vk/vksettingspage.cpp index fd31087ae..70f38315d 100644 --- a/src/internet/vk/vksettingspage.cpp +++ b/src/internet/vk/vksettingspage.cpp @@ -24,7 +24,7 @@ #include "ui_vksettingspage.h" #include "core/application.h" #include "core/logging.h" -#include "internet/vkservice.h" +#include "internet/vk/vkservice.h" VkSettingsPage::VkSettingsPage(SettingsDialog* parent) : SettingsPage(parent), diff --git a/src/main.cpp b/src/main.cpp index 3eb1a9bf9..26d8a9505 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -89,7 +89,7 @@ #endif #ifdef HAVE_LIBLASTFM -#include "internet/lastfmservice.h" +#include "internet/lastfm/lastfmservice.h" #else class LastFMService; #endif diff --git a/src/networkremote/incomingdataparser.cpp b/src/networkremote/incomingdataparser.cpp index d3be9cbac..e763616d6 100644 --- a/src/networkremote/incomingdataparser.cpp +++ b/src/networkremote/incomingdataparser.cpp @@ -21,13 +21,13 @@ #include "core/logging.h" #include "engines/enginebase.h" -#include "internet/internetmodel.h" +#include "internet/core/internetmodel.h" #include "playlist/playlistmanager.h" #include "playlist/playlistsequence.h" #include "playlist/playlist.h" #ifdef HAVE_LIBLASTFM -#include "internet/lastfmservice.h" +#include "internet/lastfm/lastfmservice.h" #endif IncomingDataParser::IncomingDataParser(Application* app) : app_(app) { diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index a5a04e258..bc2d2c4b6 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -51,15 +51,15 @@ #include "core/qhash_qurl.h" #include "core/tagreaderclient.h" #include "core/timeconstants.h" -#include "internet/jamendoplaylistitem.h" -#include "internet/jamendoservice.h" -#include "internet/magnatuneplaylistitem.h" -#include "internet/magnatuneservice.h" -#include "internet/internetmimedata.h" -#include "internet/internetmodel.h" -#include "internet/internetplaylistitem.h" -#include "internet/internetsongmimedata.h" -#include "internet/savedradio.h" +#include "internet/jamendo/jamendoplaylistitem.h" +#include "internet/jamendo/jamendoservice.h" +#include "internet/magnatune/magnatuneplaylistitem.h" +#include "internet/magnatune/magnatuneservice.h" +#include "internet/core/internetmimedata.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetplaylistitem.h" +#include "internet/core/internetsongmimedata.h" +#include "internet/internetradio/savedradio.h" #include "library/library.h" #include "library/librarybackend.h" #include "library/librarymodel.h" diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp index fa42cd4f1..55c7cdb03 100644 --- a/src/playlist/playlistitem.cpp +++ b/src/playlist/playlistitem.cpp @@ -19,11 +19,11 @@ #include "songplaylistitem.h" #include "core/logging.h" #include "core/song.h" -#include "internet/jamendoplaylistitem.h" -#include "internet/jamendoservice.h" -#include "internet/magnatuneplaylistitem.h" -#include "internet/magnatuneservice.h" -#include "internet/internetplaylistitem.h" +#include "internet/jamendo/jamendoplaylistitem.h" +#include "internet/jamendo/jamendoservice.h" +#include "internet/magnatune/magnatuneplaylistitem.h" +#include "internet/magnatune/magnatuneservice.h" +#include "internet/core/internetplaylistitem.h" #include "library/library.h" #include "library/libraryplaylistitem.h" diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index f9b397a98..9bc70a593 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -21,7 +21,7 @@ #include "playlistview.h" #include "songmimedata.h" #include "core/logging.h" -#include "internet/internetmimedata.h" +#include "internet/core/internetmimedata.h" #include "ui/iconloader.h" #include "widgets/renametablineedit.h" #include "widgets/favoritewidget.h" diff --git a/src/smartplaylists/generator.cpp b/src/smartplaylists/generator.cpp index b8a935128..961e9c4f9 100644 --- a/src/smartplaylists/generator.cpp +++ b/src/smartplaylists/generator.cpp @@ -18,7 +18,7 @@ #include "generator.h" #include "querygenerator.h" #include "core/logging.h" -#include "internet/jamendodynamicplaylist.h" +#include "internet/jamendo/jamendodynamicplaylist.h" #include diff --git a/src/songinfo/lastfmtrackinfoprovider.cpp b/src/songinfo/lastfmtrackinfoprovider.cpp index 72bbbccb3..b00e98910 100644 --- a/src/songinfo/lastfmtrackinfoprovider.cpp +++ b/src/songinfo/lastfmtrackinfoprovider.cpp @@ -19,7 +19,7 @@ #include "songinfotextview.h" #include "songplaystats.h" #include "tagwidget.h" -#include "internet/lastfmcompat.h" +#include "internet/lastfm/lastfmcompat.h" #include "ui/iconloader.h" void LastfmTrackInfoProvider::FetchInfo(int id, const Song& metadata) { diff --git a/src/songinfo/songkickconcerts.h b/src/songinfo/songkickconcerts.h index e205011f1..606909f26 100644 --- a/src/songinfo/songkickconcerts.h +++ b/src/songinfo/songkickconcerts.h @@ -22,7 +22,7 @@ #include "core/network.h" #include "core/override.h" -#include "internet/geolocator.h" +#include "internet/core/geolocator.h" class QNetworkReply; class SongInfoTextView; diff --git a/src/songinfo/tagwidget.cpp b/src/songinfo/tagwidget.cpp index 828306291..951265d65 100644 --- a/src/songinfo/tagwidget.cpp +++ b/src/songinfo/tagwidget.cpp @@ -16,9 +16,9 @@ */ #include "tagwidget.h" -#include "internet/lastfmservice.h" -#include "internet/internetmimedata.h" -#include "internet/internetmodel.h" +#include "internet/lastfm/lastfmservice.h" +#include "internet/core/internetmimedata.h" +#include "internet/core/internetmodel.h" #include "playlist/playlistitemmimedata.h" #include "smartplaylists/generator.h" #include "smartplaylists/generatormimedata.h" diff --git a/src/ui/addstreamdialog.cpp b/src/ui/addstreamdialog.cpp index cdf90cbc5..e33837f91 100644 --- a/src/ui/addstreamdialog.cpp +++ b/src/ui/addstreamdialog.cpp @@ -17,8 +17,8 @@ #include "addstreamdialog.h" #include "ui_addstreamdialog.h" -#include "internet/internetmodel.h" -#include "internet/savedradio.h" +#include "internet/core/internetmodel.h" +#include "internet/internetradio/savedradio.h" #include #include diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index f6d5240ce..736762b2a 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -71,11 +71,11 @@ #include "globalsearch/globalsearch.h" #include "globalsearch/globalsearchview.h" #include "globalsearch/librarysearchprovider.h" -#include "internet/magnatuneservice.h" -#include "internet/internetmodel.h" -#include "internet/internetview.h" -#include "internet/internetviewcontainer.h" -#include "internet/savedradio.h" +#include "internet/magnatune/magnatuneservice.h" +#include "internet/core/internetmodel.h" +#include "internet/core/internetview.h" +#include "internet/core/internetviewcontainer.h" +#include "internet/internetradio/savedradio.h" #include "library/groupbydialog.h" #include "library/library.h" #include "library/librarybackend.h" @@ -94,7 +94,7 @@ #include "playlist/queuemanager.h" #include "playlist/songplaylistitem.h" #include "playlistparsers/playlistparser.h" -#include "podcasts/podcastservice.h" +#include "internet/podcasts/podcastservice.h" #include "smartplaylists/generator.h" #include "smartplaylists/generatormimedata.h" #include "songinfo/artistinfoview.h" @@ -130,7 +130,7 @@ #endif #ifdef HAVE_LIBLASTFM -#include "internet/lastfmservice.h" +#include "internet/lastfm/lastfmservice.h" #endif #ifdef HAVE_WIIMOTEDEV @@ -147,7 +147,7 @@ #endif #ifdef HAVE_VK -#include "internet/vkservice.h" +#include "internet/vk/vkservice.h" #endif #include diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index ab9f824d5..b82e00a27 100644 --- a/src/ui/settingsdialog.cpp +++ b/src/ui/settingsdialog.cpp @@ -35,16 +35,16 @@ #include "engines/enginebase.h" #include "engines/gstengine.h" #include "globalsearch/globalsearchsettingspage.h" -#include "internet/digitallyimportedsettingspage.h" -#include "internet/groovesharksettingspage.h" -#include "internet/internetshowsettingspage.h" -#include "internet/magnatunesettingspage.h" -#include "internet/soundcloudsettingspage.h" -#include "internet/spotifysettingspage.h" -#include "internet/subsonicsettingspage.h" +#include "internet/digitally/digitallyimportedsettingspage.h" +#include "internet/grooveshark/groovesharksettingspage.h" +#include "internet/core/internetshowsettingspage.h" +#include "internet/magnatune/magnatunesettingspage.h" +#include "internet/soundcloud/soundcloudsettingspage.h" +#include "internet/spotify/spotifysettingspage.h" +#include "internet/subsonic/subsonicsettingspage.h" #include "library/librarysettingspage.h" #include "playlist/playlistview.h" -#include "podcasts/podcastsettingspage.h" +#include "internet/podcasts/podcastsettingspage.h" #include "songinfo/songinfosettingspage.h" #include "transcoder/transcodersettingspage.h" #include "widgets/groupediconview.h" @@ -53,7 +53,7 @@ #include "ui_settingsdialog.h" #ifdef HAVE_LIBLASTFM -#include "internet/lastfmsettingspage.h" +#include "internet/lastfm/lastfmsettingspage.h" #endif #ifdef HAVE_WIIMOTEDEV @@ -61,27 +61,27 @@ #endif #ifdef HAVE_GOOGLE_DRIVE -#include "internet/googledrivesettingspage.h" +#include "internet/googledrive/googledrivesettingspage.h" #endif #ifdef HAVE_DROPBOX -#include "internet/dropboxsettingspage.h" +#include "internet/dropbox/dropboxsettingspage.h" #endif #ifdef HAVE_BOX -#include "internet/boxsettingspage.h" +#include "internet/box/boxsettingspage.h" #endif #ifdef HAVE_VK -#include "internet/vksettingspage.h" +#include "internet/vk/vksettingspage.h" #endif #ifdef HAVE_SKYDRIVE -#include "internet/skydrivesettingspage.h" +#include "internet/skydrive/skydrivesettingspage.h" #endif #ifdef HAVE_SEAFILE -#include "internet/seafilesettingspage.h" +#include "internet/seafile/seafilesettingspage.h" #endif #include From 23ee9170b698f124319a6dbc56003e277d73a672 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Thu, 18 Dec 2014 23:54:21 +0100 Subject: [PATCH 6/8] Fix header guards in internet/ --- src/internet/box/boxservice.h | 6 +++--- src/internet/box/boxsettingspage.h | 6 +++--- src/internet/box/boxurlhandler.h | 6 +++--- src/internet/core/cloudfilesearchprovider.h | 6 +++--- src/internet/core/cloudfileservice.h | 6 +++--- src/internet/core/geolocator.h | 6 +++--- src/internet/core/internetmimedata.h | 6 +++--- src/internet/core/internetmodel.h | 6 +++--- src/internet/core/internetplaylistitem.h | 6 +++--- src/internet/core/internetservice.h | 6 +++--- src/internet/core/internetshowsettingspage.h | 6 +++--- src/internet/core/internetsongmimedata.h | 6 +++--- src/internet/core/internetview.h | 6 +++--- src/internet/core/internetviewcontainer.h | 6 +++--- src/internet/core/localredirectserver.h | 6 +++--- src/internet/core/oauthenticator.h | 6 +++--- src/internet/core/scrobbler.h | 6 +++--- src/internet/core/searchboxwidget.h | 6 +++--- src/internet/digitally/digitallyimportedclient.h | 6 +++--- src/internet/digitally/digitallyimportedservicebase.h | 6 +++--- src/internet/digitally/digitallyimportedsettingspage.h | 6 +++--- src/internet/digitally/digitallyimportedurlhandler.h | 6 +++--- src/internet/dropbox/dropboxauthenticator.h | 6 +++--- src/internet/dropbox/dropboxservice.h | 6 +++--- src/internet/dropbox/dropboxsettingspage.h | 6 +++--- src/internet/dropbox/dropboxurlhandler.h | 6 +++--- src/internet/googledrive/googledriveclient.h | 6 +++--- src/internet/googledrive/googledriveservice.h | 6 +++--- src/internet/googledrive/googledrivesettingspage.h | 6 +++--- src/internet/googledrive/googledriveurlhandler.h | 6 +++--- src/internet/grooveshark/groovesharkradio.h | 6 +++--- src/internet/grooveshark/groovesharkservice.h | 6 +++--- src/internet/grooveshark/groovesharksettingspage.h | 6 +++--- src/internet/grooveshark/groovesharkurlhandler.h | 6 +++--- src/internet/icecast/icecastbackend.h | 6 +++--- src/internet/icecast/icecastfilterwidget.h | 6 +++--- src/internet/icecast/icecastitem.h | 6 +++--- src/internet/icecast/icecastmodel.h | 6 +++--- src/internet/icecast/icecastservice.h | 6 +++--- src/internet/internetradio/savedradio.h | 6 +++--- src/internet/jamendo/jamendodynamicplaylist.h | 6 +++--- src/internet/jamendo/jamendoplaylistitem.h | 6 +++--- src/internet/jamendo/jamendoservice.h | 6 +++--- src/internet/lastfm/fixlastfm.h | 6 +++--- src/internet/lastfm/lastfmcompat.h | 6 +++--- src/internet/lastfm/lastfmservice.h | 6 +++--- src/internet/lastfm/lastfmsettingspage.h | 6 +++--- src/internet/lastfm/lastfmurlhandler.h | 6 +++--- src/internet/magnatune/magnatunedownloaddialog.h | 6 +++--- src/internet/magnatune/magnatuneplaylistitem.h | 6 +++--- src/internet/magnatune/magnatuneservice.h | 6 +++--- src/internet/magnatune/magnatunesettingspage.h | 6 +++--- src/internet/magnatune/magnatuneurlhandler.h | 6 +++--- src/internet/podcasts/addpodcastbyurl.h | 6 +++--- src/internet/podcasts/addpodcastdialog.h | 6 +++--- src/internet/podcasts/addpodcastpage.h | 6 +++--- src/internet/podcasts/fixedopmlpage.h | 6 +++--- src/internet/podcasts/gpoddersearchpage.h | 6 +++--- src/internet/podcasts/gpoddersync.h | 6 +++--- src/internet/podcasts/gpoddertoptagsmodel.h | 6 +++--- src/internet/podcasts/gpoddertoptagspage.h | 6 +++--- src/internet/podcasts/itunessearchpage.h | 6 +++--- src/internet/podcasts/opmlcontainer.h | 6 +++--- src/internet/podcasts/podcast.h | 6 +++--- src/internet/podcasts/podcastbackend.h | 6 +++--- src/internet/podcasts/podcastdeleter.h | 6 +++--- src/internet/podcasts/podcastdiscoverymodel.h | 6 +++--- src/internet/podcasts/podcastdownloader.h | 6 +++--- src/internet/podcasts/podcastepisode.h | 6 +++--- src/internet/podcasts/podcastinfowidget.h | 6 +++--- src/internet/podcasts/podcastparser.h | 6 +++--- src/internet/podcasts/podcastservice.h | 6 +++--- src/internet/podcasts/podcastservicemodel.h | 6 +++--- src/internet/podcasts/podcastsettingspage.h | 6 +++--- src/internet/podcasts/podcastupdater.h | 6 +++--- src/internet/podcasts/podcasturlloader.h | 6 +++--- src/internet/seafile/seafileservice.h | 6 +++--- src/internet/seafile/seafilesettingspage.h | 6 +++--- src/internet/seafile/seafiletree.h | 6 +++--- src/internet/seafile/seafileurlhandler.h | 6 +++--- src/internet/skydrive/skydriveservice.h | 6 +++--- src/internet/skydrive/skydrivesettingspage.h | 6 +++--- src/internet/skydrive/skydriveurlhandler.h | 6 +++--- src/internet/somafm/somafmservice.h | 6 +++--- src/internet/somafm/somafmurlhandler.h | 6 +++--- src/internet/soundcloud/soundcloudservice.h | 6 +++--- src/internet/soundcloud/soundcloudsettingspage.h | 6 +++--- src/internet/spotify/spotifyblobdownloader.h | 6 +++--- src/internet/spotify/spotifyserver.h | 6 +++--- src/internet/spotify/spotifyservice.h | 6 +++--- src/internet/spotify/spotifysettingspage.h | 6 +++--- src/internet/subsonic/subsonicservice.h | 6 +++--- src/internet/subsonic/subsonicsettingspage.h | 6 +++--- src/internet/subsonic/subsonicurlhandler.h | 6 +++--- src/internet/vk/vkconnection.h | 6 +++--- src/internet/vk/vkmusiccache.h | 6 +++--- src/internet/vk/vksearchdialog.h | 6 +++--- src/internet/vk/vkservice.h | 6 +++--- src/internet/vk/vksettingspage.h | 6 +++--- src/internet/vk/vkurlhandler.h | 6 +++--- 100 files changed, 300 insertions(+), 300 deletions(-) diff --git a/src/internet/box/boxservice.h b/src/internet/box/boxservice.h index d7c54d8f2..9748f680e 100644 --- a/src/internet/box/boxservice.h +++ b/src/internet/box/boxservice.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_BOXSERVICE_H_ -#define INTERNET_BOXSERVICE_H_ +#ifndef INTERNET_BOX_BOXSERVICE_H_ +#define INTERNET_BOX_BOXSERVICE_H_ #include "internet/core/cloudfileservice.h" @@ -71,4 +71,4 @@ class BoxService : public CloudFileService { QDateTime expiry_time_; }; -#endif // INTERNET_BOXSERVICE_H_ +#endif // INTERNET_BOX_BOXSERVICE_H_ diff --git a/src/internet/box/boxsettingspage.h b/src/internet/box/boxsettingspage.h index afa476287..b7a85c558 100644 --- a/src/internet/box/boxsettingspage.h +++ b/src/internet/box/boxsettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_BOXSETTINGSPAGE_H_ -#define INTERNET_BOXSETTINGSPAGE_H_ +#ifndef INTERNET_BOX_BOXSETTINGSPAGE_H_ +#define INTERNET_BOX_BOXSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -51,4 +51,4 @@ class BoxSettingsPage : public SettingsPage { BoxService* service_; }; -#endif // INTERNET_BOXSETTINGSPAGE_H_ +#endif // INTERNET_BOX_BOXSETTINGSPAGE_H_ diff --git a/src/internet/box/boxurlhandler.h b/src/internet/box/boxurlhandler.h index cd9f6bbee..770b18119 100644 --- a/src/internet/box/boxurlhandler.h +++ b/src/internet/box/boxurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_BOXURLHANDLER_H_ -#define INTERNET_BOXURLHANDLER_H_ +#ifndef INTERNET_BOX_BOXURLHANDLER_H_ +#define INTERNET_BOX_BOXURLHANDLER_H_ #include "core/urlhandler.h" @@ -37,4 +37,4 @@ class BoxUrlHandler : public UrlHandler { BoxService* service_; }; -#endif // INTERNET_BOXURLHANDLER_H_ +#endif // INTERNET_BOX_BOXURLHANDLER_H_ diff --git a/src/internet/core/cloudfilesearchprovider.h b/src/internet/core/cloudfilesearchprovider.h index c514af7f1..2fc3f9d22 100644 --- a/src/internet/core/cloudfilesearchprovider.h +++ b/src/internet/core/cloudfilesearchprovider.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_CLOUDFILESEARCHPROVIDER_H_ -#define INTERNET_CLOUDFILESEARCHPROVIDER_H_ +#ifndef INTERNET_CORE_CLOUDFILESEARCHPROVIDER_H_ +#define INTERNET_CORE_CLOUDFILESEARCHPROVIDER_H_ #include "globalsearch/librarysearchprovider.h" @@ -36,4 +36,4 @@ class CloudFileSearchProvider : public LibrarySearchProvider { CloudFileService* service_; }; -#endif // INTERNET_CLOUDFILESEARCHPROVIDER_H_ +#endif // INTERNET_CORE_CLOUDFILESEARCHPROVIDER_H_ diff --git a/src/internet/core/cloudfileservice.h b/src/internet/core/cloudfileservice.h index d6fce75fb..304598cfa 100644 --- a/src/internet/core/cloudfileservice.h +++ b/src/internet/core/cloudfileservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_CLOUDFILESERVICE_H_ -#define INTERNET_CLOUDFILESERVICE_H_ +#ifndef INTERNET_CORE_CLOUDFILESERVICE_H_ +#define INTERNET_CORE_CLOUDFILESERVICE_H_ #include "internet/core/internetservice.h" @@ -96,4 +96,4 @@ class CloudFileService : public InternetService { int indexing_task_max_; }; -#endif // INTERNET_CLOUDFILESERVICE_H_ +#endif // INTERNET_CORE_CLOUDFILESERVICE_H_ diff --git a/src/internet/core/geolocator.h b/src/internet/core/geolocator.h index 461836a5d..43f0a0fc0 100644 --- a/src/internet/core/geolocator.h +++ b/src/internet/core/geolocator.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GEOLOCATOR_H_ -#define INTERNET_GEOLOCATOR_H_ +#ifndef INTERNET_CORE_GEOLOCATOR_H_ +#define INTERNET_CORE_GEOLOCATOR_H_ #include @@ -65,4 +65,4 @@ class Geolocator : public QObject { QDebug operator<<(QDebug dbg, const Geolocator::LatLng& ll); Q_DECLARE_METATYPE(Geolocator::LatLng); -#endif // INTERNET_GEOLOCATOR_H_ +#endif // INTERNET_CORE_GEOLOCATOR_H_ diff --git a/src/internet/core/internetmimedata.h b/src/internet/core/internetmimedata.h index 3b844f8ff..b9257c825 100644 --- a/src/internet/core/internetmimedata.h +++ b/src/internet/core/internetmimedata.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETMIMEDATA_H_ -#define INTERNET_INTERNETMIMEDATA_H_ +#ifndef INTERNET_CORE_INTERNETMIMEDATA_H_ +#define INTERNET_CORE_INTERNETMIMEDATA_H_ #include "core/mimedata.h" @@ -38,4 +38,4 @@ class InternetMimeData : public MimeData { QModelIndexList indexes; }; -#endif // INTERNET_INTERNETMIMEDATA_H_ +#endif // INTERNET_CORE_INTERNETMIMEDATA_H_ diff --git a/src/internet/core/internetmodel.h b/src/internet/core/internetmodel.h index 19ca2db11..2941648fb 100644 --- a/src/internet/core/internetmodel.h +++ b/src/internet/core/internetmodel.h @@ -20,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETMODEL_H_ -#define INTERNET_INTERNETMODEL_H_ +#ifndef INTERNET_CORE_INTERNETMODEL_H_ +#define INTERNET_CORE_INTERNETMODEL_H_ #include "core/song.h" #include "library/librarymodel.h" @@ -198,4 +198,4 @@ class InternetModel : public QStandardItemModel { QModelIndex current_index_; }; -#endif // INTERNET_INTERNETMODEL_H_ +#endif // INTERNET_CORE_INTERNETMODEL_H_ diff --git a/src/internet/core/internetplaylistitem.h b/src/internet/core/internetplaylistitem.h index 83b0c93ed..41cb77d09 100644 --- a/src/internet/core/internetplaylistitem.h +++ b/src/internet/core/internetplaylistitem.h @@ -19,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETPLAYLISTITEM_H_ -#define INTERNET_INTERNETPLAYLISTITEM_H_ +#ifndef INTERNET_CORE_INTERNETPLAYLISTITEM_H_ +#define INTERNET_CORE_INTERNETPLAYLISTITEM_H_ #include "core/song.h" #include "playlist/playlistitem.h" @@ -59,4 +59,4 @@ class InternetPlaylistItem : public PlaylistItem { Song metadata_; }; -#endif // INTERNET_INTERNETPLAYLISTITEM_H_ +#endif // INTERNET_CORE_INTERNETPLAYLISTITEM_H_ diff --git a/src/internet/core/internetservice.h b/src/internet/core/internetservice.h index f30342be6..fe141d358 100644 --- a/src/internet/core/internetservice.h +++ b/src/internet/core/internetservice.h @@ -20,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETSERVICE_H_ -#define INTERNET_INTERNETSERVICE_H_ +#ifndef INTERNET_CORE_INTERNETSERVICE_H_ +#define INTERNET_CORE_INTERNETSERVICE_H_ #include #include @@ -139,4 +139,4 @@ class InternetService : public QObject { Q_DECLARE_METATYPE(InternetService*); -#endif // INTERNET_INTERNETSERVICE_H_ +#endif // INTERNET_CORE_INTERNETSERVICE_H_ diff --git a/src/internet/core/internetshowsettingspage.h b/src/internet/core/internetshowsettingspage.h index f3b653d44..12cce64ae 100644 --- a/src/internet/core/internetshowsettingspage.h +++ b/src/internet/core/internetshowsettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETSHOWSETTINGSPAGE_H_ -#define INTERNET_INTERNETSHOWSETTINGSPAGE_H_ +#ifndef INTERNET_CORE_INTERNETSHOWSETTINGSPAGE_H_ +#define INTERNET_CORE_INTERNETSHOWSETTINGSPAGE_H_ #include "ui/settingspage.h" #include "ui_internetshowsettingspage.h" @@ -40,4 +40,4 @@ class InternetShowSettingsPage : public SettingsPage { std::unique_ptr ui_; }; -#endif // INTERNET_INTERNETSHOWSETTINGSPAGE_H_ +#endif // INTERNET_CORE_INTERNETSHOWSETTINGSPAGE_H_ diff --git a/src/internet/core/internetsongmimedata.h b/src/internet/core/internetsongmimedata.h index 8788dfba6..9e11f7796 100644 --- a/src/internet/core/internetsongmimedata.h +++ b/src/internet/core/internetsongmimedata.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETSONGMIMEDATA_H_ -#define INTERNET_INTERNETSONGMIMEDATA_H_ +#ifndef INTERNET_CORE_INTERNETSONGMIMEDATA_H_ +#define INTERNET_CORE_INTERNETSONGMIMEDATA_H_ #include "core/mimedata.h" #include "core/song.h" @@ -35,4 +35,4 @@ class InternetSongMimeData : public MimeData { SongList songs; }; -#endif // INTERNET_INTERNETSONGMIMEDATA_H_ +#endif // INTERNET_CORE_INTERNETSONGMIMEDATA_H_ diff --git a/src/internet/core/internetview.h b/src/internet/core/internetview.h index e01f1b9f5..ec3f5c78f 100644 --- a/src/internet/core/internetview.h +++ b/src/internet/core/internetview.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETVIEW_H_ -#define INTERNET_INTERNETVIEW_H_ +#ifndef INTERNET_CORE_INTERNETVIEW_H_ +#define INTERNET_CORE_INTERNETVIEW_H_ #include "widgets/autoexpandingtreeview.h" @@ -40,4 +40,4 @@ class InternetView : public AutoExpandingTreeView { void CurrentIndexChanged(const QModelIndex& index); }; -#endif // INTERNET_INTERNETVIEW_H_ +#endif // INTERNET_CORE_INTERNETVIEW_H_ diff --git a/src/internet/core/internetviewcontainer.h b/src/internet/core/internetviewcontainer.h index 5eb281419..a820f71c4 100644 --- a/src/internet/core/internetviewcontainer.h +++ b/src/internet/core/internetviewcontainer.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_INTERNETVIEWCONTAINER_H_ -#define INTERNET_INTERNETVIEWCONTAINER_H_ +#ifndef INTERNET_CORE_INTERNETVIEWCONTAINER_H_ +#define INTERNET_CORE_INTERNETVIEWCONTAINER_H_ #include #include @@ -74,4 +74,4 @@ class InternetViewContainer : public QWidget { QMap headers_; }; -#endif // INTERNET_INTERNETVIEWCONTAINER_H_ +#endif // INTERNET_CORE_INTERNETVIEWCONTAINER_H_ diff --git a/src/internet/core/localredirectserver.h b/src/internet/core/localredirectserver.h index 4e27525f9..b54b04ec7 100644 --- a/src/internet/core/localredirectserver.h +++ b/src/internet/core/localredirectserver.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_LOCALREDIRECTSERVER_H_ -#define INTERNET_LOCALREDIRECTSERVER_H_ +#ifndef INTERNET_CORE_LOCALREDIRECTSERVER_H_ +#define INTERNET_CORE_LOCALREDIRECTSERVER_H_ #include #include @@ -58,4 +58,4 @@ class LocalRedirectServer : public QObject { QUrl request_url_; }; -#endif // INTERNET_LOCALREDIRECTSERVER_H_ +#endif // INTERNET_CORE_LOCALREDIRECTSERVER_H_ diff --git a/src/internet/core/oauthenticator.h b/src/internet/core/oauthenticator.h index 233085d23..944838a14 100644 --- a/src/internet/core/oauthenticator.h +++ b/src/internet/core/oauthenticator.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_OAUTHENTICATOR_H_ -#define INTERNET_OAUTHENTICATOR_H_ +#ifndef INTERNET_CORE_OAUTHENTICATOR_H_ +#define INTERNET_CORE_OAUTHENTICATOR_H_ #include #include @@ -88,4 +88,4 @@ class OAuthenticator : public QObject { RedirectStyle redirect_style_; }; -#endif // INTERNET_OAUTHENTICATOR_H_ +#endif // INTERNET_CORE_OAUTHENTICATOR_H_ diff --git a/src/internet/core/scrobbler.h b/src/internet/core/scrobbler.h index e2c987710..a1a9b0d47 100644 --- a/src/internet/core/scrobbler.h +++ b/src/internet/core/scrobbler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SCROBBLER_H_ -#define INTERNET_SCROBBLER_H_ +#ifndef INTERNET_CORE_SCROBBLER_H_ +#define INTERNET_CORE_SCROBBLER_H_ #include @@ -51,4 +51,4 @@ class Scrobbler : public QObject { void ScrobbleError(int value); }; -#endif // INTERNET_SCROBBLER_H_ +#endif // INTERNET_CORE_SCROBBLER_H_ diff --git a/src/internet/core/searchboxwidget.h b/src/internet/core/searchboxwidget.h index a4787a37f..19e7cab35 100644 --- a/src/internet/core/searchboxwidget.h +++ b/src/internet/core/searchboxwidget.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SEARCHBOXWIDGET_H_ -#define INTERNET_SEARCHBOXWIDGET_H_ +#ifndef INTERNET_CORE_SEARCHBOXWIDGET_H_ +#define INTERNET_CORE_SEARCHBOXWIDGET_H_ #include @@ -56,4 +56,4 @@ class SearchBoxWidget : public QWidget { DidYouMean* did_you_mean_; }; -#endif // INTERNET_SEARCHBOXWIDGET_H_ +#endif // INTERNET_CORE_SEARCHBOXWIDGET_H_ diff --git a/src/internet/digitally/digitallyimportedclient.h b/src/internet/digitally/digitallyimportedclient.h index ef86f5450..e090242fd 100644 --- a/src/internet/digitally/digitallyimportedclient.h +++ b/src/internet/digitally/digitallyimportedclient.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DIGITALLYIMPORTEDCLIENT_H_ -#define INTERNET_DIGITALLYIMPORTEDCLIENT_H_ +#ifndef INTERNET_DIGITALLY_DIGITALLYIMPORTEDCLIENT_H_ +#define INTERNET_DIGITALLY_DIGITALLYIMPORTEDCLIENT_H_ #include #include @@ -86,4 +86,4 @@ QDataStream& operator>>(QDataStream& in, DigitallyImportedClient::Channel& channel); Q_DECLARE_METATYPE(DigitallyImportedClient::Channel) -#endif // INTERNET_DIGITALLYIMPORTEDCLIENT_H_ +#endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDCLIENT_H_ diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h index fca9176b9..a7db4ba16 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ -#define INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ +#ifndef INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_ +#define INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_ #include @@ -136,4 +136,4 @@ class RockRadioService : public DigitallyImportedServiceBase { QObject* parent = nullptr); }; -#endif // INTERNET_DIGITALLYIMPORTEDSERVICEBASE_H_ +#endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_ diff --git a/src/internet/digitally/digitallyimportedsettingspage.h b/src/internet/digitally/digitallyimportedsettingspage.h index b9268e0ad..412e555fa 100644 --- a/src/internet/digitally/digitallyimportedsettingspage.h +++ b/src/internet/digitally/digitallyimportedsettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ -#define INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ +#ifndef INTERNET_DIGITALLY_DIGITALLYIMPORTEDSETTINGSPAGE_H_ +#define INTERNET_DIGITALLY_DIGITALLYIMPORTEDSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -53,4 +53,4 @@ class DigitallyImportedSettingsPage : public SettingsPage { DigitallyImportedClient* client_; }; -#endif // INTERNET_DIGITALLYIMPORTEDSETTINGSPAGE_H_ +#endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDSETTINGSPAGE_H_ diff --git a/src/internet/digitally/digitallyimportedurlhandler.h b/src/internet/digitally/digitallyimportedurlhandler.h index de682129b..d11ea4937 100644 --- a/src/internet/digitally/digitallyimportedurlhandler.h +++ b/src/internet/digitally/digitallyimportedurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ -#define INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ +#ifndef INTERNET_DIGITALLY_DIGITALLYIMPORTEDURLHANDLER_H_ +#define INTERNET_DIGITALLY_DIGITALLYIMPORTEDURLHANDLER_H_ #include "core/urlhandler.h" @@ -45,4 +45,4 @@ class DigitallyImportedUrlHandler : public UrlHandler { QUrl last_original_url_; }; -#endif // INTERNET_DIGITALLYIMPORTEDURLHANDLER_H_ +#endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDURLHANDLER_H_ diff --git a/src/internet/dropbox/dropboxauthenticator.h b/src/internet/dropbox/dropboxauthenticator.h index d9e7933e4..d407656d9 100644 --- a/src/internet/dropbox/dropboxauthenticator.h +++ b/src/internet/dropbox/dropboxauthenticator.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DROPBOXAUTHENTICATOR_H_ -#define INTERNET_DROPBOXAUTHENTICATOR_H_ +#ifndef INTERNET_DROPBOX_DROPBOXAUTHENTICATOR_H_ +#define INTERNET_DROPBOX_DROPBOXAUTHENTICATOR_H_ #include #include @@ -73,4 +73,4 @@ class DropboxAuthenticator : public QObject { QString name_; }; -#endif // INTERNET_DROPBOXAUTHENTICATOR_H_ +#endif // INTERNET_DROPBOX_DROPBOXAUTHENTICATOR_H_ diff --git a/src/internet/dropbox/dropboxservice.h b/src/internet/dropbox/dropboxservice.h index aa4720c97..8573d29ec 100644 --- a/src/internet/dropbox/dropboxservice.h +++ b/src/internet/dropbox/dropboxservice.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DROPBOXSERVICE_H_ -#define INTERNET_DROPBOXSERVICE_H_ +#ifndef INTERNET_DROPBOX_DROPBOXSERVICE_H_ +#define INTERNET_DROPBOX_DROPBOXSERVICE_H_ #include "internet/core/cloudfileservice.h" @@ -65,4 +65,4 @@ class DropboxService : public CloudFileService { NetworkAccessManager* network_; }; -#endif // INTERNET_DROPBOXSERVICE_H_ +#endif // INTERNET_DROPBOX_DROPBOXSERVICE_H_ diff --git a/src/internet/dropbox/dropboxsettingspage.h b/src/internet/dropbox/dropboxsettingspage.h index 10332f6d7..b07da3cb3 100644 --- a/src/internet/dropbox/dropboxsettingspage.h +++ b/src/internet/dropbox/dropboxsettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DROPBOXSETTINGSPAGE_H_ -#define INTERNET_DROPBOXSETTINGSPAGE_H_ +#ifndef INTERNET_DROPBOX_DROPBOXSETTINGSPAGE_H_ +#define INTERNET_DROPBOX_DROPBOXSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -52,4 +52,4 @@ class DropboxSettingsPage : public SettingsPage { DropboxService* service_; }; -#endif // INTERNET_DROPBOXSETTINGSPAGE_H_ +#endif // INTERNET_DROPBOX_DROPBOXSETTINGSPAGE_H_ diff --git a/src/internet/dropbox/dropboxurlhandler.h b/src/internet/dropbox/dropboxurlhandler.h index 6ff9d5038..c18e113a9 100644 --- a/src/internet/dropbox/dropboxurlhandler.h +++ b/src/internet/dropbox/dropboxurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_DROPBOXURLHANDLER_H_ -#define INTERNET_DROPBOXURLHANDLER_H_ +#ifndef INTERNET_DROPBOX_DROPBOXURLHANDLER_H_ +#define INTERNET_DROPBOX_DROPBOXURLHANDLER_H_ #include "core/urlhandler.h" @@ -36,4 +36,4 @@ class DropboxUrlHandler : public UrlHandler { DropboxService* service_; }; -#endif // INTERNET_DROPBOXURLHANDLER_H_ +#endif // INTERNET_DROPBOX_DROPBOXURLHANDLER_H_ diff --git a/src/internet/googledrive/googledriveclient.h b/src/internet/googledrive/googledriveclient.h index b07e176fd..667dcc754 100644 --- a/src/internet/googledrive/googledriveclient.h +++ b/src/internet/googledrive/googledriveclient.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GOOGLEDRIVECLIENT_H_ -#define INTERNET_GOOGLEDRIVECLIENT_H_ +#ifndef INTERNET_GOOGLEDRIVE_GOOGLEDRIVECLIENT_H_ +#define INTERNET_GOOGLEDRIVE_GOOGLEDRIVECLIENT_H_ #include #include @@ -170,4 +170,4 @@ class Client : public QObject { } // namespace google_drive -#endif // INTERNET_GOOGLEDRIVECLIENT_H_ +#endif // INTERNET_GOOGLEDRIVE_GOOGLEDRIVECLIENT_H_ diff --git a/src/internet/googledrive/googledriveservice.h b/src/internet/googledrive/googledriveservice.h index 6d08a5061..6050a71c4 100644 --- a/src/internet/googledrive/googledriveservice.h +++ b/src/internet/googledrive/googledriveservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GOOGLEDRIVESERVICE_H_ -#define INTERNET_GOOGLEDRIVESERVICE_H_ +#ifndef INTERNET_GOOGLEDRIVE_GOOGLEDRIVESERVICE_H_ +#define INTERNET_GOOGLEDRIVE_GOOGLEDRIVESERVICE_H_ #include "internet/core/cloudfileservice.h" @@ -78,4 +78,4 @@ class GoogleDriveService : public CloudFileService { QAction* full_rescan_action_; }; -#endif // INTERNET_GOOGLEDRIVESERVICE_H_ +#endif // INTERNET_GOOGLEDRIVE_GOOGLEDRIVESERVICE_H_ diff --git a/src/internet/googledrive/googledrivesettingspage.h b/src/internet/googledrive/googledrivesettingspage.h index ae9363c2d..8cd4b3871 100644 --- a/src/internet/googledrive/googledrivesettingspage.h +++ b/src/internet/googledrive/googledrivesettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ -#define INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ +#ifndef INTERNET_GOOGLEDRIVE_GOOGLEDRIVESETTINGSPAGE_H_ +#define INTERNET_GOOGLEDRIVE_GOOGLEDRIVESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -52,4 +52,4 @@ class GoogleDriveSettingsPage : public SettingsPage { GoogleDriveService* service_; }; -#endif // INTERNET_GOOGLEDRIVESETTINGSPAGE_H_ +#endif // INTERNET_GOOGLEDRIVE_GOOGLEDRIVESETTINGSPAGE_H_ diff --git a/src/internet/googledrive/googledriveurlhandler.h b/src/internet/googledrive/googledriveurlhandler.h index 7403fe4c4..131b09c8e 100644 --- a/src/internet/googledrive/googledriveurlhandler.h +++ b/src/internet/googledrive/googledriveurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GOOGLEDRIVEURLHANDLER_H_ -#define INTERNET_GOOGLEDRIVEURLHANDLER_H_ +#ifndef INTERNET_GOOGLEDRIVE_GOOGLEDRIVEURLHANDLER_H_ +#define INTERNET_GOOGLEDRIVE_GOOGLEDRIVEURLHANDLER_H_ #include "core/urlhandler.h" @@ -37,4 +37,4 @@ class GoogleDriveUrlHandler : public UrlHandler { GoogleDriveService* service_; }; -#endif // INTERNET_GOOGLEDRIVEURLHANDLER_H_ +#endif // INTERNET_GOOGLEDRIVE_GOOGLEDRIVEURLHANDLER_H_ diff --git a/src/internet/grooveshark/groovesharkradio.h b/src/internet/grooveshark/groovesharkradio.h index 6ce45da51..b36d9e8b4 100644 --- a/src/internet/grooveshark/groovesharkradio.h +++ b/src/internet/grooveshark/groovesharkradio.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GROOVESHARKRADIO_H_ -#define INTERNET_GROOVESHARKRADIO_H_ +#ifndef INTERNET_GROOVESHARK_GROOVESHARKRADIO_H_ +#define INTERNET_GROOVESHARK_GROOVESHARKRADIO_H_ #include "smartplaylists/generator.h" @@ -49,4 +49,4 @@ class GroovesharkRadio : public smart_playlists::Generator { QVariantMap autoplay_state_; }; -#endif // INTERNET_GROOVESHARKRADIO_H_ +#endif // INTERNET_GROOVESHARK_GROOVESHARKRADIO_H_ diff --git a/src/internet/grooveshark/groovesharkservice.h b/src/internet/grooveshark/groovesharkservice.h index 335fd2e15..349599a7b 100644 --- a/src/internet/grooveshark/groovesharkservice.h +++ b/src/internet/grooveshark/groovesharkservice.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GROOVESHARKSERVICE_H_ -#define INTERNET_GROOVESHARKSERVICE_H_ +#ifndef INTERNET_GROOVESHARK_GROOVESHARKSERVICE_H_ +#define INTERNET_GROOVESHARK_GROOVESHARKSERVICE_H_ #include "internet/core/internetmodel.h" #include "internet/core/internetservice.h" @@ -336,4 +336,4 @@ class GroovesharkService : public InternetService { static const char* kApiSecret; }; -#endif // INTERNET_GROOVESHARKSERVICE_H_ +#endif // INTERNET_GROOVESHARK_GROOVESHARKSERVICE_H_ diff --git a/src/internet/grooveshark/groovesharksettingspage.h b/src/internet/grooveshark/groovesharksettingspage.h index c36fdaa89..f465acd4e 100644 --- a/src/internet/grooveshark/groovesharksettingspage.h +++ b/src/internet/grooveshark/groovesharksettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GROOVESHARKSETTINGSPAGE_H_ -#define INTERNET_GROOVESHARKSETTINGSPAGE_H_ +#ifndef INTERNET_GROOVESHARK_GROOVESHARKSETTINGSPAGE_H_ +#define INTERNET_GROOVESHARK_GROOVESHARKSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -53,4 +53,4 @@ class GroovesharkSettingsPage : public SettingsPage { QString original_password_; }; -#endif // INTERNET_GROOVESHARKSETTINGSPAGE_H_ +#endif // INTERNET_GROOVESHARK_GROOVESHARKSETTINGSPAGE_H_ diff --git a/src/internet/grooveshark/groovesharkurlhandler.h b/src/internet/grooveshark/groovesharkurlhandler.h index 86b391c21..883045ea4 100644 --- a/src/internet/grooveshark/groovesharkurlhandler.h +++ b/src/internet/grooveshark/groovesharkurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_GROOVESHARKURLHANDLER_H_ -#define INTERNET_GROOVESHARKURLHANDLER_H_ +#ifndef INTERNET_GROOVESHARK_GROOVESHARKURLHANDLER_H_ +#define INTERNET_GROOVESHARK_GROOVESHARKURLHANDLER_H_ #include "core/urlhandler.h" @@ -49,4 +49,4 @@ class GroovesharkUrlHandler : public UrlHandler { QString last_stream_key_; }; -#endif // INTERNET_GROOVESHARKURLHANDLER_H_ +#endif // INTERNET_GROOVESHARK_GROOVESHARKURLHANDLER_H_ diff --git a/src/internet/icecast/icecastbackend.h b/src/internet/icecast/icecastbackend.h index 78ee635c7..81f619c4e 100644 --- a/src/internet/icecast/icecastbackend.h +++ b/src/internet/icecast/icecastbackend.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_ICECASTBACKEND_H_ -#define INTERNET_ICECASTBACKEND_H_ +#ifndef INTERNET_ICECAST_ICECASTBACKEND_H_ +#define INTERNET_ICECAST_ICECASTBACKEND_H_ #include "core/song.h" @@ -67,4 +67,4 @@ class IcecastBackend : public QObject { Database* db_; }; -#endif // INTERNET_ICECASTBACKEND_H_ +#endif // INTERNET_ICECAST_ICECASTBACKEND_H_ diff --git a/src/internet/icecast/icecastfilterwidget.h b/src/internet/icecast/icecastfilterwidget.h index 7084f8821..4ed5bdfe7 100644 --- a/src/internet/icecast/icecastfilterwidget.h +++ b/src/internet/icecast/icecastfilterwidget.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_ICECASTFILTERWIDGET_H_ -#define INTERNET_ICECASTFILTERWIDGET_H_ +#ifndef INTERNET_ICECAST_ICECASTFILTERWIDGET_H_ +#define INTERNET_ICECAST_ICECASTFILTERWIDGET_H_ #include "icecastmodel.h" @@ -62,4 +62,4 @@ class IcecastFilterWidget : public QWidget { QSignalMapper* sort_mode_mapper_; }; -#endif // INTERNET_ICECASTFILTERWIDGET_H_ +#endif // INTERNET_ICECAST_ICECASTFILTERWIDGET_H_ diff --git a/src/internet/icecast/icecastitem.h b/src/internet/icecast/icecastitem.h index 5f6477de5..cfb6ce65f 100644 --- a/src/internet/icecast/icecastitem.h +++ b/src/internet/icecast/icecastitem.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_ICECASTITEM_H_ -#define INTERNET_ICECASTITEM_H_ +#ifndef INTERNET_ICECAST_ICECASTITEM_H_ +#define INTERNET_ICECAST_ICECASTITEM_H_ #include "icecastbackend.h" #include "core/simpletreeitem.h" @@ -40,4 +40,4 @@ class IcecastItem : public SimpleTreeItem { IcecastBackend::Station station; }; -#endif // INTERNET_ICECASTITEM_H_ +#endif // INTERNET_ICECAST_ICECASTITEM_H_ diff --git a/src/internet/icecast/icecastmodel.h b/src/internet/icecast/icecastmodel.h index 3757e02a9..ba85f7e88 100644 --- a/src/internet/icecast/icecastmodel.h +++ b/src/internet/icecast/icecastmodel.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_ICECASTMODEL_H_ -#define INTERNET_ICECASTMODEL_H_ +#ifndef INTERNET_ICECAST_ICECASTMODEL_H_ +#define INTERNET_ICECAST_ICECASTMODEL_H_ #include "icecastitem.h" #include "core/simpletreemodel.h" @@ -85,4 +85,4 @@ class IcecastModel : public SimpleTreeModel { QIcon station_icon_; }; -#endif // INTERNET_ICECASTMODEL_H_ +#endif // INTERNET_ICECAST_ICECASTMODEL_H_ diff --git a/src/internet/icecast/icecastservice.h b/src/internet/icecast/icecastservice.h index 94e241f13..02b19e045 100644 --- a/src/internet/icecast/icecastservice.h +++ b/src/internet/icecast/icecastservice.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_ICECASTSERVICE_H_ -#define INTERNET_ICECASTSERVICE_H_ +#ifndef INTERNET_ICECAST_ICECASTSERVICE_H_ +#define INTERNET_ICECAST_ICECASTSERVICE_H_ #include "internet/core/internetservice.h" @@ -81,4 +81,4 @@ class IcecastService : public InternetService { int load_directory_task_id_; }; -#endif // INTERNET_ICECASTSERVICE_H_ +#endif // INTERNET_ICECAST_ICECASTSERVICE_H_ diff --git a/src/internet/internetradio/savedradio.h b/src/internet/internetradio/savedradio.h index 5743b0d05..3191918f2 100644 --- a/src/internet/internetradio/savedradio.h +++ b/src/internet/internetradio/savedradio.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SAVEDRADIO_H_ -#define INTERNET_SAVEDRADIO_H_ +#ifndef INTERNET_INTERNETRADIO_SAVEDRADIO_H_ +#define INTERNET_INTERNETRADIO_SAVEDRADIO_H_ #include @@ -89,4 +89,4 @@ class SavedRadio : public InternetService { std::unique_ptr edit_dialog_; }; -#endif // INTERNET_SAVEDRADIO_H_ +#endif // INTERNET_INTERNETRADIO_SAVEDRADIO_H_ diff --git a/src/internet/jamendo/jamendodynamicplaylist.h b/src/internet/jamendo/jamendodynamicplaylist.h index 081fd2255..7f1d2477a 100644 --- a/src/internet/jamendo/jamendodynamicplaylist.h +++ b/src/internet/jamendo/jamendodynamicplaylist.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_JAMENDODYNAMICPLAYLIST_H_ -#define INTERNET_JAMENDODYNAMICPLAYLIST_H_ +#ifndef INTERNET_JAMENDO_JAMENDODYNAMICPLAYLIST_H_ +#define INTERNET_JAMENDO_JAMENDODYNAMICPLAYLIST_H_ #include "smartplaylists/generator.h" @@ -79,4 +79,4 @@ class JamendoDynamicPlaylist : public smart_playlists::Generator { QDataStream& operator<<(QDataStream& s, const JamendoDynamicPlaylist& p); QDataStream& operator>>(QDataStream& s, JamendoDynamicPlaylist& p); -#endif // INTERNET_JAMENDODYNAMICPLAYLIST_H_ +#endif // INTERNET_JAMENDO_JAMENDODYNAMICPLAYLIST_H_ diff --git a/src/internet/jamendo/jamendoplaylistitem.h b/src/internet/jamendo/jamendoplaylistitem.h index 505345b26..a0b273645 100644 --- a/src/internet/jamendo/jamendoplaylistitem.h +++ b/src/internet/jamendo/jamendoplaylistitem.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_JAMENDOPLAYLISTITEM_H_ -#define INTERNET_JAMENDOPLAYLISTITEM_H_ +#ifndef INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_ +#define INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_ #include "library/libraryplaylistitem.h" @@ -32,4 +32,4 @@ class JamendoPlaylistItem : public LibraryPlaylistItem { QUrl Url() const; }; -#endif // INTERNET_JAMENDOPLAYLISTITEM_H_ +#endif // INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_ diff --git a/src/internet/jamendo/jamendoservice.h b/src/internet/jamendo/jamendoservice.h index 3dfa1a93b..767db53ed 100644 --- a/src/internet/jamendo/jamendoservice.h +++ b/src/internet/jamendo/jamendoservice.h @@ -19,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_JAMENDOSERVICE_H_ -#define INTERNET_JAMENDOSERVICE_H_ +#ifndef INTERNET_JAMENDO_JAMENDOSERVICE_H_ +#define INTERNET_JAMENDO_JAMENDOSERVICE_H_ #include "internet/core/internetservice.h" @@ -123,4 +123,4 @@ class JamendoService : public InternetService { bool accepted_download_; }; -#endif // INTERNET_JAMENDOSERVICE_H_ +#endif // INTERNET_JAMENDO_JAMENDOSERVICE_H_ diff --git a/src/internet/lastfm/fixlastfm.h b/src/internet/lastfm/fixlastfm.h index 628f8b766..6fb9fbe0e 100644 --- a/src/internet/lastfm/fixlastfm.h +++ b/src/internet/lastfm/fixlastfm.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_FIXLASTFM_H_ -#define INTERNET_FIXLASTFM_H_ +#ifndef INTERNET_LASTFM_FIXLASTFM_H_ +#define INTERNET_LASTFM_FIXLASTFM_H_ // Include this before to fix a compile error in release mode @@ -29,4 +29,4 @@ QDebug& operator<<(QDebug&, const QUrl&); #endif -#endif // INTERNET_FIXLASTFM_H_ +#endif // INTERNET_LASTFM_FIXLASTFM_H_ diff --git a/src/internet/lastfm/lastfmcompat.h b/src/internet/lastfm/lastfmcompat.h index 3854f2c0f..7ca9acf5d 100644 --- a/src/internet/lastfm/lastfmcompat.h +++ b/src/internet/lastfm/lastfmcompat.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_LASTFMCOMPAT_H_ -#define INTERNET_LASTFMCOMPAT_H_ +#ifndef INTERNET_LASTFM_LASTFMCOMPAT_H_ +#define INTERNET_LASTFM_LASTFMCOMPAT_H_ #include "config.h" #include "fixlastfm.h" @@ -63,4 +63,4 @@ typedef lastfm::AuthenticatedUser AuthenticatedUser; } // namespace compat } // namespace lastfm -#endif // INTERNET_LASTFMCOMPAT_H_ +#endif // INTERNET_LASTFM_LASTFMCOMPAT_H_ diff --git a/src/internet/lastfm/lastfmservice.h b/src/internet/lastfm/lastfmservice.h index 62a6c6b1a..3f8af4627 100644 --- a/src/internet/lastfm/lastfmservice.h +++ b/src/internet/lastfm/lastfmservice.h @@ -20,8 +20,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_LASTFMSERVICE_H_ -#define INTERNET_LASTFMSERVICE_H_ +#ifndef INTERNET_LASTFM_LASTFMSERVICE_H_ +#define INTERNET_LASTFM_LASTFMSERVICE_H_ #include @@ -127,4 +127,4 @@ class LastFMService : public Scrobbler { Application* app_; }; -#endif // INTERNET_LASTFMSERVICE_H_ +#endif // INTERNET_LASTFM_LASTFMSERVICE_H_ diff --git a/src/internet/lastfm/lastfmsettingspage.h b/src/internet/lastfm/lastfmsettingspage.h index 31c91b26d..24001bc44 100644 --- a/src/internet/lastfm/lastfmsettingspage.h +++ b/src/internet/lastfm/lastfmsettingspage.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_LASTFMSETTINGSPAGE_H_ -#define INTERNET_LASTFMSETTINGSPAGE_H_ +#ifndef INTERNET_LASTFM_LASTFMSETTINGSPAGE_H_ +#define INTERNET_LASTFM_LASTFMSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -50,4 +50,4 @@ class LastFMSettingsPage : public SettingsPage { void RefreshControls(bool authenticated); }; -#endif // INTERNET_LASTFMSETTINGSPAGE_H_ +#endif // INTERNET_LASTFM_LASTFMSETTINGSPAGE_H_ diff --git a/src/internet/lastfm/lastfmurlhandler.h b/src/internet/lastfm/lastfmurlhandler.h index c6b61bf43..9f90210f1 100644 --- a/src/internet/lastfm/lastfmurlhandler.h +++ b/src/internet/lastfm/lastfmurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_LASTFMURLHANDLER_H_ -#define INTERNET_LASTFMURLHANDLER_H_ +#ifndef INTERNET_LASTFM_LASTFMURLHANDLER_H_ +#define INTERNET_LASTFM_LASTFMURLHANDLER_H_ #include "core/urlhandler.h" @@ -42,4 +42,4 @@ class LastFMUrlHandler : public UrlHandler { LastFMService* service_; }; -#endif // INTERNET_LASTFMURLHANDLER_H_ +#endif // INTERNET_LASTFM_LASTFMURLHANDLER_H_ diff --git a/src/internet/magnatune/magnatunedownloaddialog.h b/src/internet/magnatune/magnatunedownloaddialog.h index 22b4d1dd3..dc4a5f9ff 100644 --- a/src/internet/magnatune/magnatunedownloaddialog.h +++ b/src/internet/magnatune/magnatunedownloaddialog.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ -#define INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ +#ifndef INTERNET_MAGNATUNE_MAGNATUNEDOWNLOADDIALOG_H_ +#define INTERNET_MAGNATUNE_MAGNATUNEDOWNLOADDIALOG_H_ #include @@ -79,4 +79,4 @@ class MagnatuneDownloadDialog : public QDialog { int next_row_; }; -#endif // INTERNET_MAGNATUNEDOWNLOADDIALOG_H_ +#endif // INTERNET_MAGNATUNE_MAGNATUNEDOWNLOADDIALOG_H_ diff --git a/src/internet/magnatune/magnatuneplaylistitem.h b/src/internet/magnatune/magnatuneplaylistitem.h index f2edc3f17..eb8858bf0 100644 --- a/src/internet/magnatune/magnatuneplaylistitem.h +++ b/src/internet/magnatune/magnatuneplaylistitem.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_MAGNATUNEPLAYLISTITEM_H_ -#define INTERNET_MAGNATUNEPLAYLISTITEM_H_ +#ifndef INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_ +#define INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_ #include "library/libraryplaylistitem.h" @@ -32,4 +32,4 @@ class MagnatunePlaylistItem : public LibraryPlaylistItem { QUrl Url() const; }; -#endif // INTERNET_MAGNATUNEPLAYLISTITEM_H_ +#endif // INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_ diff --git a/src/internet/magnatune/magnatuneservice.h b/src/internet/magnatune/magnatuneservice.h index 9367cf554..5e210987a 100644 --- a/src/internet/magnatune/magnatuneservice.h +++ b/src/internet/magnatune/magnatuneservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_MAGNATUNESERVICE_H_ -#define INTERNET_MAGNATUNESERVICE_H_ +#ifndef INTERNET_MAGNATUNE_MAGNATUNESERVICE_H_ +#define INTERNET_MAGNATUNE_MAGNATUNESERVICE_H_ #include @@ -129,4 +129,4 @@ class MagnatuneService : public InternetService { QNetworkAccessManager* network_; }; -#endif // INTERNET_MAGNATUNESERVICE_H_ +#endif // INTERNET_MAGNATUNE_MAGNATUNESERVICE_H_ diff --git a/src/internet/magnatune/magnatunesettingspage.h b/src/internet/magnatune/magnatunesettingspage.h index 31d6b56ca..54d706902 100644 --- a/src/internet/magnatune/magnatunesettingspage.h +++ b/src/internet/magnatune/magnatunesettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_MAGNATUNESETTINGSPAGE_H_ -#define INTERNET_MAGNATUNESETTINGSPAGE_H_ +#ifndef INTERNET_MAGNATUNE_MAGNATUNESETTINGSPAGE_H_ +#define INTERNET_MAGNATUNE_MAGNATUNESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -54,4 +54,4 @@ class MagnatuneSettingsPage : public SettingsPage { bool logged_in_; }; -#endif // INTERNET_MAGNATUNESETTINGSPAGE_H_ +#endif // INTERNET_MAGNATUNE_MAGNATUNESETTINGSPAGE_H_ diff --git a/src/internet/magnatune/magnatuneurlhandler.h b/src/internet/magnatune/magnatuneurlhandler.h index 17505c2d1..fae06385b 100644 --- a/src/internet/magnatune/magnatuneurlhandler.h +++ b/src/internet/magnatune/magnatuneurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_MAGNATUNEURLHANDLER_H_ -#define INTERNET_MAGNATUNEURLHANDLER_H_ +#ifndef INTERNET_MAGNATUNE_MAGNATUNEURLHANDLER_H_ +#define INTERNET_MAGNATUNE_MAGNATUNEURLHANDLER_H_ #include "core/urlhandler.h" @@ -36,4 +36,4 @@ class MagnatuneUrlHandler : public UrlHandler { MagnatuneService* service_; }; -#endif // INTERNET_MAGNATUNEURLHANDLER_H_ +#endif // INTERNET_MAGNATUNE_MAGNATUNEURLHANDLER_H_ diff --git a/src/internet/podcasts/addpodcastbyurl.h b/src/internet/podcasts/addpodcastbyurl.h index 052f46800..442813e78 100644 --- a/src/internet/podcasts/addpodcastbyurl.h +++ b/src/internet/podcasts/addpodcastbyurl.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_ADDPODCASTBYURL_H_ -#define PODCASTS_ADDPODCASTBYURL_H_ +#ifndef INTERNET_PODCASTS_ADDPODCASTBYURL_H_ +#define INTERNET_PODCASTS_ADDPODCASTBYURL_H_ #include "addpodcastpage.h" @@ -51,4 +51,4 @@ class AddPodcastByUrl : public AddPodcastPage { PodcastUrlLoader* loader_; }; -#endif // PODCASTS_ADDPODCASTBYURL_H_ +#endif // INTERNET_PODCASTS_ADDPODCASTBYURL_H_ diff --git a/src/internet/podcasts/addpodcastdialog.h b/src/internet/podcasts/addpodcastdialog.h index 754f761d3..2711cc5c3 100644 --- a/src/internet/podcasts/addpodcastdialog.h +++ b/src/internet/podcasts/addpodcastdialog.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_ADDPODCASTDIALOG_H_ -#define PODCASTS_ADDPODCASTDIALOG_H_ +#ifndef INTERNET_PODCASTS_ADDPODCASTDIALOG_H_ +#define INTERNET_PODCASTS_ADDPODCASTDIALOG_H_ #include "podcast.h" @@ -84,4 +84,4 @@ class AddPodcastDialog : public QDialog { QString last_opml_path_; }; -#endif // PODCASTS_ADDPODCASTDIALOG_H_ +#endif // INTERNET_PODCASTS_ADDPODCASTDIALOG_H_ diff --git a/src/internet/podcasts/addpodcastpage.h b/src/internet/podcasts/addpodcastpage.h index c12559112..2a658c794 100644 --- a/src/internet/podcasts/addpodcastpage.h +++ b/src/internet/podcasts/addpodcastpage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_ADDPODCASTPAGE_H_ -#define PODCASTS_ADDPODCASTPAGE_H_ +#ifndef INTERNET_PODCASTS_ADDPODCASTPAGE_H_ +#define INTERNET_PODCASTS_ADDPODCASTPAGE_H_ #include @@ -46,4 +46,4 @@ class AddPodcastPage : public QWidget { PodcastDiscoveryModel* model_; }; -#endif // PODCASTS_ADDPODCASTPAGE_H_ +#endif // INTERNET_PODCASTS_ADDPODCASTPAGE_H_ diff --git a/src/internet/podcasts/fixedopmlpage.h b/src/internet/podcasts/fixedopmlpage.h index a848ebe33..6c8ec24ec 100644 --- a/src/internet/podcasts/fixedopmlpage.h +++ b/src/internet/podcasts/fixedopmlpage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_FIXEDOPMLPAGE_H_ -#define PODCASTS_FIXEDOPMLPAGE_H_ +#ifndef INTERNET_PODCASTS_FIXEDOPMLPAGE_H_ +#define INTERNET_PODCASTS_FIXEDOPMLPAGE_H_ #include "addpodcastpage.h" @@ -47,4 +47,4 @@ class FixedOpmlPage : public AddPodcastPage { bool done_initial_load_; }; -#endif // PODCASTS_FIXEDOPMLPAGE_H_ +#endif // INTERNET_PODCASTS_FIXEDOPMLPAGE_H_ diff --git a/src/internet/podcasts/gpoddersearchpage.h b/src/internet/podcasts/gpoddersearchpage.h index 6849cc6b0..644f91783 100644 --- a/src/internet/podcasts/gpoddersearchpage.h +++ b/src/internet/podcasts/gpoddersearchpage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_GPODDERSEARCHPAGE_H_ -#define PODCASTS_GPODDERSEARCHPAGE_H_ +#ifndef INTERNET_PODCASTS_GPODDERSEARCHPAGE_H_ +#define INTERNET_PODCASTS_GPODDERSEARCHPAGE_H_ #include "addpodcastpage.h" @@ -49,4 +49,4 @@ class GPodderSearchPage : public AddPodcastPage { mygpo::ApiRequest* api_; }; -#endif // PODCASTS_GPODDERSEARCHPAGE_H_ +#endif // INTERNET_PODCASTS_GPODDERSEARCHPAGE_H_ diff --git a/src/internet/podcasts/gpoddersync.h b/src/internet/podcasts/gpoddersync.h index 83185c23a..84e527ccd 100644 --- a/src/internet/podcasts/gpoddersync.h +++ b/src/internet/podcasts/gpoddersync.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_GPODDERSYNC_H_ -#define PODCASTS_GPODDERSYNC_H_ +#ifndef INTERNET_PODCASTS_GPODDERSYNC_H_ +#define INTERNET_PODCASTS_GPODDERSYNC_H_ #include "podcastepisode.h" @@ -117,4 +117,4 @@ class GPodderSync : public QObject { bool flushing_queue_; }; -#endif // PODCASTS_GPODDERSYNC_H_ +#endif // INTERNET_PODCASTS_GPODDERSYNC_H_ diff --git a/src/internet/podcasts/gpoddertoptagsmodel.h b/src/internet/podcasts/gpoddertoptagsmodel.h index 9177c1adf..8a1907fa9 100644 --- a/src/internet/podcasts/gpoddertoptagsmodel.h +++ b/src/internet/podcasts/gpoddertoptagsmodel.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_GPODDERTOPTAGSMODEL_H_ -#define PODCASTS_GPODDERTOPTAGSMODEL_H_ +#ifndef INTERNET_PODCASTS_GPODDERTOPTAGSMODEL_H_ +#define INTERNET_PODCASTS_GPODDERTOPTAGSMODEL_H_ #include "podcastdiscoverymodel.h" @@ -52,4 +52,4 @@ class GPodderTopTagsModel : public PodcastDiscoveryModel { mygpo::ApiRequest* api_; }; -#endif // PODCASTS_GPODDERTOPTAGSMODEL_H_ +#endif // INTERNET_PODCASTS_GPODDERTOPTAGSMODEL_H_ diff --git a/src/internet/podcasts/gpoddertoptagspage.h b/src/internet/podcasts/gpoddertoptagspage.h index c864b59e0..78529e3b8 100644 --- a/src/internet/podcasts/gpoddertoptagspage.h +++ b/src/internet/podcasts/gpoddertoptagspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_GPODDERTOPTAGSPAGE_H_ -#define PODCASTS_GPODDERTOPTAGSPAGE_H_ +#ifndef INTERNET_PODCASTS_GPODDERTOPTAGSPAGE_H_ +#define INTERNET_PODCASTS_GPODDERTOPTAGSPAGE_H_ #include @@ -51,4 +51,4 @@ class GPodderTopTagsPage : public AddPodcastPage { bool done_initial_load_; }; -#endif // PODCASTS_GPODDERTOPTAGSPAGE_H_ +#endif // INTERNET_PODCASTS_GPODDERTOPTAGSPAGE_H_ diff --git a/src/internet/podcasts/itunessearchpage.h b/src/internet/podcasts/itunessearchpage.h index 750abe61d..3a9de8481 100644 --- a/src/internet/podcasts/itunessearchpage.h +++ b/src/internet/podcasts/itunessearchpage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_ITUNESSEARCHPAGE_H_ -#define PODCASTS_ITUNESSEARCHPAGE_H_ +#ifndef INTERNET_PODCASTS_ITUNESSEARCHPAGE_H_ +#define INTERNET_PODCASTS_ITUNESSEARCHPAGE_H_ #include "addpodcastpage.h" @@ -48,4 +48,4 @@ class ITunesSearchPage : public AddPodcastPage { QNetworkAccessManager* network_; }; -#endif // PODCASTS_ITUNESSEARCHPAGE_H_ +#endif // INTERNET_PODCASTS_ITUNESSEARCHPAGE_H_ diff --git a/src/internet/podcasts/opmlcontainer.h b/src/internet/podcasts/opmlcontainer.h index d1d934c82..741fdc257 100644 --- a/src/internet/podcasts/opmlcontainer.h +++ b/src/internet/podcasts/opmlcontainer.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_OPMLCONTAINER_H_ -#define PODCASTS_OPMLCONTAINER_H_ +#ifndef INTERNET_PODCASTS_OPMLCONTAINER_H_ +#define INTERNET_PODCASTS_OPMLCONTAINER_H_ #include "podcast.h" @@ -34,4 +34,4 @@ class OpmlContainer { Q_DECLARE_METATYPE(OpmlContainer) -#endif // PODCASTS_OPMLCONTAINER_H_ +#endif // INTERNET_PODCASTS_OPMLCONTAINER_H_ diff --git a/src/internet/podcasts/podcast.h b/src/internet/podcasts/podcast.h index 4a740a779..7d43bb04e 100644 --- a/src/internet/podcasts/podcast.h +++ b/src/internet/podcasts/podcast.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCAST_H_ -#define PODCASTS_PODCAST_H_ +#ifndef INTERNET_PODCASTS_PODCAST_H_ +#define INTERNET_PODCASTS_PODCAST_H_ #include "podcastepisode.h" @@ -109,4 +109,4 @@ Q_DECLARE_METATYPE(Podcast) typedef QList PodcastList; Q_DECLARE_METATYPE(QList) -#endif // PODCASTS_PODCAST_H_ +#endif // INTERNET_PODCASTS_PODCAST_H_ diff --git a/src/internet/podcasts/podcastbackend.h b/src/internet/podcasts/podcastbackend.h index 1fe178c2c..b3c3e47ec 100644 --- a/src/internet/podcasts/podcastbackend.h +++ b/src/internet/podcasts/podcastbackend.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTBACKEND_H_ -#define PODCASTS_PODCASTBACKEND_H_ +#ifndef INTERNET_PODCASTS_PODCASTBACKEND_H_ +#define INTERNET_PODCASTS_PODCASTBACKEND_H_ #include @@ -93,4 +93,4 @@ class PodcastBackend : public QObject { Database* db_; }; -#endif // PODCASTS_PODCASTBACKEND_H_ +#endif // INTERNET_PODCASTS_PODCASTBACKEND_H_ diff --git a/src/internet/podcasts/podcastdeleter.h b/src/internet/podcasts/podcastdeleter.h index f3a831a4e..48dd74ca4 100644 --- a/src/internet/podcasts/podcastdeleter.h +++ b/src/internet/podcasts/podcastdeleter.h @@ -15,8 +15,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTDELETER_H_ -#define PODCASTS_PODCASTDELETER_H_ +#ifndef INTERNET_PODCASTS_PODCASTDELETER_H_ +#define INTERNET_PODCASTS_PODCASTDELETER_H_ #include "core/network.h" #include "podcast.h" @@ -61,4 +61,4 @@ class PodcastDeleter : public QObject { QTimer* auto_delete_timer_; }; -#endif // PODCASTS_PODCASTDELETER_H_ +#endif // INTERNET_PODCASTS_PODCASTDELETER_H_ diff --git a/src/internet/podcasts/podcastdiscoverymodel.h b/src/internet/podcasts/podcastdiscoverymodel.h index 2c13113a7..2138689d9 100644 --- a/src/internet/podcasts/podcastdiscoverymodel.h +++ b/src/internet/podcasts/podcastdiscoverymodel.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTDISCOVERYMODEL_H_ -#define PODCASTS_PODCASTDISCOVERYMODEL_H_ +#ifndef INTERNET_PODCASTS_PODCASTDISCOVERYMODEL_H_ +#define INTERNET_PODCASTS_PODCASTDISCOVERYMODEL_H_ #include "covers/albumcoverloaderoptions.h" @@ -66,4 +66,4 @@ class PodcastDiscoveryModel : public QStandardItemModel { QIcon folder_icon_; }; -#endif // PODCASTS_PODCASTDISCOVERYMODEL_H_ +#endif // INTERNET_PODCASTS_PODCASTDISCOVERYMODEL_H_ diff --git a/src/internet/podcasts/podcastdownloader.h b/src/internet/podcasts/podcastdownloader.h index 7dbff6555..5db4a5ddb 100644 --- a/src/internet/podcasts/podcastdownloader.h +++ b/src/internet/podcasts/podcastdownloader.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTDOWNLOADER_H_ -#define PODCASTS_PODCASTDOWNLOADER_H_ +#ifndef INTERNET_PODCASTS_PODCASTDOWNLOADER_H_ +#define INTERNET_PODCASTS_PODCASTDOWNLOADER_H_ #include "core/network.h" #include "podcast.h" @@ -121,4 +121,4 @@ class PodcastDownloader : public QObject { QList list_tasks_; }; -#endif // PODCASTS_PODCASTDOWNLOADER_H_ +#endif // INTERNET_PODCASTS_PODCASTDOWNLOADER_H_ diff --git a/src/internet/podcasts/podcastepisode.h b/src/internet/podcasts/podcastepisode.h index cb4271165..6547eaa27 100644 --- a/src/internet/podcasts/podcastepisode.h +++ b/src/internet/podcasts/podcastepisode.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTEPISODE_H_ -#define PODCASTS_PODCASTEPISODE_H_ +#ifndef INTERNET_PODCASTS_PODCASTEPISODE_H_ +#define INTERNET_PODCASTS_PODCASTEPISODE_H_ #include "core/song.h" @@ -89,4 +89,4 @@ Q_DECLARE_METATYPE(PodcastEpisode) typedef QList PodcastEpisodeList; Q_DECLARE_METATYPE(QList) -#endif // PODCASTS_PODCASTEPISODE_H_ +#endif // INTERNET_PODCASTS_PODCASTEPISODE_H_ diff --git a/src/internet/podcasts/podcastinfowidget.h b/src/internet/podcasts/podcastinfowidget.h index ec0efe259..34a4e28f6 100644 --- a/src/internet/podcasts/podcastinfowidget.h +++ b/src/internet/podcasts/podcastinfowidget.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTINFOWIDGET_H_ -#define PODCASTS_PODCASTINFOWIDGET_H_ +#ifndef INTERNET_PODCASTS_PODCASTINFOWIDGET_H_ +#define INTERNET_PODCASTS_PODCASTINFOWIDGET_H_ #include "podcast.h" #include "covers/albumcoverloaderoptions.h" @@ -57,4 +57,4 @@ class PodcastInfoWidget : public QWidget { quint64 image_id_; }; -#endif // PODCASTS_PODCASTINFOWIDGET_H_ +#endif // INTERNET_PODCASTS_PODCASTINFOWIDGET_H_ diff --git a/src/internet/podcasts/podcastparser.h b/src/internet/podcasts/podcastparser.h index 8f25ffaa8..8995bdc97 100644 --- a/src/internet/podcasts/podcastparser.h +++ b/src/internet/podcasts/podcastparser.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTPARSER_H_ -#define PODCASTS_PODCASTPARSER_H_ +#ifndef INTERNET_PODCASTS_PODCASTPARSER_H_ +#define INTERNET_PODCASTS_PODCASTPARSER_H_ #include @@ -66,4 +66,4 @@ class PodcastParser { QStringList supported_mime_types_; }; -#endif // PODCASTS_PODCASTPARSER_H_ +#endif // INTERNET_PODCASTS_PODCASTPARSER_H_ diff --git a/src/internet/podcasts/podcastservice.h b/src/internet/podcasts/podcastservice.h index 52663bed0..eb93de4f7 100644 --- a/src/internet/podcasts/podcastservice.h +++ b/src/internet/podcasts/podcastservice.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTSERVICE_H_ -#define PODCASTS_PODCASTSERVICE_H_ +#ifndef INTERNET_PODCASTS_PODCASTSERVICE_H_ +#define INTERNET_PODCASTS_PODCASTSERVICE_H_ #include "podcastdeleter.h" #include "podcastdownloader.h" @@ -166,4 +166,4 @@ class PodcastService : public InternetService { std::unique_ptr add_podcast_dialog_; }; -#endif // PODCASTS_PODCASTSERVICE_H_ +#endif // INTERNET_PODCASTS_PODCASTSERVICE_H_ diff --git a/src/internet/podcasts/podcastservicemodel.h b/src/internet/podcasts/podcastservicemodel.h index 420f1b32c..d4b370c2f 100644 --- a/src/internet/podcasts/podcastservicemodel.h +++ b/src/internet/podcasts/podcastservicemodel.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTSERVICEMODEL_H_ -#define PODCASTS_PODCASTSERVICEMODEL_H_ +#ifndef INTERNET_PODCASTS_PODCASTSERVICEMODEL_H_ +#define INTERNET_PODCASTS_PODCASTSERVICEMODEL_H_ #include @@ -39,4 +39,4 @@ class PodcastServiceModel : public QStandardItemModel { QList* urls) const; }; -#endif // PODCASTS_PODCASTSERVICEMODEL_H_ +#endif // INTERNET_PODCASTS_PODCASTSERVICEMODEL_H_ diff --git a/src/internet/podcasts/podcastsettingspage.h b/src/internet/podcasts/podcastsettingspage.h index 3be647895..a8f45f431 100644 --- a/src/internet/podcasts/podcastsettingspage.h +++ b/src/internet/podcasts/podcastsettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTSETTINGSPAGE_H_ -#define PODCASTS_PODCASTSETTINGSPAGE_H_ +#ifndef INTERNET_PODCASTS_PODCASTSETTINGSPAGE_H_ +#define INTERNET_PODCASTS_PODCASTSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -49,4 +49,4 @@ class PodcastSettingsPage : public SettingsPage { Ui_PodcastSettingsPage* ui_; }; -#endif // PODCASTS_PODCASTSETTINGSPAGE_H_ +#endif // INTERNET_PODCASTS_PODCASTSETTINGSPAGE_H_ diff --git a/src/internet/podcasts/podcastupdater.h b/src/internet/podcasts/podcastupdater.h index aacc86b97..f55f9cb51 100644 --- a/src/internet/podcasts/podcastupdater.h +++ b/src/internet/podcasts/podcastupdater.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTUPDATER_H_ -#define PODCASTS_PODCASTUPDATER_H_ +#ifndef INTERNET_PODCASTS_PODCASTUPDATER_H_ +#define INTERNET_PODCASTS_PODCASTUPDATER_H_ #include #include @@ -66,4 +66,4 @@ class PodcastUpdater : public QObject { int pending_replies_; }; -#endif // PODCASTS_PODCASTUPDATER_H_ +#endif // INTERNET_PODCASTS_PODCASTUPDATER_H_ diff --git a/src/internet/podcasts/podcasturlloader.h b/src/internet/podcasts/podcasturlloader.h index 73c1e5e48..4c7cff923 100644 --- a/src/internet/podcasts/podcasturlloader.h +++ b/src/internet/podcasts/podcasturlloader.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef PODCASTS_PODCASTURLLOADER_H_ -#define PODCASTS_PODCASTURLLOADER_H_ +#ifndef INTERNET_PODCASTS_PODCASTURLLOADER_H_ +#define INTERNET_PODCASTS_PODCASTURLLOADER_H_ #include #include @@ -111,4 +111,4 @@ class PodcastUrlLoader : public QObject { QRegExp html_link_href_re_; }; -#endif // PODCASTS_PODCASTURLLOADER_H_ +#endif // INTERNET_PODCASTS_PODCASTURLLOADER_H_ diff --git a/src/internet/seafile/seafileservice.h b/src/internet/seafile/seafileservice.h index ab47dd5d2..e60b40bf3 100644 --- a/src/internet/seafile/seafileservice.h +++ b/src/internet/seafile/seafileservice.h @@ -42,8 +42,8 @@ * - Stop Tagreader when user changes the library */ -#ifndef INTERNET_SEAFILESERVICE_H_ -#define INTERNET_SEAFILESERVICE_H_ +#ifndef INTERNET_SEAFILE_SEAFILESERVICE_H_ +#define INTERNET_SEAFILE_SEAFILESERVICE_H_ #include "internet/core/cloudfileservice.h" @@ -149,4 +149,4 @@ class SeafileService : public CloudFileService { QString library_updated_; }; -#endif // INTERNET_SEAFILESERVICE_H_ +#endif // INTERNET_SEAFILE_SEAFILESERVICE_H_ diff --git a/src/internet/seafile/seafilesettingspage.h b/src/internet/seafile/seafilesettingspage.h index 6ac7c53a0..3285ae695 100644 --- a/src/internet/seafile/seafilesettingspage.h +++ b/src/internet/seafile/seafilesettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SEAFILESETTINGSPAGE_H_ -#define INTERNET_SEAFILESETTINGSPAGE_H_ +#ifndef INTERNET_SEAFILE_SEAFILESETTINGSPAGE_H_ +#define INTERNET_SEAFILE_SEAFILESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -48,4 +48,4 @@ class SeafileSettingsPage : public SettingsPage { SeafileService* service_; }; -#endif // INTERNET_SEAFILESETTINGSPAGE_H_ +#endif // INTERNET_SEAFILE_SEAFILESETTINGSPAGE_H_ diff --git a/src/internet/seafile/seafiletree.h b/src/internet/seafile/seafiletree.h index 0c9ef139f..5635156dc 100644 --- a/src/internet/seafile/seafiletree.h +++ b/src/internet/seafile/seafiletree.h @@ -20,8 +20,8 @@ * - */ -#ifndef INTERNET_SEAFILETREE_H_ -#define INTERNET_SEAFILETREE_H_ +#ifndef INTERNET_SEAFILE_SEAFILETREE_H_ +#define INTERNET_SEAFILE_SEAFILETREE_H_ #include #include @@ -182,4 +182,4 @@ QDataStream& operator>>(QDataStream& in, SeafileTree::Entry& entry); QDataStream& operator<<(QDataStream& out, SeafileTree::TreeItem* item); QDataStream& operator>>(QDataStream& in, SeafileTree::TreeItem*& item); -#endif // INTERNET_SEAFILETREE_H_ +#endif // INTERNET_SEAFILE_SEAFILETREE_H_ diff --git a/src/internet/seafile/seafileurlhandler.h b/src/internet/seafile/seafileurlhandler.h index 9493e763a..e0f0f15d6 100644 --- a/src/internet/seafile/seafileurlhandler.h +++ b/src/internet/seafile/seafileurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SEAFILEURLHANDLER_H_ -#define INTERNET_SEAFILEURLHANDLER_H_ +#ifndef INTERNET_SEAFILE_SEAFILEURLHANDLER_H_ +#define INTERNET_SEAFILE_SEAFILEURLHANDLER_H_ #include "core/urlhandler.h" @@ -36,4 +36,4 @@ class SeafileUrlHandler : public UrlHandler { SeafileService* service_; }; -#endif // INTERNET_SEAFILEURLHANDLER_H_ +#endif // INTERNET_SEAFILE_SEAFILEURLHANDLER_H_ diff --git a/src/internet/skydrive/skydriveservice.h b/src/internet/skydrive/skydriveservice.h index 0bae32d05..9cd7cbbbf 100644 --- a/src/internet/skydrive/skydriveservice.h +++ b/src/internet/skydrive/skydriveservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SKYDRIVESERVICE_H_ -#define INTERNET_SKYDRIVESERVICE_H_ +#ifndef INTERNET_SKYDRIVE_SKYDRIVESERVICE_H_ +#define INTERNET_SKYDRIVE_SKYDRIVESERVICE_H_ #include "internet/core/cloudfileservice.h" @@ -62,4 +62,4 @@ class SkydriveService : public CloudFileService { QDateTime expiry_time_; }; -#endif // INTERNET_SKYDRIVESERVICE_H_ +#endif // INTERNET_SKYDRIVE_SKYDRIVESERVICE_H_ diff --git a/src/internet/skydrive/skydrivesettingspage.h b/src/internet/skydrive/skydrivesettingspage.h index 2761a94ec..6a524f47d 100644 --- a/src/internet/skydrive/skydrivesettingspage.h +++ b/src/internet/skydrive/skydrivesettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SKYDRIVESETTINGSPAGE_H_ -#define INTERNET_SKYDRIVESETTINGSPAGE_H_ +#ifndef INTERNET_SKYDRIVE_SKYDRIVESETTINGSPAGE_H_ +#define INTERNET_SKYDRIVE_SKYDRIVESETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -51,4 +51,4 @@ class SkydriveSettingsPage : public SettingsPage { SkydriveService* service_; }; -#endif // INTERNET_SKYDRIVESETTINGSPAGE_H_ +#endif // INTERNET_SKYDRIVE_SKYDRIVESETTINGSPAGE_H_ diff --git a/src/internet/skydrive/skydriveurlhandler.h b/src/internet/skydrive/skydriveurlhandler.h index a789a01a7..dd18346b7 100644 --- a/src/internet/skydrive/skydriveurlhandler.h +++ b/src/internet/skydrive/skydriveurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SKYDRIVEURLHANDLER_H_ -#define INTERNET_SKYDRIVEURLHANDLER_H_ +#ifndef INTERNET_SKYDRIVE_SKYDRIVEURLHANDLER_H_ +#define INTERNET_SKYDRIVE_SKYDRIVEURLHANDLER_H_ #include "core/urlhandler.h" @@ -37,4 +37,4 @@ class SkydriveUrlHandler : public UrlHandler { SkydriveService* service_; }; -#endif // INTERNET_SKYDRIVEURLHANDLER_H_ +#endif // INTERNET_SKYDRIVE_SKYDRIVEURLHANDLER_H_ diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h index 9607c7a2f..0ebf5c53f 100644 --- a/src/internet/somafm/somafmservice.h +++ b/src/internet/somafm/somafmservice.h @@ -18,8 +18,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SOMAFMSERVICE_H_ -#define INTERNET_SOMAFMSERVICE_H_ +#ifndef INTERNET_SOMAFM_SOMAFMSERVICE_H_ +#define INTERNET_SOMAFM_SOMAFMSERVICE_H_ #include @@ -119,4 +119,4 @@ QDataStream& operator<<(QDataStream& out, const SomaFMService::Stream& stream); QDataStream& operator>>(QDataStream& in, SomaFMService::Stream& stream); Q_DECLARE_METATYPE(SomaFMService::Stream) -#endif // INTERNET_SOMAFMSERVICE_H_ +#endif // INTERNET_SOMAFM_SOMAFMSERVICE_H_ diff --git a/src/internet/somafm/somafmurlhandler.h b/src/internet/somafm/somafmurlhandler.h index 82eff48aa..6f89d1ac5 100644 --- a/src/internet/somafm/somafmurlhandler.h +++ b/src/internet/somafm/somafmurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SOMAFMURLHANDLER_H_ -#define INTERNET_SOMAFMURLHANDLER_H_ +#ifndef INTERNET_SOMAFM_SOMAFMURLHANDLER_H_ +#define INTERNET_SOMAFM_SOMAFMURLHANDLER_H_ #include "core/urlhandler.h" @@ -46,4 +46,4 @@ class SomaFMUrlHandler : public UrlHandler { int task_id_; }; -#endif // INTERNET_SOMAFMURLHANDLER_H_ +#endif // INTERNET_SOMAFM_SOMAFMURLHANDLER_H_ diff --git a/src/internet/soundcloud/soundcloudservice.h b/src/internet/soundcloud/soundcloudservice.h index 83d335a4f..a806204b4 100644 --- a/src/internet/soundcloud/soundcloudservice.h +++ b/src/internet/soundcloud/soundcloudservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SOUNDCLOUDSERVICE_H_ -#define INTERNET_SOUNDCLOUDSERVICE_H_ +#ifndef INTERNET_SOUNDCLOUD_SOUNDCLOUDSERVICE_H_ +#define INTERNET_SOUNDCLOUD_SOUNDCLOUDSERVICE_H_ #include "internet/core/internetmodel.h" #include "internet/core/internetservice.h" @@ -144,4 +144,4 @@ class SoundCloudService : public InternetService { static const char* kApiClientSecret; }; -#endif // INTERNET_SOUNDCLOUDSERVICE_H_ +#endif // INTERNET_SOUNDCLOUD_SOUNDCLOUDSERVICE_H_ diff --git a/src/internet/soundcloud/soundcloudsettingspage.h b/src/internet/soundcloud/soundcloudsettingspage.h index 8c8dbb70c..25b5ea3fe 100644 --- a/src/internet/soundcloud/soundcloudsettingspage.h +++ b/src/internet/soundcloud/soundcloudsettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ -#define INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ +#ifndef INTERNET_SOUNDCLOUD_SOUNDCLOUDSETTINGSPAGE_H_ +#define INTERNET_SOUNDCLOUD_SOUNDCLOUDSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -48,4 +48,4 @@ class SoundCloudSettingsPage : public SettingsPage { SoundCloudService* service_; }; -#endif // INTERNET_SOUNDCLOUDSETTINGSPAGE_H_ +#endif // INTERNET_SOUNDCLOUD_SOUNDCLOUDSETTINGSPAGE_H_ diff --git a/src/internet/spotify/spotifyblobdownloader.h b/src/internet/spotify/spotifyblobdownloader.h index b6b64190e..d5879840b 100644 --- a/src/internet/spotify/spotifyblobdownloader.h +++ b/src/internet/spotify/spotifyblobdownloader.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SPOTIFYBLOBDOWNLOADER_H_ -#define INTERNET_SPOTIFYBLOBDOWNLOADER_H_ +#ifndef INTERNET_SPOTIFY_SPOTIFYBLOBDOWNLOADER_H_ +#define INTERNET_SPOTIFY_SPOTIFYBLOBDOWNLOADER_H_ #include @@ -62,4 +62,4 @@ class SpotifyBlobDownloader : public QObject { QProgressDialog* progress_; }; -#endif // INTERNET_SPOTIFYBLOBDOWNLOADER_H_ +#endif // INTERNET_SPOTIFY_SPOTIFYBLOBDOWNLOADER_H_ diff --git a/src/internet/spotify/spotifyserver.h b/src/internet/spotify/spotifyserver.h index 0221e308f..027bf1f6d 100644 --- a/src/internet/spotify/spotifyserver.h +++ b/src/internet/spotify/spotifyserver.h @@ -19,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SPOTIFYSERVER_H_ -#define INTERNET_SPOTIFYSERVER_H_ +#ifndef INTERNET_SPOTIFY_SPOTIFYSERVER_H_ +#define INTERNET_SPOTIFY_SPOTIFYSERVER_H_ #include "spotifymessages.pb.h" #include "core/messagehandler.h" @@ -98,4 +98,4 @@ class SpotifyServer : public AbstractMessageHandler { QList queued_messages_; }; -#endif // INTERNET_SPOTIFYSERVER_H_ +#endif // INTERNET_SPOTIFY_SPOTIFYSERVER_H_ diff --git a/src/internet/spotify/spotifyservice.h b/src/internet/spotify/spotifyservice.h index 5d446b00d..19277e5ad 100644 --- a/src/internet/spotify/spotifyservice.h +++ b/src/internet/spotify/spotifyservice.h @@ -19,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SPOTIFYSERVICE_H_ -#define INTERNET_SPOTIFYSERVICE_H_ +#ifndef INTERNET_SPOTIFY_SPOTIFYSERVICE_H_ +#define INTERNET_SPOTIFY_SPOTIFYSERVICE_H_ #include "internet/core/internetmodel.h" #include "internet/core/internetservice.h" @@ -184,4 +184,4 @@ class SpotifyService : public InternetService { bool volume_normalisation_; }; -#endif // INTERNET_SPOTIFYSERVICE_H_ +#endif // INTERNET_SPOTIFY_SPOTIFYSERVICE_H_ diff --git a/src/internet/spotify/spotifysettingspage.h b/src/internet/spotify/spotifysettingspage.h index 6625bfe39..59cc247d1 100644 --- a/src/internet/spotify/spotifysettingspage.h +++ b/src/internet/spotify/spotifysettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SPOTIFYSETTINGSPAGE_H_ -#define INTERNET_SPOTIFYSETTINGSPAGE_H_ +#ifndef INTERNET_SPOTIFY_SPOTIFYSETTINGSPAGE_H_ +#define INTERNET_SPOTIFY_SPOTIFYSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -57,4 +57,4 @@ class SpotifySettingsPage : public SettingsPage { QString original_password_; }; -#endif // INTERNET_SPOTIFYSETTINGSPAGE_H_ +#endif // INTERNET_SPOTIFY_SPOTIFYSETTINGSPAGE_H_ diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h index a89279263..4450522d8 100644 --- a/src/internet/subsonic/subsonicservice.h +++ b/src/internet/subsonic/subsonicservice.h @@ -19,8 +19,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SUBSONICSERVICE_H_ -#define INTERNET_SUBSONICSERVICE_H_ +#ifndef INTERNET_SUBSONIC_SUBSONICSERVICE_H_ +#define INTERNET_SUBSONIC_SUBSONICSERVICE_H_ #include @@ -196,4 +196,4 @@ class SubsonicLibraryScanner : public QObject { SongList songs_; }; -#endif // INTERNET_SUBSONICSERVICE_H_ +#endif // INTERNET_SUBSONIC_SUBSONICSERVICE_H_ diff --git a/src/internet/subsonic/subsonicsettingspage.h b/src/internet/subsonic/subsonicsettingspage.h index 5de4fe7fa..836f8191c 100644 --- a/src/internet/subsonic/subsonicsettingspage.h +++ b/src/internet/subsonic/subsonicsettingspage.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SUBSONICSETTINGSPAGE_H_ -#define INTERNET_SUBSONICSETTINGSPAGE_H_ +#ifndef INTERNET_SUBSONIC_SUBSONICSETTINGSPAGE_H_ +#define INTERNET_SUBSONIC_SUBSONICSETTINGSPAGE_H_ #include "ui/settingspage.h" #include "subsonicservice.h" @@ -48,4 +48,4 @@ class SubsonicSettingsPage : public SettingsPage { SubsonicService* service_; }; -#endif // INTERNET_SUBSONICSETTINGSPAGE_H_ +#endif // INTERNET_SUBSONIC_SUBSONICSETTINGSPAGE_H_ diff --git a/src/internet/subsonic/subsonicurlhandler.h b/src/internet/subsonic/subsonicurlhandler.h index 8ad2100d8..fb8c6de9c 100644 --- a/src/internet/subsonic/subsonicurlhandler.h +++ b/src/internet/subsonic/subsonicurlhandler.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_SUBSONICURLHANDLER_H_ -#define INTERNET_SUBSONICURLHANDLER_H_ +#ifndef INTERNET_SUBSONIC_SUBSONICURLHANDLER_H_ +#define INTERNET_SUBSONIC_SUBSONICURLHANDLER_H_ #include "core/urlhandler.h" @@ -39,4 +39,4 @@ class SubsonicUrlHandler : public UrlHandler { SubsonicService* service_; }; -#endif // INTERNET_SUBSONICURLHANDLER_H_ +#endif // INTERNET_SUBSONIC_SUBSONICURLHANDLER_H_ diff --git a/src/internet/vk/vkconnection.h b/src/internet/vk/vkconnection.h index e2cac5622..557f6aedc 100644 --- a/src/internet/vk/vkconnection.h +++ b/src/internet/vk/vkconnection.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKCONNECTION_H_ -#define INTERNET_VKCONNECTION_H_ +#ifndef INTERNET_VK_VKCONNECTION_H_ +#define INTERNET_VK_VKCONNECTION_H_ #include "vreen/client.h" #include "vreen/connection.h" @@ -87,4 +87,4 @@ class VkConnection : public Vreen::Connection { Q_DECLARE_OPERATORS_FOR_FLAGS(VkConnection::Scopes) -#endif // INTERNET_VKCONNECTION_H_ +#endif // INTERNET_VK_VKCONNECTION_H_ diff --git a/src/internet/vk/vkmusiccache.h b/src/internet/vk/vkmusiccache.h index 71567ab10..7c72d6db2 100644 --- a/src/internet/vk/vkmusiccache.h +++ b/src/internet/vk/vkmusiccache.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKMUSICCACHE_H_ -#define INTERNET_VKMUSICCACHE_H_ +#ifndef INTERNET_VK_VKMUSICCACHE_H_ +#define INTERNET_VK_VKMUSICCACHE_H_ #include #include @@ -76,4 +76,4 @@ class VkMusicCache : public QObject { QNetworkReply* reply_; }; -#endif // INTERNET_VKMUSICCACHE_H_ +#endif // INTERNET_VK_VKMUSICCACHE_H_ diff --git a/src/internet/vk/vksearchdialog.h b/src/internet/vk/vksearchdialog.h index f2d142790..620d79095 100644 --- a/src/internet/vk/vksearchdialog.h +++ b/src/internet/vk/vksearchdialog.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKSEARCHDIALOG_H_ -#define INTERNET_VKSEARCHDIALOG_H_ +#ifndef INTERNET_VK_VKSEARCHDIALOG_H_ +#define INTERNET_VK_VKSEARCHDIALOG_H_ #include #include @@ -63,4 +63,4 @@ class VkSearchDialog : public QDialog { QTimer* timer; }; -#endif // INTERNET_VKSEARCHDIALOG_H_ +#endif // INTERNET_VK_VKSEARCHDIALOG_H_ diff --git a/src/internet/vk/vkservice.h b/src/internet/vk/vkservice.h index 02363785f..1ef5c8c2a 100644 --- a/src/internet/vk/vkservice.h +++ b/src/internet/vk/vkservice.h @@ -17,8 +17,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKSERVICE_H_ -#define INTERNET_VKSERVICE_H_ +#ifndef INTERNET_VK_VKSERVICE_H_ +#define INTERNET_VK_VKSERVICE_H_ #include @@ -320,4 +320,4 @@ class VkService : public InternetService { QString cacheFilename_; }; -#endif // INTERNET_VKSERVICE_H_ +#endif // INTERNET_VK_VKSERVICE_H_ diff --git a/src/internet/vk/vksettingspage.h b/src/internet/vk/vksettingspage.h index 5d867db9d..826d4ba66 100644 --- a/src/internet/vk/vksettingspage.h +++ b/src/internet/vk/vksettingspage.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKSETTINGSPAGE_H_ -#define INTERNET_VKSETTINGSPAGE_H_ +#ifndef INTERNET_VK_VKSETTINGSPAGE_H_ +#define INTERNET_VK_VKSETTINGSPAGE_H_ #include "ui/settingspage.h" @@ -53,4 +53,4 @@ class VkSettingsPage : public SettingsPage { VkService* service_; }; -#endif // INTERNET_VKSETTINGSPAGE_H_ +#endif // INTERNET_VK_VKSETTINGSPAGE_H_ diff --git a/src/internet/vk/vkurlhandler.h b/src/internet/vk/vkurlhandler.h index 11bcd88d3..91334edb2 100644 --- a/src/internet/vk/vkurlhandler.h +++ b/src/internet/vk/vkurlhandler.h @@ -16,8 +16,8 @@ along with Clementine. If not, see . */ -#ifndef INTERNET_VKURLHANDLER_H_ -#define INTERNET_VKURLHANDLER_H_ +#ifndef INTERNET_VK_VKURLHANDLER_H_ +#define INTERNET_VK_VKURLHANDLER_H_ #include "core/urlhandler.h" #include @@ -41,4 +41,4 @@ class VkUrlHandler : public UrlHandler { VkService* service_; }; -#endif // INTERNET_VKURLHANDLER_H_ +#endif // INTERNET_VK_VKURLHANDLER_H_ From 17c35e32e5970bfc3a0ca41fd5cbd5869aa9e0be Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Fri, 19 Dec 2014 00:40:30 +0100 Subject: [PATCH 7/8] 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), From a6322da1964961318227006ee67554e819a14b78 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobiecki Date: Fri, 19 Dec 2014 00:46:38 +0100 Subject: [PATCH 8/8] Fix header copyright tags in internet/ --- src/internet/core/internetmodel.cpp | 4 ++-- src/internet/core/internetservice.cpp | 2 +- src/internet/digitally/digitallyimportedservicebase.h | 1 - src/internet/jamendo/jamendodynamicplaylist.cpp | 1 - src/internet/lastfm/lastfmservice.cpp | 1 - src/internet/magnatune/magnatuneplaylistitem.cpp | 1 - src/internet/podcasts/addpodcastbyurl.h | 2 +- src/internet/podcasts/addpodcastdialog.h | 2 +- src/internet/podcasts/gpoddersearchpage.h | 2 +- src/internet/podcasts/gpoddersync.h | 2 +- src/internet/podcasts/gpoddertoptagspage.h | 2 +- src/internet/podcasts/itunessearchpage.h | 2 +- src/internet/podcasts/opmlcontainer.h | 2 +- src/internet/podcasts/podcast.h | 2 +- src/internet/podcasts/podcastdiscoverymodel.h | 2 +- src/internet/podcasts/podcastepisode.h | 2 +- src/internet/podcasts/podcastparser.h | 2 +- src/internet/podcasts/podcastupdater.h | 2 +- src/internet/somafm/somafmservice.h | 1 - src/internet/somafm/somafmurlhandler.cpp | 1 - src/internet/spotify/spotifysettingspage.cpp | 3 +-- 21 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp index 32e0a58a7..f6fc581b4 100644 --- a/src/internet/core/internetmodel.cpp +++ b/src/internet/core/internetmodel.cpp @@ -1,10 +1,10 @@ /* This file is part of Clementine. Copyright 2009-2014, David Sansome - Copyright 2010, 2012-2014, John Maguire Copyright 2011-2012, 2014, Arnaud Bienner Copyright 2011, Tyler Rhodes Copyright 2011, Paweł Bara - Copyright 2011-2013, Alan Briolat + Copyright 2012-2013, Alan Briolat + Copyright 2012-2014, John Maguire Copyright 2014, Maltsev Vlad Copyright 2014, Chocobozzz Copyright 2014, Krzysztof Sobiecki diff --git a/src/internet/core/internetservice.cpp b/src/internet/core/internetservice.cpp index aeade51fb..b4fe66d0c 100644 --- a/src/internet/core/internetservice.cpp +++ b/src/internet/core/internetservice.cpp @@ -1,5 +1,5 @@ /* This file is part of Clementine. - Copyright 2009-2012, David Sansome + Copyright 2010-2012, David Sansome Copyright 2011, Tyler Rhodes Copyright 2011, Paweł Bara Copyright 2012, Arnaud Bienner diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h index a7db4ba16..72ea8f755 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -1,4 +1,3 @@ - /* This file is part of Clementine. Copyright 2011-2012, David Sansome Copyright 2012, 2014, John Maguire diff --git a/src/internet/jamendo/jamendodynamicplaylist.cpp b/src/internet/jamendo/jamendodynamicplaylist.cpp index fce33f324..cfcfb16a8 100644 --- a/src/internet/jamendo/jamendodynamicplaylist.cpp +++ b/src/internet/jamendo/jamendodynamicplaylist.cpp @@ -1,7 +1,6 @@ /* This file is part of Clementine. Copyright 2010-2011, David Sansome Copyright 2010, 2014, John Maguire - Copyright 2011, Tyler Rhodes Copyright 2011, Arnaud Bienner Copyright 2014, Krzysztof Sobiecki diff --git a/src/internet/lastfm/lastfmservice.cpp b/src/internet/lastfm/lastfmservice.cpp index 8ddb1de59..243e5858d 100644 --- a/src/internet/lastfm/lastfmservice.cpp +++ b/src/internet/lastfm/lastfmservice.cpp @@ -1,7 +1,6 @@ /* This file is part of Clementine. Copyright 2009-2013, David Sansome Copyright 2010-2012, 2014, John Maguire - Copyright 2011, Tyler Rhodes Copyright 2011, Andrea Decorte Copyright 2012, Arnaud Bienner Copyright 2012, Kacper "mattrick" Banasik diff --git a/src/internet/magnatune/magnatuneplaylistitem.cpp b/src/internet/magnatune/magnatuneplaylistitem.cpp index 3442ca020..20da67965 100644 --- a/src/internet/magnatune/magnatuneplaylistitem.cpp +++ b/src/internet/magnatune/magnatuneplaylistitem.cpp @@ -1,7 +1,6 @@ /* This file is part of Clementine. Copyright 2010-2011, David Sansome Copyright 2010, 2014, John Maguire - Copyright 2011, Tyler Rhodes Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify diff --git a/src/internet/podcasts/addpodcastbyurl.h b/src/internet/podcasts/addpodcastbyurl.h index 442813e78..a3602b4e2 100644 --- a/src/internet/podcasts/addpodcastbyurl.h +++ b/src/internet/podcasts/addpodcastbyurl.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/addpodcastdialog.h b/src/internet/podcasts/addpodcastdialog.h index 2711cc5c3..29915d884 100644 --- a/src/internet/podcasts/addpodcastdialog.h +++ b/src/internet/podcasts/addpodcastdialog.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/gpoddersearchpage.h b/src/internet/podcasts/gpoddersearchpage.h index 644f91783..1e2d2a773 100644 --- a/src/internet/podcasts/gpoddersearchpage.h +++ b/src/internet/podcasts/gpoddersearchpage.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/gpoddersync.h b/src/internet/podcasts/gpoddersync.h index 84e527ccd..d8613243b 100644 --- a/src/internet/podcasts/gpoddersync.h +++ b/src/internet/podcasts/gpoddersync.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/gpoddertoptagspage.h b/src/internet/podcasts/gpoddertoptagspage.h index 78529e3b8..9248cdb94 100644 --- a/src/internet/podcasts/gpoddertoptagspage.h +++ b/src/internet/podcasts/gpoddertoptagspage.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/itunessearchpage.h b/src/internet/podcasts/itunessearchpage.h index 3a9de8481..1fbe6ed1e 100644 --- a/src/internet/podcasts/itunessearchpage.h +++ b/src/internet/podcasts/itunessearchpage.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/opmlcontainer.h b/src/internet/podcasts/opmlcontainer.h index 741fdc257..bea6b41e2 100644 --- a/src/internet/podcasts/opmlcontainer.h +++ b/src/internet/podcasts/opmlcontainer.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/podcast.h b/src/internet/podcasts/podcast.h index 7d43bb04e..1a9c066ed 100644 --- a/src/internet/podcasts/podcast.h +++ b/src/internet/podcasts/podcast.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/podcastdiscoverymodel.h b/src/internet/podcasts/podcastdiscoverymodel.h index 2138689d9..01dae3236 100644 --- a/src/internet/podcasts/podcastdiscoverymodel.h +++ b/src/internet/podcasts/podcastdiscoverymodel.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/podcastepisode.h b/src/internet/podcasts/podcastepisode.h index 6547eaa27..49b0345cc 100644 --- a/src/internet/podcasts/podcastepisode.h +++ b/src/internet/podcasts/podcastepisode.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/podcastparser.h b/src/internet/podcasts/podcastparser.h index 8995bdc97..50e02d4fe 100644 --- a/src/internet/podcasts/podcastparser.h +++ b/src/internet/podcasts/podcastparser.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/podcasts/podcastupdater.h b/src/internet/podcasts/podcastupdater.h index f55f9cb51..76beead26 100644 --- a/src/internet/podcasts/podcastupdater.h +++ b/src/internet/podcasts/podcastupdater.h @@ -1,7 +1,7 @@ /* This file is part of Clementine. Copyright 2012, David Sansome - Copyright 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h index 0ebf5c53f..72523fb8e 100644 --- a/src/internet/somafm/somafmservice.h +++ b/src/internet/somafm/somafmservice.h @@ -1,7 +1,6 @@ /* This file is part of Clementine. Copyright 2010-2013, David Sansome Copyright 2010, 2014, John Maguire - Copyright 2011, Tyler Rhodes Copyright 2014, Krzysztof Sobiecki Clementine is free software: you can redistribute it and/or modify diff --git a/src/internet/somafm/somafmurlhandler.cpp b/src/internet/somafm/somafmurlhandler.cpp index 337d8c876..27f7a64f8 100644 --- a/src/internet/somafm/somafmurlhandler.cpp +++ b/src/internet/somafm/somafmurlhandler.cpp @@ -1,5 +1,4 @@ /* This file is part of Clementine. - Copyright 2011, Tyler Rhodes Copyright 2011-2013, David Sansome Copyright 2012, Olaf Christ Copyright 2014, Krzysztof Sobiecki diff --git a/src/internet/spotify/spotifysettingspage.cpp b/src/internet/spotify/spotifysettingspage.cpp index a07a16db2..4a35de177 100644 --- a/src/internet/spotify/spotifysettingspage.cpp +++ b/src/internet/spotify/spotifysettingspage.cpp @@ -1,9 +1,8 @@ /* This file is part of Clementine. - Copyright 2011, Tyler Rhodes Copyright 2011, Andrea Decorte Copyright 2011-2013, David Sansome - Copyright 2011-2012, 2014, John Maguire Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire Clementine is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by