Fix header order in internet/
This commit is contained in:
parent
23ee9170b6
commit
17c35e32e5
|
@ -20,16 +20,17 @@
|
|||
*/
|
||||
|
||||
#include "internet/core/internetplaylistitem.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QApplication>
|
||||
#include <QtDebug>
|
||||
|
||||
#include "internet/core/internetservice.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "core/settingsprovider.h"
|
||||
#include "library/sqlrow.h"
|
||||
#include "playlist/playlistbackend.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QApplication>
|
||||
#include <QtDebug>
|
||||
|
||||
InternetPlaylistItem::InternetPlaylistItem(const QString& type)
|
||||
: PlaylistItem(type), set_service_icon_(false) {}
|
||||
|
||||
|
|
|
@ -21,15 +21,16 @@
|
|||
*/
|
||||
|
||||
#include "internet/core/internetservice.h"
|
||||
|
||||
#include <QMenu>
|
||||
#include <QStandardItem>
|
||||
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "core/logging.h"
|
||||
#include "core/mergedproxymodel.h"
|
||||
#include "core/mimedata.h"
|
||||
#include "ui/iconloader.h"
|
||||
|
||||
#include <QMenu>
|
||||
#include <QStandardItem>
|
||||
|
||||
InternetService::InternetService(const QString& name, Application* app,
|
||||
InternetModel* model, QObject* parent)
|
||||
: QObject(parent),
|
||||
|
|
|
@ -20,12 +20,13 @@
|
|||
*/
|
||||
|
||||
#include "internetview.h"
|
||||
|
||||
#include <QContextMenuEvent>
|
||||
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "core/mergedproxymodel.h"
|
||||
#include "library/libraryview.h"
|
||||
|
||||
#include <QContextMenuEvent>
|
||||
|
||||
InternetView::InternetView(QWidget* parent) : AutoExpandingTreeView(parent) {
|
||||
setItemDelegate(new LibraryItemDelegate(this));
|
||||
SetExpandOnReset(false);
|
||||
|
|
|
@ -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 <QMetaMethod>
|
||||
#include <QTimeLine>
|
||||
#include <QtDebug>
|
||||
|
||||
#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)
|
||||
|
|
|
@ -18,15 +18,16 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "internet/core/internetservice.h"
|
||||
#include "internet/core/searchboxwidget.h"
|
||||
#include "ui_searchboxwidget.h"
|
||||
#include "ui/iconloader.h"
|
||||
#include "widgets/didyoumean.h"
|
||||
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
|
||||
#include "internet/core/internetservice.h"
|
||||
#include "ui/iconloader.h"
|
||||
#include "widgets/didyoumean.h"
|
||||
|
||||
SearchBoxWidget::SearchBoxWidget(InternetService* service)
|
||||
: service_(service),
|
||||
ui_(new Ui_SearchBoxWidget),
|
||||
|
|
|
@ -18,14 +18,15 @@
|
|||
*/
|
||||
|
||||
#include "digitallyimportedclient.h"
|
||||
#include "core/logging.h"
|
||||
#include "core/network.h"
|
||||
|
||||
#include <qjson/parser.h>
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
|
||||
#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
|
||||
|
|
|
@ -17,16 +17,17 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "digitallyimportedclient.h"
|
||||
#include "digitallyimportedservicebase.h"
|
||||
#include "digitallyimportedsettingspage.h"
|
||||
#include "ui_digitallyimportedsettingspage.h"
|
||||
#include "core/closure.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
#include <QSettings>
|
||||
|
||||
#include "digitallyimportedclient.h"
|
||||
#include "digitallyimportedservicebase.h"
|
||||
#include "core/closure.h"
|
||||
|
||||
DigitallyImportedSettingsPage::DigitallyImportedSettingsPage(
|
||||
SettingsDialog* dialog)
|
||||
: SettingsPage(dialog),
|
||||
|
|
|
@ -18,8 +18,9 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "digitallyimportedservicebase.h"
|
||||
#include "digitallyimportedurlhandler.h"
|
||||
|
||||
#include "digitallyimportedservicebase.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "core/application.h"
|
||||
#include "core/logging.h"
|
||||
|
|
|
@ -17,16 +17,17 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "googledriveclient.h"
|
||||
#include "googledriveservice.h"
|
||||
#include "googledrivesettingspage.h"
|
||||
#include "ui_googledrivesettingspage.h"
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
|
||||
#include "googledriveclient.h"
|
||||
#include "googledriveservice.h"
|
||||
#include "core/application.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "ui/settingsdialog.h"
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
|
||||
GoogleDriveSettingsPage::GoogleDriveSettingsPage(SettingsDialog* parent)
|
||||
: SettingsPage(parent),
|
||||
ui_(new Ui::GoogleDriveSettingsPage),
|
||||
|
|
|
@ -18,13 +18,8 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#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 <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
|
@ -32,6 +27,12 @@
|
|||
#include <QSettings>
|
||||
#include <QtDebug>
|
||||
|
||||
#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),
|
||||
|
|
|
@ -20,12 +20,13 @@
|
|||
*/
|
||||
|
||||
#include "icecastbackend.h"
|
||||
#include "core/database.h"
|
||||
#include "core/scopedtransaction.h"
|
||||
|
||||
#include <QSqlQuery>
|
||||
#include <QVariant>
|
||||
|
||||
#include "core/database.h"
|
||||
#include "core/scopedtransaction.h"
|
||||
|
||||
const char* IcecastBackend::kTableName = "icecast_stations";
|
||||
|
||||
IcecastBackend::IcecastBackend(QObject* parent) : QObject(parent) {}
|
||||
|
|
|
@ -17,16 +17,17 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "icecastmodel.h"
|
||||
#include "icecastfilterwidget.h"
|
||||
#include "ui_icecastfilterwidget.h"
|
||||
#include "ui/iconloader.h"
|
||||
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QSettings>
|
||||
#include <QSignalMapper>
|
||||
|
||||
#include "icecastmodel.h"
|
||||
#include "ui_icecastfilterwidget.h"
|
||||
#include "ui/iconloader.h"
|
||||
|
||||
const char* IcecastFilterWidget::kSettingsGroup = "Icecast";
|
||||
|
||||
IcecastFilterWidget::IcecastFilterWidget(QWidget* parent)
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "savedradio.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QMenu>
|
||||
|
||||
#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 <QSettings>
|
||||
#include <QMenu>
|
||||
|
||||
const char* SavedRadio::kServiceName = "SavedRadio";
|
||||
const char* SavedRadio::kSettingsGroup = "SavedRadio";
|
||||
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
|
||||
#include "jamendodynamicplaylist.h"
|
||||
|
||||
#include "jamendoplaylistitem.h"
|
||||
#include "jamendoservice.h"
|
||||
|
||||
#include <QEventLoop>
|
||||
#include <QHttp>
|
||||
#include <QHttpRequestHeader>
|
||||
|
@ -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/";
|
||||
|
||||
|
|
|
@ -23,6 +23,16 @@
|
|||
|
||||
#include "jamendoservice.h"
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QFutureWatcher>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtConcurrentRun>
|
||||
#include <QXmlStreamReader>
|
||||
#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 <QDesktopServices>
|
||||
#include <QFutureWatcher>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtConcurrentRun>
|
||||
#include <QXmlStreamReader>
|
||||
#include "qtiocompressor.h"
|
||||
|
||||
const char* JamendoService::kServiceName = "Jamendo";
|
||||
const char* JamendoService::kDirectoryUrl =
|
||||
"https://imgjam.com/data/dbdump_artistalbumtrack.xml.gz";
|
||||
|
|
|
@ -21,9 +21,25 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "magnatuneservice.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QMenu>
|
||||
#include <QDesktopServices>
|
||||
#include <QCoreApplication>
|
||||
#include <QSettings>
|
||||
|
||||
#include <QtDebug>
|
||||
|
||||
#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 <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QMenu>
|
||||
#include <QDesktopServices>
|
||||
#include <QCoreApplication>
|
||||
#include <QSettings>
|
||||
|
||||
#include <QtDebug>
|
||||
|
||||
const char* MagnatuneService::kServiceName = "Magnatune";
|
||||
const char* MagnatuneService::kSettingsGroup = "Magnatune";
|
||||
const char* MagnatuneService::kSongsTable = "magnatune_songs";
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
|
||||
#include "magnatunesettingspage.h"
|
||||
|
||||
#include "core/network.h"
|
||||
#include "magnatuneservice.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
#include "ui_magnatunesettingspage.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QSettings>
|
||||
#include <QtDebug>
|
||||
|
||||
#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)),
|
||||
|
|
|
@ -20,6 +20,15 @@
|
|||
*/
|
||||
|
||||
#include "somafmservice.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDesktopServices>
|
||||
#include <QMenu>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QtDebug>
|
||||
|
||||
#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 <QCoreApplication>
|
||||
#include <QDesktopServices>
|
||||
#include <QMenu>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QtDebug>
|
||||
|
||||
const int SomaFMServiceBase::kStreamsCacheDurationSecs =
|
||||
60 * 60 * 24 * 28; // 4 weeks
|
||||
|
||||
|
|
|
@ -19,19 +19,20 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#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 <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QSettings>
|
||||
#include <QTemporaryFile>
|
||||
|
||||
#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) {}
|
||||
|
|
|
@ -20,16 +20,17 @@
|
|||
*/
|
||||
|
||||
#include "spotifyserver.h"
|
||||
#include "core/closure.h"
|
||||
#include "core/logging.h"
|
||||
|
||||
#include "spotifymessages.pb.h"
|
||||
|
||||
#include <QTcpServer>
|
||||
#include <QTcpSocket>
|
||||
#include <QTimer>
|
||||
#include <QUrl>
|
||||
|
||||
#include "core/closure.h"
|
||||
#include "core/logging.h"
|
||||
|
||||
#include "spotifymessages.pb.h"
|
||||
|
||||
SpotifyServer::SpotifyServer(QObject* parent)
|
||||
: AbstractMessageHandler<pb::spotify::Message>(nullptr, parent),
|
||||
server_(new QTcpServer(this)),
|
||||
|
|
|
@ -21,12 +21,23 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "spotifyservice.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QMimeData>
|
||||
#include <QProcess>
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
|
||||
#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 <QCoreApplication>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QMimeData>
|
||||
#include <QProcess>
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
|
||||
#ifdef HAVE_SPOTIFY_DOWNLOADER
|
||||
#include "spotifyblobdownloader.h"
|
||||
#endif
|
||||
|
|
|
@ -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 <QMessageBox>
|
||||
#include <QNetworkReply>
|
||||
|
@ -35,6 +28,13 @@
|
|||
#include <QSettings>
|
||||
#include <QtDebug>
|
||||
|
||||
#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),
|
||||
|
|
|
@ -20,11 +20,12 @@
|
|||
|
||||
#include "subsonicsettingspage.h"
|
||||
#include "ui_subsonicsettingspage.h"
|
||||
#include "core/logging.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
#include "core/logging.h"
|
||||
#include "internet/core/internetmodel.h"
|
||||
|
||||
SubsonicSettingsPage::SubsonicSettingsPage(SettingsDialog* dialog)
|
||||
: SettingsPage(dialog),
|
||||
ui_(new Ui_SubsonicSettingsPage),
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "vkconnection.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QDesktopServices>
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "vkmusiccache.h"
|
||||
#include "vkservice.h"
|
||||
|
||||
#include <qmath.h>
|
||||
#include <QDir>
|
||||
|
@ -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),
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "vksearchdialog.h"
|
||||
#include "ui_vksearchdialog.h"
|
||||
|
||||
#include <QKeyEvent>
|
||||
#include <QPushButton>
|
||||
|
||||
#include "vkservice.h"
|
||||
|
||||
#include "vksearchdialog.h"
|
||||
#include "ui_vksearchdialog.h"
|
||||
|
||||
VkSearchDialog::VkSearchDialog(VkService* service, QWidget* parent)
|
||||
: QDialog(parent),
|
||||
ui(new Ui::VkSearchDialog),
|
||||
|
|
Loading…
Reference in New Issue