Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation with moved files in internet/

This commit is contained in:
Krzysztof Sobiecki 2014-12-18 23:35:21 +01:00
parent 93a286a272
commit fa9ea6ec5f
107 changed files with 412 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

394
src/CMakeLists.txt
View File

@ -165,49 +165,49 @@ set(SOURCES
globalsearch/suggestionwidget.cpp globalsearch/suggestionwidget.cpp
globalsearch/urlsearchprovider.cpp globalsearch/urlsearchprovider.cpp
internet/cloudfilesearchprovider.cpp internet/core/cloudfilesearchprovider.cpp
internet/cloudfileservice.cpp internet/core/cloudfileservice.cpp
internet/digitallyimportedclient.cpp internet/digitally/digitallyimportedclient.cpp
internet/digitallyimportedservicebase.cpp internet/digitally/digitallyimportedservicebase.cpp
internet/digitallyimportedsettingspage.cpp internet/digitally/digitallyimportedsettingspage.cpp
internet/digitallyimportedurlhandler.cpp internet/digitally/digitallyimportedurlhandler.cpp
internet/geolocator.cpp internet/core/geolocator.cpp
internet/groovesharkradio.cpp internet/grooveshark/groovesharkradio.cpp
internet/groovesharkservice.cpp internet/grooveshark/groovesharkservice.cpp
internet/groovesharksettingspage.cpp internet/grooveshark/groovesharksettingspage.cpp
internet/groovesharkurlhandler.cpp internet/grooveshark/groovesharkurlhandler.cpp
internet/icecastbackend.cpp internet/icecast/icecastbackend.cpp
internet/icecastfilterwidget.cpp internet/icecast/icecastfilterwidget.cpp
internet/icecastmodel.cpp internet/icecast/icecastmodel.cpp
internet/icecastservice.cpp internet/icecast/icecastservice.cpp
internet/internetmodel.cpp internet/core/internetmodel.cpp
internet/internetplaylistitem.cpp internet/core/internetplaylistitem.cpp
internet/internetservice.cpp internet/core/internetservice.cpp
internet/internetshowsettingspage.cpp internet/core/internetshowsettingspage.cpp
internet/internetview.cpp internet/core/internetview.cpp
internet/internetviewcontainer.cpp internet/core/internetviewcontainer.cpp
internet/jamendodynamicplaylist.cpp internet/jamendo/jamendodynamicplaylist.cpp
internet/jamendoplaylistitem.cpp internet/jamendo/jamendoplaylistitem.cpp
internet/jamendoservice.cpp internet/jamendo/jamendoservice.cpp
internet/localredirectserver.cpp internet/core/localredirectserver.cpp
internet/magnatunedownloaddialog.cpp internet/magnatune/magnatunedownloaddialog.cpp
internet/magnatuneplaylistitem.cpp internet/magnatune/magnatuneplaylistitem.cpp
internet/magnatuneservice.cpp internet/magnatune/magnatuneservice.cpp
internet/magnatunesettingspage.cpp internet/magnatune/magnatunesettingspage.cpp
internet/magnatuneurlhandler.cpp internet/magnatune/magnatuneurlhandler.cpp
internet/oauthenticator.cpp internet/core/oauthenticator.cpp
internet/savedradio.cpp internet/internetradio/savedradio.cpp
internet/searchboxwidget.cpp internet/core/searchboxwidget.cpp
internet/somafmservice.cpp internet/somafm/somafmservice.cpp
internet/somafmurlhandler.cpp internet/somafm/somafmurlhandler.cpp
internet/soundcloudservice.cpp internet/soundcloud/soundcloudservice.cpp
internet/soundcloudsettingspage.cpp internet/soundcloud/soundcloudsettingspage.cpp
internet/spotifyserver.cpp internet/spotify/spotifyserver.cpp
internet/spotifyservice.cpp internet/spotify/spotifyservice.cpp
internet/spotifysettingspage.cpp internet/spotify/spotifysettingspage.cpp
internet/subsonicservice.cpp internet/subsonic/subsonicservice.cpp
internet/subsonicsettingspage.cpp internet/subsonic/subsonicsettingspage.cpp
internet/subsonicurlhandler.cpp internet/subsonic/subsonicurlhandler.cpp
library/groupbydialog.cpp library/groupbydialog.cpp
library/library.cpp library/library.cpp
@ -270,28 +270,28 @@ set(SOURCES
playlistparsers/xmlparser.cpp playlistparsers/xmlparser.cpp
playlistparsers/xspfparser.cpp playlistparsers/xspfparser.cpp
podcasts/addpodcastbyurl.cpp internet/podcasts/addpodcastbyurl.cpp
podcasts/addpodcastdialog.cpp internet/podcasts/addpodcastdialog.cpp
podcasts/addpodcastpage.cpp internet/podcasts/addpodcastpage.cpp
podcasts/fixedopmlpage.cpp internet/podcasts/fixedopmlpage.cpp
podcasts/gpoddersearchpage.cpp internet/podcasts/gpoddersearchpage.cpp
podcasts/gpoddersync.cpp internet/podcasts/gpoddersync.cpp
podcasts/gpoddertoptagsmodel.cpp internet/podcasts/gpoddertoptagsmodel.cpp
podcasts/gpoddertoptagspage.cpp internet/podcasts/gpoddertoptagspage.cpp
podcasts/itunessearchpage.cpp internet/podcasts/itunessearchpage.cpp
podcasts/podcast.cpp internet/podcasts/podcast.cpp
podcasts/podcastbackend.cpp internet/podcasts/podcastbackend.cpp
podcasts/podcastdiscoverymodel.cpp internet/podcasts/podcastdiscoverymodel.cpp
podcasts/podcastdeleter.cpp internet/podcasts/podcastdeleter.cpp
podcasts/podcastdownloader.cpp internet/podcasts/podcastdownloader.cpp
podcasts/podcastepisode.cpp internet/podcasts/podcastepisode.cpp
podcasts/podcastinfowidget.cpp internet/podcasts/podcastinfowidget.cpp
podcasts/podcastservice.cpp internet/podcasts/podcastservice.cpp
podcasts/podcastservicemodel.cpp internet/podcasts/podcastservicemodel.cpp
podcasts/podcastsettingspage.cpp internet/podcasts/podcastsettingspage.cpp
podcasts/podcastparser.cpp internet/podcasts/podcastparser.cpp
podcasts/podcastupdater.cpp internet/podcasts/podcastupdater.cpp
podcasts/podcasturlloader.cpp internet/podcasts/podcasturlloader.cpp
smartplaylists/generator.cpp smartplaylists/generator.cpp
smartplaylists/generatorinserter.cpp smartplaylists/generatorinserter.cpp
@ -476,45 +476,45 @@ set(HEADERS
globalsearch/spotifysearchprovider.h globalsearch/spotifysearchprovider.h
globalsearch/suggestionwidget.h globalsearch/suggestionwidget.h
internet/cloudfileservice.h internet/core/cloudfileservice.h
internet/digitallyimportedclient.h internet/digitally/digitallyimportedclient.h
internet/digitallyimportedservicebase.h internet/digitally/digitallyimportedservicebase.h
internet/digitallyimportedsettingspage.h internet/digitally/digitallyimportedsettingspage.h
internet/geolocator.h internet/core/geolocator.h
internet/groovesharkservice.h internet/grooveshark/groovesharkservice.h
internet/groovesharksettingspage.h internet/grooveshark/groovesharksettingspage.h
internet/groovesharkurlhandler.h internet/grooveshark/groovesharkurlhandler.h
internet/icecastbackend.h internet/icecast/icecastbackend.h
internet/icecastfilterwidget.h internet/icecast/icecastfilterwidget.h
internet/icecastmodel.h internet/icecast/icecastmodel.h
internet/icecastservice.h internet/icecast/icecastservice.h
internet/internetmimedata.h internet/core/internetmimedata.h
internet/internetmodel.h internet/core/internetmodel.h
internet/internetservice.h internet/core/internetservice.h
internet/internetshowsettingspage.h internet/core/internetshowsettingspage.h
internet/internetsongmimedata.h internet/core/internetsongmimedata.h
internet/internetview.h internet/core/internetview.h
internet/internetviewcontainer.h internet/core/internetviewcontainer.h
internet/jamendodynamicplaylist.h internet/jamendo/jamendodynamicplaylist.h
internet/jamendoservice.h internet/jamendo/jamendoservice.h
internet/localredirectserver.h internet/core/localredirectserver.h
internet/magnatunedownloaddialog.h internet/magnatune/magnatunedownloaddialog.h
internet/magnatuneservice.h internet/magnatune/magnatuneservice.h
internet/magnatunesettingspage.h internet/magnatune/magnatunesettingspage.h
internet/oauthenticator.h internet/core/oauthenticator.h
internet/savedradio.h internet/internetradio/savedradio.h
internet/scrobbler.h internet/core/scrobbler.h
internet/searchboxwidget.h internet/core/searchboxwidget.h
internet/somafmservice.h internet/somafm/somafmservice.h
internet/somafmurlhandler.h internet/somafm/somafmurlhandler.h
internet/soundcloudservice.h internet/soundcloud/soundcloudservice.h
internet/soundcloudsettingspage.h internet/soundcloud/soundcloudsettingspage.h
internet/spotifyserver.h internet/spotify/spotifyserver.h
internet/spotifyservice.h internet/spotify/spotifyservice.h
internet/spotifysettingspage.h internet/spotify/spotifysettingspage.h
internet/subsonicservice.h internet/subsonic/subsonicservice.h
internet/subsonicsettingspage.h internet/subsonic/subsonicsettingspage.h
internet/subsonicurlhandler.h internet/subsonic/subsonicurlhandler.h
library/groupbydialog.h library/groupbydialog.h
library/library.h library/library.h
@ -568,25 +568,25 @@ set(HEADERS
playlistparsers/plsparser.h playlistparsers/plsparser.h
playlistparsers/xspfparser.h playlistparsers/xspfparser.h
podcasts/addpodcastbyurl.h internet/podcasts/addpodcastbyurl.h
podcasts/addpodcastdialog.h internet/podcasts/addpodcastdialog.h
podcasts/addpodcastpage.h internet/podcasts/addpodcastpage.h
podcasts/fixedopmlpage.h internet/podcasts/fixedopmlpage.h
podcasts/gpoddersearchpage.h internet/podcasts/gpoddersearchpage.h
podcasts/gpoddersync.h internet/podcasts/gpoddersync.h
podcasts/gpoddertoptagsmodel.h internet/podcasts/gpoddertoptagsmodel.h
podcasts/gpoddertoptagspage.h internet/podcasts/gpoddertoptagspage.h
podcasts/itunessearchpage.h internet/podcasts/itunessearchpage.h
podcasts/podcastbackend.h internet/podcasts/podcastbackend.h
podcasts/podcastdiscoverymodel.h internet/podcasts/podcastdiscoverymodel.h
podcasts/podcastdeleter.h internet/podcasts/podcastdeleter.h
podcasts/podcastdownloader.h internet/podcasts/podcastdownloader.h
podcasts/podcastinfowidget.h internet/podcasts/podcastinfowidget.h
podcasts/podcastservice.h internet/podcasts/podcastservice.h
podcasts/podcastservicemodel.h internet/podcasts/podcastservicemodel.h
podcasts/podcastsettingspage.h internet/podcasts/podcastsettingspage.h
podcasts/podcastupdater.h internet/podcasts/podcastupdater.h
podcasts/podcasturlloader.h internet/podcasts/podcasturlloader.h
smartplaylists/generator.h smartplaylists/generator.h
smartplaylists/generatorinserter.h smartplaylists/generatorinserter.h
@ -697,17 +697,17 @@ set(UI
globalsearch/searchproviderstatuswidget.ui globalsearch/searchproviderstatuswidget.ui
globalsearch/suggestionwidget.ui globalsearch/suggestionwidget.ui
internet/digitallyimportedsettingspage.ui internet/digitally/digitallyimportedsettingspage.ui
internet/groovesharksettingspage.ui internet/grooveshark/groovesharksettingspage.ui
internet/icecastfilterwidget.ui internet/icecast/icecastfilterwidget.ui
internet/internetshowsettingspage.ui internet/core/internetshowsettingspage.ui
internet/internetviewcontainer.ui internet/core/internetviewcontainer.ui
internet/magnatunedownloaddialog.ui internet/magnatune/magnatunedownloaddialog.ui
internet/magnatunesettingspage.ui internet/magnatune/magnatunesettingspage.ui
internet/searchboxwidget.ui internet/core/searchboxwidget.ui
internet/soundcloudsettingspage.ui internet/soundcloud/soundcloudsettingspage.ui
internet/spotifysettingspage.ui internet/spotify/spotifysettingspage.ui
internet/subsonicsettingspage.ui internet/subsonic/subsonicsettingspage.ui
library/groupbydialog.ui library/groupbydialog.ui
library/libraryfilterwidget.ui library/libraryfilterwidget.ui
@ -721,12 +721,12 @@ set(UI
playlist/playlistsequence.ui playlist/playlistsequence.ui
playlist/queuemanager.ui playlist/queuemanager.ui
podcasts/addpodcastbyurl.ui internet/podcasts/addpodcastbyurl.ui
podcasts/addpodcastdialog.ui internet/podcasts/addpodcastdialog.ui
podcasts/gpoddersearchpage.ui internet/podcasts/gpoddersearchpage.ui
podcasts/itunessearchpage.ui internet/podcasts/itunessearchpage.ui
podcasts/podcastinfowidget.ui internet/podcasts/podcastinfowidget.ui
podcasts/podcastsettingspage.ui internet/podcasts/podcastsettingspage.ui
smartplaylists/querysearchpage.ui smartplaylists/querysearchpage.ui
smartplaylists/querysortpage.ui smartplaylists/querysortpage.ui
@ -832,32 +832,32 @@ optional_source(ENABLE_VISUALISATIONS
optional_source(HAVE_LIBLASTFM optional_source(HAVE_LIBLASTFM
SOURCES SOURCES
covers/lastfmcoverprovider.cpp covers/lastfmcoverprovider.cpp
internet/fixlastfm.cpp internet/lastfm/fixlastfm.cpp
internet/lastfmcompat.cpp internet/lastfm/lastfmcompat.cpp
internet/lastfmservice.cpp internet/lastfm/lastfmservice.cpp
internet/lastfmsettingspage.cpp internet/lastfm/lastfmsettingspage.cpp
songinfo/echonestsimilarartists.cpp songinfo/echonestsimilarartists.cpp
songinfo/echonesttags.cpp songinfo/echonesttags.cpp
songinfo/lastfmtrackinfoprovider.cpp songinfo/lastfmtrackinfoprovider.cpp
songinfo/tagwidget.cpp songinfo/tagwidget.cpp
HEADERS HEADERS
covers/lastfmcoverprovider.h covers/lastfmcoverprovider.h
internet/lastfmservice.h internet/lastfm/lastfmservice.h
internet/lastfmsettingspage.h internet/lastfm/lastfmsettingspage.h
songinfo/echonestsimilarartists.h songinfo/echonestsimilarartists.h
songinfo/echonesttags.h songinfo/echonesttags.h
songinfo/lastfmtrackinfoprovider.h songinfo/lastfmtrackinfoprovider.h
songinfo/tagwidget.h songinfo/tagwidget.h
UI UI
internet/lastfmsettingspage.ui internet/lastfm/lastfmsettingspage.ui
) )
optional_source(HAVE_SPOTIFY_DOWNLOADER optional_source(HAVE_SPOTIFY_DOWNLOADER
SOURCES SOURCES
internet/spotifyblobdownloader.cpp internet/spotify/spotifyblobdownloader.cpp
HEADERS HEADERS
internet/spotifyblobdownloader.h internet/spotify/spotifyblobdownloader.h
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${QCA_INCLUDE_DIRS} ${QCA_INCLUDE_DIRS}
) )
@ -1085,47 +1085,47 @@ optional_source(HAVE_MOODBAR
# Google Drive support # Google Drive support
optional_source(HAVE_GOOGLE_DRIVE optional_source(HAVE_GOOGLE_DRIVE
SOURCES SOURCES
internet/googledriveclient.cpp internet/googledrive/googledriveclient.cpp
internet/googledriveservice.cpp internet/googledrive/googledriveservice.cpp
internet/googledrivesettingspage.cpp internet/googledrive/googledrivesettingspage.cpp
internet/googledriveurlhandler.cpp internet/googledrive/googledriveurlhandler.cpp
HEADERS HEADERS
internet/googledriveclient.h internet/googledrive/googledriveclient.h
internet/googledriveservice.h internet/googledrive/googledriveservice.h
internet/googledrivesettingspage.h internet/googledrive/googledrivesettingspage.h
internet/googledriveurlhandler.h internet/googledrive/googledriveurlhandler.h
UI UI
internet/googledrivesettingspage.ui internet/googledrive/googledrivesettingspage.ui
) )
# Dropbox support # Dropbox support
optional_source(HAVE_DROPBOX optional_source(HAVE_DROPBOX
SOURCES SOURCES
internet/dropboxauthenticator.cpp internet/dropbox/dropboxauthenticator.cpp
internet/dropboxservice.cpp internet/dropbox/dropboxservice.cpp
internet/dropboxsettingspage.cpp internet/dropbox/dropboxsettingspage.cpp
internet/dropboxurlhandler.cpp internet/dropbox/dropboxurlhandler.cpp
HEADERS HEADERS
internet/dropboxauthenticator.h internet/dropbox/dropboxauthenticator.h
internet/dropboxservice.h internet/dropbox/dropboxservice.h
internet/dropboxsettingspage.h internet/dropbox/dropboxsettingspage.h
internet/dropboxurlhandler.h internet/dropbox/dropboxurlhandler.h
UI UI
internet/dropboxsettingspage.ui internet/dropbox/dropboxsettingspage.ui
) )
# Skydrive support # Skydrive support
optional_source(HAVE_SKYDRIVE optional_source(HAVE_SKYDRIVE
SOURCES SOURCES
internet/skydriveservice.cpp internet/skydrive/skydriveservice.cpp
internet/skydrivesettingspage.cpp internet/skydrive/skydrivesettingspage.cpp
internet/skydriveurlhandler.cpp internet/skydrive/skydriveurlhandler.cpp
HEADERS HEADERS
internet/skydriveservice.h internet/skydrive/skydriveservice.h
internet/skydrivesettingspage.h internet/skydrive/skydrivesettingspage.h
internet/skydriveurlhandler.h internet/skydrive/skydriveurlhandler.h
UI UI
internet/skydrivesettingspage.ui internet/skydrive/skydrivesettingspage.ui
) )
# Box support # Box support
@ -1148,39 +1148,39 @@ optional_source(HAVE_VK
${VREEN_INCLUDE_DIRS} ${VREEN_INCLUDE_DIRS}
SOURCES SOURCES
globalsearch/vksearchprovider.cpp globalsearch/vksearchprovider.cpp
internet/vkconnection.cpp internet/vk/vkconnection.cpp
internet/vkmusiccache.cpp internet/vk/vkmusiccache.cpp
internet/vksearchdialog.cpp internet/vk/vksearchdialog.cpp
internet/vkservice.cpp internet/vk/vkservice.cpp
internet/vksettingspage.cpp internet/vk/vksettingspage.cpp
internet/vkurlhandler.cpp internet/vk/vkurlhandler.cpp
HEADERS HEADERS
globalsearch/vksearchprovider.h globalsearch/vksearchprovider.h
internet/vkconnection.h internet/vk/vkconnection.h
internet/vkmusiccache.h internet/vk/vkmusiccache.h
internet/vksearchdialog.h internet/vk/vksearchdialog.h
internet/vkservice.h internet/vk/vkservice.h
internet/vksettingspage.h internet/vk/vksettingspage.h
internet/vkurlhandler.h internet/vk/vkurlhandler.h
UI UI
internet/vksearchdialog.ui internet/vk/vksearchdialog.ui
internet/vksettingspage.ui internet/vk/vksettingspage.ui
) )
# Seafile support # Seafile support
optional_source(HAVE_SEAFILE optional_source(HAVE_SEAFILE
SOURCES SOURCES
internet/seafileservice.cpp internet/seafile/seafileservice.cpp
internet/seafilesettingspage.cpp internet/seafile/seafilesettingspage.cpp
internet/seafileurlhandler.cpp internet/seafile/seafileurlhandler.cpp
internet/seafiletree.cpp internet/seafile/seafiletree.cpp
HEADERS HEADERS
internet/seafileservice.h internet/seafile/seafileservice.h
internet/seafilesettingspage.h internet/seafile/seafilesettingspage.h
internet/seafileurlhandler.h internet/seafile/seafileurlhandler.h
internet/seafiletree.h internet/seafile/seafiletree.h
UI UI
internet/seafilesettingspage.ui internet/seafile/seafilesettingspage.ui
) )

14
src/core/application.cpp
View File

@ -31,7 +31,7 @@
#include "covers/coverproviders.h" #include "covers/coverproviders.h"
#include "covers/currentartloader.h" #include "covers/currentartloader.h"
#include "devices/devicemanager.h" #include "devices/devicemanager.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "globalsearch/globalsearch.h" #include "globalsearch/globalsearch.h"
#include "library/library.h" #include "library/library.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
@ -39,14 +39,14 @@
#include "networkremote/networkremotehelper.h" #include "networkremote/networkremotehelper.h"
#include "playlist/playlistbackend.h" #include "playlist/playlistbackend.h"
#include "playlist/playlistmanager.h" #include "playlist/playlistmanager.h"
#include "podcasts/gpoddersync.h" #include "internet/podcasts/gpoddersync.h"
#include "podcasts/podcastbackend.h" #include "internet/podcasts/podcastbackend.h"
#include "podcasts/podcastdeleter.h" #include "internet/podcasts/podcastdeleter.h"
#include "podcasts/podcastdownloader.h" #include "internet/podcasts/podcastdownloader.h"
#include "podcasts/podcastupdater.h" #include "internet/podcasts/podcastupdater.h"
#ifdef HAVE_LIBLASTFM #ifdef HAVE_LIBLASTFM
#include "internet/lastfmservice.h" #include "internet/lastfm/lastfmservice.h"
#endif // HAVE_LIBLASTFM #endif // HAVE_LIBLASTFM
#ifdef HAVE_MOODBAR #ifdef HAVE_MOODBAR

12
src/core/metatypes.cpp
View File

@ -30,17 +30,17 @@
#include "engines/enginebase.h" #include "engines/enginebase.h"
#include "engines/gstengine.h" #include "engines/gstengine.h"
#include "globalsearch/searchprovider.h" #include "globalsearch/searchprovider.h"
#include "internet/digitallyimportedclient.h" #include "internet/digitally/digitallyimportedclient.h"
#include "internet/geolocator.h" #include "internet/core/geolocator.h"
#include "internet/somafmservice.h" #include "internet/somafm/somafmservice.h"
#include "library/directory.h" #include "library/directory.h"
#include "playlist/playlist.h" #include "playlist/playlist.h"
#include "podcasts/podcastepisode.h" #include "internet/podcasts/podcastepisode.h"
#include "podcasts/podcast.h" #include "internet/podcasts/podcast.h"
#include "ui/equalizer.h" #include "ui/equalizer.h"
#ifdef HAVE_VK #ifdef HAVE_VK
#include "internet/vkservice.h" #include "internet/vk/vkservice.h"
#endif #endif
#ifdef HAVE_DBUS #ifdef HAVE_DBUS

2
src/core/player.cpp
View File

@ -45,7 +45,7 @@
#include "playlist/playlistmanager.h" #include "playlist/playlistmanager.h"
#ifdef HAVE_LIBLASTFM #ifdef HAVE_LIBLASTFM
#include "internet/lastfmservice.h" #include "internet/lastfm/lastfmservice.h"
#endif #endif
using std::shared_ptr; using std::shared_ptr;

2
src/core/song.cpp
View File

@ -43,7 +43,7 @@
#include <QtConcurrentRun> #include <QtConcurrentRun>
#ifdef HAVE_LIBLASTFM #ifdef HAVE_LIBLASTFM
#include "internet/fixlastfm.h" #include "internet/lastfm/fixlastfm.h"
#ifdef HAVE_LIBLASTFM1 #ifdef HAVE_LIBLASTFM1
#include <lastfm/Track.h> #include <lastfm/Track.h>
#else #else

10
src/core/songloader.cpp
View File

@ -38,16 +38,16 @@
#include "core/song.h" #include "core/song.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"
#include "core/timeconstants.h" #include "core/timeconstants.h"
#include "internet/fixlastfm.h" #include "internet/lastfm/fixlastfm.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "library/sqlrow.h" #include "library/sqlrow.h"
#include "playlistparsers/cueparser.h" #include "playlistparsers/cueparser.h"
#include "playlistparsers/parserbase.h" #include "playlistparsers/parserbase.h"
#include "playlistparsers/playlistparser.h" #include "playlistparsers/playlistparser.h"
#include "podcasts/podcastparser.h" #include "internet/podcasts/podcastparser.h"
#include "podcasts/podcastservice.h" #include "internet/podcasts/podcastservice.h"
#include "podcasts/podcasturlloader.h" #include "internet/podcasts/podcasturlloader.h"
#ifdef HAVE_AUDIOCD #ifdef HAVE_AUDIOCD
#include <gst/audio/gstaudiocdsrc.h> #include <gst/audio/gstaudiocdsrc.h>

4
src/covers/albumcoverloader.cpp
View File

@ -29,8 +29,8 @@
#include "core/network.h" #include "core/network.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"
#include "core/utilities.h" #include "core/utilities.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/spotifyservice.h" #include "internet/spotify/spotifyservice.h"
AlbumCoverLoader::AlbumCoverLoader(QObject* parent) AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
: QObject(parent), : QObject(parent),

2
src/covers/lastfmcoverprovider.cpp
View File

@ -22,7 +22,7 @@
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "coverprovider.h" #include "coverprovider.h"
#include "core/closure.h" #include "core/closure.h"
#include "internet/lastfmcompat.h" #include "internet/lastfm/lastfmcompat.h"
LastFmCoverProvider::LastFmCoverProvider(QObject* parent) LastFmCoverProvider::LastFmCoverProvider(QObject* parent)
: CoverProvider("last.fm", parent) {} : CoverProvider("last.fm", parent) {}

6
src/engines/gstenginepipeline.cpp
View File

@ -31,9 +31,9 @@
#include "core/mac_startup.h" #include "core/mac_startup.h"
#include "core/signalchecker.h" #include "core/signalchecker.h"
#include "core/utilities.h" #include "core/utilities.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/spotifyserver.h" #include "internet/spotify/spotifyserver.h"
#include "internet/spotifyservice.h" #include "internet/spotify/spotifyservice.h"
const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
const int GstEnginePipeline::kFaderFudgeMsec = 2000; const int GstEnginePipeline::kFaderFudgeMsec = 2000;

2
src/globalsearch/digitallyimportedsearchprovider.h
View File

@ -19,7 +19,7 @@
#define DIGITALLYIMPORTEDSEARCHPROVIDER_H #define DIGITALLYIMPORTEDSEARCHPROVIDER_H
#include "simplesearchprovider.h" #include "simplesearchprovider.h"
#include "internet/digitallyimportedservicebase.h" #include "internet/digitally/digitallyimportedservicebase.h"
class DigitallyImportedSearchProvider : public SimpleSearchProvider { class DigitallyImportedSearchProvider : public SimpleSearchProvider {
public: public:

2
src/globalsearch/groovesharksearchprovider.cpp
View File

@ -22,7 +22,7 @@
#include "core/application.h" #include "core/application.h"
#include "core/logging.h" #include "core/logging.h"
#include "covers/albumcoverloader.h" #include "covers/albumcoverloader.h"
#include "internet/groovesharkservice.h" #include "internet/grooveshark/groovesharkservice.h"
GroovesharkSearchProvider::GroovesharkSearchProvider(Application* app, GroovesharkSearchProvider::GroovesharkSearchProvider(Application* app,
QObject* parent) QObject* parent)

2
src/globalsearch/groovesharksearchprovider.h
View File

@ -20,7 +20,7 @@
#include "searchprovider.h" #include "searchprovider.h"
#include "covers/albumcoverloaderoptions.h" #include "covers/albumcoverloaderoptions.h"
#include "internet/groovesharkservice.h" #include "internet/grooveshark/groovesharkservice.h"
class AlbumCoverLoader; class AlbumCoverLoader;

2
src/globalsearch/icecastsearchprovider.cpp
View File

@ -16,7 +16,7 @@
*/ */
#include "icecastsearchprovider.h" #include "icecastsearchprovider.h"
#include "internet/icecastbackend.h" #include "internet/icecast/icecastbackend.h"
IcecastSearchProvider::IcecastSearchProvider(IcecastBackend* backend, IcecastSearchProvider::IcecastSearchProvider(IcecastBackend* backend,
Application* app, QObject* parent) Application* app, QObject* parent)

2
src/globalsearch/savedradiosearchprovider.h
View File

@ -19,7 +19,7 @@
#define SAVEDRADIOSEARCHPROVIDER_H #define SAVEDRADIOSEARCHPROVIDER_H
#include "simplesearchprovider.h" #include "simplesearchprovider.h"
#include "internet/savedradio.h" #include "internet/internetradio/savedradio.h"
class SavedRadioSearchProvider : public SimpleSearchProvider { class SavedRadioSearchProvider : public SimpleSearchProvider {
public: public:

2
src/globalsearch/searchprovider.cpp
View File

@ -17,7 +17,7 @@
#include "searchprovider.h" #include "searchprovider.h"
#include "core/boundfuturewatcher.h" #include "core/boundfuturewatcher.h"
#include "internet/internetsongmimedata.h" #include "internet/core/internetsongmimedata.h"
#include "playlist/songmimedata.h" #include "playlist/songmimedata.h"
#include <QPainter> #include <QPainter>

2
src/globalsearch/somafmsearchprovider.h
View File

@ -19,7 +19,7 @@
#define SOMAFMSEARCHPROVIDER_H #define SOMAFMSEARCHPROVIDER_H
#include "simplesearchprovider.h" #include "simplesearchprovider.h"
#include "internet/somafmservice.h" #include "internet/somafm/somafmservice.h"
class SomaFMSearchProvider : public SimpleSearchProvider { class SomaFMSearchProvider : public SimpleSearchProvider {
public: public:

2
src/globalsearch/soundcloudsearchprovider.cpp
View File

@ -22,7 +22,7 @@
#include "core/application.h" #include "core/application.h"
#include "core/logging.h" #include "core/logging.h"
#include "covers/albumcoverloader.h" #include "covers/albumcoverloader.h"
#include "internet/soundcloudservice.h" #include "internet/soundcloud/soundcloudservice.h"
SoundCloudSearchProvider::SoundCloudSearchProvider(Application* app, SoundCloudSearchProvider::SoundCloudSearchProvider(Application* app,
QObject* parent) QObject* parent)

2
src/globalsearch/soundcloudsearchprovider.h
View File

@ -20,7 +20,7 @@
#include "searchprovider.h" #include "searchprovider.h"
#include "covers/albumcoverloaderoptions.h" #include "covers/albumcoverloaderoptions.h"
#include "internet/soundcloudservice.h" #include "internet/soundcloud/soundcloudservice.h"
class AlbumCoverLoader; class AlbumCoverLoader;

4
src/globalsearch/spotifysearchprovider.cpp
View File

@ -21,8 +21,8 @@
#include <random> #include <random>
#include "core/logging.h" #include "core/logging.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/spotifyserver.h" #include "internet/spotify/spotifyserver.h"
#include "playlist/songmimedata.h" #include "playlist/songmimedata.h"
namespace { namespace {

2
src/globalsearch/spotifysearchprovider.h
View File

@ -20,7 +20,7 @@
#include "searchprovider.h" #include "searchprovider.h"
#include "spotifymessages.pb.h" #include "spotifymessages.pb.h"
#include "internet/spotifyservice.h" #include "internet/spotify/spotifyservice.h"
class SpotifyServer; class SpotifyServer;

2
src/globalsearch/vksearchprovider.h
View File

@ -19,7 +19,7 @@
#ifndef VKSEARCHPROVIDER_H #ifndef VKSEARCHPROVIDER_H
#define VKSEARCHPROVIDER_H #define VKSEARCHPROVIDER_H
#include "internet/vkservice.h" #include "internet/vk/vkservice.h"
#include "searchprovider.h" #include "searchprovider.h"

4
src/internet/box/boxservice.cpp
View File

@ -23,8 +23,8 @@
#include "core/application.h" #include "core/application.h"
#include "core/player.h" #include "core/player.h"
#include "core/waitforsignal.h" #include "core/waitforsignal.h"
#include "internet/boxurlhandler.h" #include "internet/box/boxurlhandler.h"
#include "internet/oauthenticator.h" #include "internet/core/oauthenticator.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
const char* BoxService::kServiceName = "Box"; const char* BoxService::kServiceName = "Box";

2
src/internet/box/boxservice.h
View File

@ -19,7 +19,7 @@
#ifndef INTERNET_BOXSERVICE_H_ #ifndef INTERNET_BOXSERVICE_H_
#define INTERNET_BOXSERVICE_H_ #define INTERNET_BOXSERVICE_H_
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include <QDateTime> #include <QDateTime>

2
src/internet/box/boxsettingspage.cpp
View File

@ -23,7 +23,7 @@
#include "ui_boxsettingspage.h" #include "ui_boxsettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "internet/box/boxservice.h" #include "internet/box/boxservice.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
BoxSettingsPage::BoxSettingsPage(SettingsDialog* parent) BoxSettingsPage::BoxSettingsPage(SettingsDialog* parent)

6
src/internet/cloudfile/cloudfilesearchprovider.cpp → src/internet/core/cloudfilesearchprovider.cpp
View File

@ -16,9 +16,9 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internet/cloudfilesearchprovider.h" #include "internet/core/cloudfilesearchprovider.h"
#include "internet/cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
CloudFileSearchProvider::CloudFileSearchProvider( CloudFileSearchProvider::CloudFileSearchProvider(
LibraryBackendInterface* backend, const QString& id, const QIcon& icon, LibraryBackendInterface* backend, const QString& id, const QIcon& icon,

0
src/internet/cloudfile/cloudfilesearchprovider.h → src/internet/core/cloudfilesearchprovider.h
View File

6
src/internet/cloudfile/cloudfileservice.cpp → src/internet/core/cloudfileservice.cpp
View File

@ -18,7 +18,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include <QMenu> #include <QMenu>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
@ -30,8 +30,8 @@
#include "core/player.h" #include "core/player.h"
#include "core/taskmanager.h" #include "core/taskmanager.h"
#include "globalsearch/globalsearch.h" #include "globalsearch/globalsearch.h"
#include "internet/cloudfilesearchprovider.h" #include "internet/core/cloudfilesearchprovider.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "library/librarymodel.h" #include "library/librarymodel.h"
#include "playlist/playlist.h" #include "playlist/playlist.h"

2
src/internet/cloudfile/cloudfileservice.h → src/internet/core/cloudfileservice.h
View File

@ -20,7 +20,7 @@
#ifndef INTERNET_CLOUDFILESERVICE_H_ #ifndef INTERNET_CLOUDFILESERVICE_H_
#define INTERNET_CLOUDFILESERVICE_H_ #define INTERNET_CLOUDFILESERVICE_H_
#include "internetservice.h" #include "internet/core/internetservice.h"
#include <memory> #include <memory>

38
src/internet/core/internetmodel.cpp
View File

@ -23,46 +23,46 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include <QMimeData> #include <QMimeData>
#include <QtDebug> #include <QtDebug>
#include "digitallyimportedservicebase.h" #include "internet/digitally/digitallyimportedservicebase.h"
#include "groovesharkservice.h" #include "internet/grooveshark/groovesharkservice.h"
#include "icecastservice.h" #include "internet/icecast/icecastservice.h"
#include "internetmimedata.h" #include "internet/core/internetmimedata.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "jamendoservice.h" #include "internet/jamendo/jamendoservice.h"
#include "magnatuneservice.h" #include "internet/magnatune/magnatuneservice.h"
#include "savedradio.h" #include "internet/internetradio/savedradio.h"
#include "somafmservice.h" #include "internet/somafm/somafmservice.h"
#include "soundcloudservice.h" #include "internet/soundcloud/soundcloudservice.h"
#include "spotifyservice.h" #include "internet/spotify/spotifyservice.h"
#include "subsonicservice.h" #include "internet/subsonic/subsonicservice.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/mergedproxymodel.h" #include "core/mergedproxymodel.h"
#include "podcasts/podcastservice.h" #include "internet/podcasts/podcastservice.h"
#include "smartplaylists/generatormimedata.h" #include "smartplaylists/generatormimedata.h"
#ifdef HAVE_GOOGLE_DRIVE #ifdef HAVE_GOOGLE_DRIVE
#include "googledriveservice.h" #include "internet/googledrive/googledriveservice.h"
#endif #endif
#ifdef HAVE_DROPBOX #ifdef HAVE_DROPBOX
#include "dropboxservice.h" #include "internet/dropbox/dropboxservice.h"
#endif #endif
#ifdef HAVE_SKYDRIVE #ifdef HAVE_SKYDRIVE
#include "skydriveservice.h" #include "internet/skydrive/skydriveservice.h"
#endif #endif
#ifdef HAVE_BOX #ifdef HAVE_BOX
#include "internet/box/boxservice.h" #include "internet/box/boxservice.h"
#endif #endif
#ifdef HAVE_VK #ifdef HAVE_VK
#include "vkservice.h" #include "internet/vk/vkservice.h"
#endif #endif
#ifdef HAVE_SEAFILE #ifdef HAVE_SEAFILE
#include "seafileservice.h" #include "internet/seafile/seafileservice.h"
#endif #endif
using smart_playlists::Generator; using smart_playlists::Generator;

6
src/internet/core/internetplaylistitem.cpp
View File

@ -19,9 +19,9 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/settingsprovider.h" #include "core/settingsprovider.h"
#include "library/sqlrow.h" #include "library/sqlrow.h"
#include "playlist/playlistbackend.h" #include "playlist/playlistbackend.h"

4
src/internet/core/internetservice.cpp
View File

@ -20,8 +20,8 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/mergedproxymodel.h" #include "core/mergedproxymodel.h"
#include "core/mimedata.h" #include "core/mimedata.h"

4
src/internet/core/internetshowsettingspage.cpp
View File

@ -20,8 +20,8 @@
#include "core/application.h" #include "core/application.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include <QSettings> #include <QSettings>

2
src/internet/core/internetview.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "internetview.h" #include "internetview.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/mergedproxymodel.h" #include "core/mergedproxymodel.h"
#include "library/libraryview.h" #include "library/libraryview.h"

4
src/internet/core/internetviewcontainer.cpp
View File

@ -19,8 +19,8 @@
*/ */
#include "internetviewcontainer.h" #include "internetviewcontainer.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "ui_internetviewcontainer.h" #include "ui_internetviewcontainer.h"
#include "core/application.h" #include "core/application.h"
#include "core/mergedproxymodel.h" #include "core/mergedproxymodel.h"

2
src/internet/core/internetviewcontainer.ui
View File

@ -69,7 +69,7 @@
<customwidget> <customwidget>
<class>InternetView</class> <class>InternetView</class>
<extends>QTreeView</extends> <extends>QTreeView</extends>
<header>internet/internetview.h</header> <header>internet/core/internetview.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

4
src/internet/core/oauthenticator.cpp
View File

@ -18,7 +18,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "oauthenticator.h" #include "internet/core/oauthenticator.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QStringList> #include <QStringList>
@ -28,7 +28,7 @@
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "internet/localredirectserver.h" #include "internet/core/localredirectserver.h"
const char* OAuthenticator::kRemoteURL = const char* OAuthenticator::kRemoteURL =
"https://clementine-data.appspot.com/skydrive"; "https://clementine-data.appspot.com/skydrive";

4
src/internet/core/searchboxwidget.cpp
View File

@ -18,8 +18,8 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "searchboxwidget.h" #include "internet/core/searchboxwidget.h"
#include "ui_searchboxwidget.h" #include "ui_searchboxwidget.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "widgets/didyoumean.h" #include "widgets/didyoumean.h"

2
src/internet/digitally/digitallyimportedservicebase.cpp
View File

@ -27,7 +27,7 @@
#include "digitallyimportedclient.h" #include "digitallyimportedclient.h"
#include "digitallyimportedurlhandler.h" #include "digitallyimportedurlhandler.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"

3
src/internet/digitally/digitallyimportedservicebase.h
View File

@ -1,3 +1,4 @@
/* This file is part of Clementine. /* This file is part of Clementine.
Copyright 2011-2012, David Sansome <me@davidsansome.com> Copyright 2011-2012, David Sansome <me@davidsansome.com>
Copyright 2012, 2014, John Maguire <john.maguire@gmail.com> Copyright 2012, 2014, John Maguire <john.maguire@gmail.com>
@ -23,7 +24,7 @@
#include <memory> #include <memory>
#include "digitallyimportedclient.h" #include "digitallyimportedclient.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "core/cachedlist.h" #include "core/cachedlist.h"
class DigitallyImportedClient; class DigitallyImportedClient;

2
src/internet/digitally/digitallyimportedurlhandler.cpp
View File

@ -20,7 +20,7 @@
#include "digitallyimportedservicebase.h" #include "digitallyimportedservicebase.h"
#include "digitallyimportedurlhandler.h" #include "digitallyimportedurlhandler.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/taskmanager.h" #include "core/taskmanager.h"

2
src/internet/dropbox/dropboxauthenticator.cpp
View File

@ -29,7 +29,7 @@
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"
#include "internet/localredirectserver.h" #include "internet/core/localredirectserver.h"
namespace { namespace {
static const char* kAppKey = "qh6ca27eclt9p2k"; static const char* kAppKey = "qh6ca27eclt9p2k";

4
src/internet/dropbox/dropboxservice.cpp
View File

@ -30,8 +30,8 @@
#include "core/player.h" #include "core/player.h"
#include "core/utilities.h" #include "core/utilities.h"
#include "core/waitforsignal.h" #include "core/waitforsignal.h"
#include "internet/dropboxauthenticator.h" #include "internet/dropbox/dropboxauthenticator.h"
#include "internet/dropboxurlhandler.h" #include "internet/dropbox/dropboxurlhandler.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
using Utilities::ParseRFC822DateTime; using Utilities::ParseRFC822DateTime;

2
src/internet/dropbox/dropboxservice.h
View File

@ -19,7 +19,7 @@
#ifndef INTERNET_DROPBOXSERVICE_H_ #ifndef INTERNET_DROPBOXSERVICE_H_
#define INTERNET_DROPBOXSERVICE_H_ #define INTERNET_DROPBOXSERVICE_H_
#include "internet/cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"

6
src/internet/dropbox/dropboxsettingspage.cpp
View File

@ -20,9 +20,9 @@
#include "ui_dropboxsettingspage.h" #include "ui_dropboxsettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "internet/dropboxauthenticator.h" #include "internet/dropbox/dropboxauthenticator.h"
#include "internet/dropboxservice.h" #include "internet/dropbox/dropboxservice.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
DropboxSettingsPage::DropboxSettingsPage(SettingsDialog* parent) DropboxSettingsPage::DropboxSettingsPage(SettingsDialog* parent)

2
src/internet/dropbox/dropboxurlhandler.cpp
View File

@ -18,7 +18,7 @@
#include "dropboxurlhandler.h" #include "dropboxurlhandler.h"
#include "internet/dropboxservice.h" #include "internet/dropbox/dropboxservice.h"
DropboxUrlHandler::DropboxUrlHandler(DropboxService* service, QObject* parent) DropboxUrlHandler::DropboxUrlHandler(DropboxService* service, QObject* parent)
: UrlHandler(parent), service_(service) {} : UrlHandler(parent), service_(service) {}

2
src/internet/googledrive/googledriveclient.cpp
View File

@ -21,7 +21,7 @@
#include <qjson/parser.h> #include <qjson/parser.h>
#include "oauthenticator.h" #include "internet/core/oauthenticator.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"

2
src/internet/googledrive/googledriveservice.cpp
View File

@ -42,7 +42,7 @@
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "googledriveclient.h" #include "googledriveclient.h"
#include "googledriveurlhandler.h" #include "googledriveurlhandler.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
const char* GoogleDriveService::kServiceName = "Google Drive"; const char* GoogleDriveService::kServiceName = "Google Drive";
const char* GoogleDriveService::kSettingsGroup = "GoogleDrive"; const char* GoogleDriveService::kSettingsGroup = "GoogleDrive";

2
src/internet/googledrive/googledriveservice.h
View File

@ -20,7 +20,7 @@
#ifndef INTERNET_GOOGLEDRIVESERVICE_H_ #ifndef INTERNET_GOOGLEDRIVESERVICE_H_
#define INTERNET_GOOGLEDRIVESERVICE_H_ #define INTERNET_GOOGLEDRIVESERVICE_H_
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
namespace google_drive { namespace google_drive {
class Client; class Client;

2
src/internet/googledrive/googledrivesettingspage.cpp
View File

@ -22,7 +22,7 @@
#include "googledrivesettingspage.h" #include "googledrivesettingspage.h"
#include "ui_googledrivesettingspage.h" #include "ui_googledrivesettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
src/internet/grooveshark/groovesharkradio.cpp
View File

@ -21,7 +21,7 @@
#include "groovesharkservice.h" #include "groovesharkservice.h"
#include "core/logging.h" #include "core/logging.h"
#include "internet/internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
GroovesharkRadio::GroovesharkRadio(GroovesharkService* service) GroovesharkRadio::GroovesharkRadio(GroovesharkService* service)
: service_(service), tag_id_(0), use_tag_(false), first_time_(true) {} : service_(service), tag_id_(0), use_tag_(false), first_time_(true) {}

4
src/internet/grooveshark/groovesharkservice.cpp
View File

@ -41,10 +41,10 @@
#include "qtiocompressor.h" #include "qtiocompressor.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "groovesharkradio.h" #include "groovesharkradio.h"
#include "groovesharkurlhandler.h" #include "groovesharkurlhandler.h"
#include "searchboxwidget.h" #include "internet/core/searchboxwidget.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"

4
src/internet/grooveshark/groovesharkservice.h
View File

@ -21,8 +21,8 @@
#ifndef INTERNET_GROOVESHARKSERVICE_H_ #ifndef INTERNET_GROOVESHARKSERVICE_H_
#define INTERNET_GROOVESHARKSERVICE_H_ #define INTERNET_GROOVESHARKSERVICE_H_
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include <QSslError> #include <QSslError>

2
src/internet/grooveshark/groovesharksettingspage.cpp
View File

@ -20,7 +20,7 @@
#include "groovesharkservice.h" #include "groovesharkservice.h"
#include "groovesharksettingspage.h" #include "groovesharksettingspage.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"
#include "ui_groovesharksettingspage.h" #include "ui_groovesharksettingspage.h"

2
src/internet/icecast/icecastservice.cpp
View File

@ -34,7 +34,7 @@
#include "icecastbackend.h" #include "icecastbackend.h"
#include "icecastfilterwidget.h" #include "icecastfilterwidget.h"
#include "icecastmodel.h" #include "icecastmodel.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/database.h" #include "core/database.h"

2
src/internet/icecast/icecastservice.h
View File

@ -21,7 +21,7 @@
#ifndef INTERNET_ICECASTSERVICE_H_ #ifndef INTERNET_ICECASTSERVICE_H_
#define INTERNET_ICECASTSERVICE_H_ #define INTERNET_ICECASTSERVICE_H_
#include "internetservice.h" #include "internet/core/internetservice.h"
#include <QXmlStreamReader> #include <QXmlStreamReader>

2
src/internet/internetradio/savedradio.cpp
View File

@ -20,7 +20,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "savedradio.h" #include "savedradio.h"
#include "core/application.h" #include "core/application.h"
#include "core/mimedata.h" #include "core/mimedata.h"

2
src/internet/internetradio/savedradio.h
View File

@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include "internetservice.h" #include "internet/core/internetservice.h"
class QMenu; class QMenu;

2
src/internet/jamendo/jamendoservice.cpp
View File

@ -25,7 +25,7 @@
#include "jamendodynamicplaylist.h" #include "jamendodynamicplaylist.h"
#include "jamendoplaylistitem.h" #include "jamendoplaylistitem.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/database.h" #include "core/database.h"
#include "core/logging.h" #include "core/logging.h"

2
src/internet/jamendo/jamendoservice.h
View File

@ -22,7 +22,7 @@
#ifndef INTERNET_JAMENDOSERVICE_H_ #ifndef INTERNET_JAMENDOSERVICE_H_
#define INTERNET_JAMENDOSERVICE_H_ #define INTERNET_JAMENDOSERVICE_H_
#include "internetservice.h" #include "internet/core/internetservice.h"
#include <QXmlStreamReader> #include <QXmlStreamReader>

4
src/internet/lastfm/lastfmservice.cpp
View File

@ -50,8 +50,8 @@
#endif #endif
#include "lastfmcompat.h" #include "lastfmcompat.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"

2
src/internet/lastfm/lastfmservice.h
View File

@ -34,7 +34,7 @@ uint qHash(const lastfm::Track& track);
#include "lastfmcompat.h" #include "lastfmcompat.h"
#include "internet/scrobbler.h" #include "internet/core/scrobbler.h"
class Application; class Application;
class LastFMUrlHandler; class LastFMUrlHandler;

2
src/internet/lastfm/lastfmsettingspage.cpp
View File

@ -28,7 +28,7 @@
#include <QSettings> #include <QSettings>
#include "lastfmservice.h" #include "lastfmservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"

2
src/internet/magnatune/magnatunedownloaddialog.cpp
View File

@ -33,7 +33,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include "magnatuneservice.h" #include "magnatuneservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui_magnatunedownloaddialog.h" #include "ui_magnatunedownloaddialog.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"

2
src/internet/magnatune/magnatuneplaylistitem.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include "magnatuneplaylistitem.h" #include "magnatuneplaylistitem.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
MagnatunePlaylistItem::MagnatunePlaylistItem(const QString& type) MagnatunePlaylistItem::MagnatunePlaylistItem(const QString& type)
: LibraryPlaylistItem(type) {} : LibraryPlaylistItem(type) {}

2
src/internet/magnatune/magnatuneservice.cpp
View File

@ -25,7 +25,7 @@
#include "magnatuneplaylistitem.h" #include "magnatuneplaylistitem.h"
#include "magnatuneservice.h" #include "magnatuneservice.h"
#include "magnatuneurlhandler.h" #include "magnatuneurlhandler.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/database.h" #include "core/database.h"
#include "core/logging.h" #include "core/logging.h"

2
src/internet/magnatune/magnatuneservice.h
View File

@ -22,7 +22,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include "internetservice.h" #include "internet/core/internetservice.h"
class QNetworkAccessManager; class QNetworkAccessManager;
class QSortFilterProxyModel; class QSortFilterProxyModel;

2
src/internet/magnatune/magnatunesettingspage.cpp
View File

@ -23,7 +23,7 @@
#include "core/network.h" #include "core/network.h"
#include "magnatuneservice.h" #include "magnatuneservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui_magnatunesettingspage.h" #include "ui_magnatunesettingspage.h"
#include <QMessageBox> #include <QMessageBox>

2
src/internet/podcasts/addpodcastdialog.ui
View File

@ -211,7 +211,7 @@
<customwidget> <customwidget>
<class>PodcastInfoWidget</class> <class>PodcastInfoWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>podcasts/podcastinfowidget.h</header> <header>internet/podcasts/podcastinfowidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>

6
src/internet/podcasts/podcastservice.cpp
View File

@ -18,7 +18,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "podcastservice.h" #include "internet/podcasts/podcastservice.h"
#include <QMenu> #include <QMenu>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
@ -31,13 +31,13 @@
#include "devices/devicemanager.h" #include "devices/devicemanager.h"
#include "devices/devicestatefiltermodel.h" #include "devices/devicestatefiltermodel.h"
#include "devices/deviceview.h" #include "devices/deviceview.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "library/libraryview.h" #include "library/libraryview.h"
#include "opmlcontainer.h" #include "opmlcontainer.h"
#include "podcastbackend.h" #include "podcastbackend.h"
#include "podcastdeleter.h" #include "podcastdeleter.h"
#include "podcastdownloader.h" #include "podcastdownloader.h"
#include "podcastservicemodel.h" #include "internet/podcasts/podcastservicemodel.h"
#include "podcastupdater.h" #include "podcastupdater.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "ui/organisedialog.h" #include "ui/organisedialog.h"

4
src/internet/podcasts/podcastservice.h
View File

@ -23,8 +23,8 @@
#include "podcastdeleter.h" #include "podcastdeleter.h"
#include "podcastdownloader.h" #include "podcastdownloader.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/internetservice.h" #include "internet/core/internetservice.h"
#include <memory> #include <memory>
#include <QScopedPointer> #include <QScopedPointer>

4
src/internet/podcasts/podcastservicemodel.cpp
View File

@ -17,8 +17,8 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "podcastservice.h" #include "internet/podcasts/podcastservice.h"
#include "podcastservicemodel.h" #include "internet/podcasts/podcastservicemodel.h"
#include "playlist/songmimedata.h" #include "playlist/songmimedata.h"
PodcastServiceModel::PodcastServiceModel(QObject* parent) PodcastServiceModel::PodcastServiceModel(QObject* parent)

2
src/internet/podcasts/podcastsettingspage.cpp
View File

@ -17,7 +17,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "podcastsettingspage.h" #include "internet/podcasts/podcastsettingspage.h"
#include "ui_podcastsettingspage.h" #include "ui_podcastsettingspage.h"
#include <QFileDialog> #include <QFileDialog>

4
src/internet/seafile/seafileservice.cpp
View File

@ -28,9 +28,9 @@
#include "core/application.h" #include "core/application.h"
#include "core/player.h" #include "core/player.h"
#include "core/waitforsignal.h" #include "core/waitforsignal.h"
#include "internet/seafileurlhandler.h" #include "internet/seafile/seafileurlhandler.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "internet/oauthenticator.h" #include "internet/core/oauthenticator.h"
const char* SeafileService::kServiceName = "Seafile"; const char* SeafileService::kServiceName = "Seafile";
const char* SeafileService::kSettingsGroup = "Seafile"; const char* SeafileService::kSettingsGroup = "Seafile";

2
src/internet/seafile/seafileservice.h
View File

@ -45,7 +45,7 @@
#ifndef INTERNET_SEAFILESERVICE_H_ #ifndef INTERNET_SEAFILESERVICE_H_
#define INTERNET_SEAFILESERVICE_H_ #define INTERNET_SEAFILESERVICE_H_
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include <QDateTime> #include <QDateTime>
#include <QMutex> #include <QMutex>

2
src/internet/seafile/seafilesettingspage.cpp
View File

@ -26,7 +26,7 @@
#include <QtDebug> #include <QtDebug>
#include "seafileservice.h" #include "seafileservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"
#include "ui_seafilesettingspage.h" #include "ui_seafilesettingspage.h"

2
src/internet/seafile/seafiletree.h
View File

@ -28,7 +28,7 @@
#include <QList> #include <QList>
#include <QPair> #include <QPair>
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
// Reproduce the file system of Seafile server libraries // Reproduce the file system of Seafile server libraries
// Analog to a tree // Analog to a tree

4
src/internet/skydrive/skydriveservice.cpp
View File

@ -26,8 +26,8 @@
#include "core/application.h" #include "core/application.h"
#include "core/player.h" #include "core/player.h"
#include "core/waitforsignal.h" #include "core/waitforsignal.h"
#include "internet/oauthenticator.h" #include "internet/core/oauthenticator.h"
#include "internet/skydriveurlhandler.h" #include "internet/skydrive/skydriveurlhandler.h"
namespace { namespace {

2
src/internet/skydrive/skydriveservice.h
View File

@ -20,7 +20,7 @@
#ifndef INTERNET_SKYDRIVESERVICE_H_ #ifndef INTERNET_SKYDRIVESERVICE_H_
#define INTERNET_SKYDRIVESERVICE_H_ #define INTERNET_SKYDRIVESERVICE_H_
#include "cloudfileservice.h" #include "internet/core/cloudfileservice.h"
#include <QDateTime> #include <QDateTime>

4
src/internet/skydrive/skydrivesettingspage.cpp
View File

@ -22,8 +22,8 @@
#include "ui_skydrivesettingspage.h" #include "ui_skydrivesettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "internet/skydriveservice.h" #include "internet/skydrive/skydriveservice.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
SkydriveSettingsPage::SkydriveSettingsPage(SettingsDialog* parent) SkydriveSettingsPage::SkydriveSettingsPage(SettingsDialog* parent)

2
src/internet/somafm/somafmservice.cpp
View File

@ -21,7 +21,7 @@
#include "somafmservice.h" #include "somafmservice.h"
#include "somafmurlhandler.h" #include "somafmurlhandler.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"

2
src/internet/somafm/somafmservice.h
View File

@ -23,7 +23,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "core/cachedlist.h" #include "core/cachedlist.h"
class SomaFMUrlHandler; class SomaFMUrlHandler;

2
src/internet/somafm/somafmurlhandler.cpp
View File

@ -19,7 +19,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "somafmservice.h" #include "somafmservice.h"
#include "somafmurlhandler.h" #include "somafmurlhandler.h"
#include "core/application.h" #include "core/application.h"

6
src/internet/soundcloud/soundcloudservice.cpp
View File

@ -29,9 +29,9 @@
#include <qjson/parser.h> #include <qjson/parser.h>
#include <qjson/serializer.h> #include <qjson/serializer.h>
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "oauthenticator.h" #include "internet/core/oauthenticator.h"
#include "searchboxwidget.h" #include "internet/core/searchboxwidget.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"

4
src/internet/soundcloud/soundcloudservice.h
View File

@ -20,8 +20,8 @@
#ifndef INTERNET_SOUNDCLOUDSERVICE_H_ #ifndef INTERNET_SOUNDCLOUDSERVICE_H_
#define INTERNET_SOUNDCLOUDSERVICE_H_ #define INTERNET_SOUNDCLOUDSERVICE_H_
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
class NetworkAccessManager; class NetworkAccessManager;
class OAuthenticator; class OAuthenticator;

2
src/internet/soundcloud/soundcloudsettingspage.cpp
View File

@ -20,7 +20,7 @@
#include "soundcloudsettingspage.h" #include "soundcloudsettingspage.h"
#include "ui_soundcloudsettingspage.h" #include "ui_soundcloudsettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
SoundCloudSettingsPage::SoundCloudSettingsPage(SettingsDialog* parent) SoundCloudSettingsPage::SoundCloudSettingsPage(SettingsDialog* parent)
: SettingsPage(parent), : SettingsPage(parent),

4
src/internet/spotify/spotifyservice.cpp
View File

@ -23,8 +23,8 @@
#include "blobversion.h" #include "blobversion.h"
#include "config.h" #include "config.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "searchboxwidget.h" #include "internet/core/searchboxwidget.h"
#include "spotifyserver.h" #include "spotifyserver.h"
#include "spotifyservice.h" #include "spotifyservice.h"
#include "core/application.h" #include "core/application.h"

4
src/internet/spotify/spotifyservice.h
View File

@ -22,8 +22,8 @@
#ifndef INTERNET_SPOTIFYSERVICE_H_ #ifndef INTERNET_SPOTIFYSERVICE_H_
#define INTERNET_SPOTIFYSERVICE_H_ #define INTERNET_SPOTIFYSERVICE_H_
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "spotifymessages.pb.h" #include "spotifymessages.pb.h"
#include <QProcess> #include <QProcess>

2
src/internet/spotify/spotifysettingspage.cpp
View File

@ -24,7 +24,7 @@
#include "config.h" #include "config.h"
#include "spotifymessages.pb.h" #include "spotifymessages.pb.h"
#include "spotifyservice.h" #include "spotifyservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "ui_spotifysettingspage.h" #include "ui_spotifysettingspage.h"
#include "core/network.h" #include "core/network.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"

4
src/internet/subsonic/subsonicservice.cpp
View File

@ -41,8 +41,8 @@
#include "core/utilities.h" #include "core/utilities.h"
#include "globalsearch/globalsearch.h" #include "globalsearch/globalsearch.h"
#include "globalsearch/librarysearchprovider.h" #include "globalsearch/librarysearchprovider.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/subsonicurlhandler.h" #include "internet/subsonic/subsonicurlhandler.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "library/libraryfilterwidget.h" #include "library/libraryfilterwidget.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"

4
src/internet/subsonic/subsonicservice.h
View File

@ -24,8 +24,8 @@
#include <QQueue> #include <QQueue>
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/internetservice.h" #include "internet/core/internetservice.h"
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;

2
src/internet/subsonic/subsonicsettingspage.cpp
View File

@ -21,7 +21,7 @@
#include "subsonicsettingspage.h" #include "subsonicsettingspage.h"
#include "ui_subsonicsettingspage.h" #include "ui_subsonicsettingspage.h"
#include "core/logging.h" #include "core/logging.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include <QSettings> #include <QSettings>

2
src/internet/vk/vkconnection.cpp
View File

@ -24,7 +24,7 @@
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "internet/localredirectserver.h" #include "internet/core/localredirectserver.h"
#include "vreen/utils.h" #include "vreen/utils.h"
#include "vkservice.h" #include "vkservice.h"

6
src/internet/vk/vkservice.cpp
View File

@ -44,9 +44,9 @@
#include "widgets/didyoumean.h" #include "widgets/didyoumean.h"
#include "globalsearch/globalsearch.h" #include "globalsearch/globalsearch.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
#include "searchboxwidget.h" #include "internet/core/searchboxwidget.h"
#include "vreen/audio.h" #include "vreen/audio.h"
#include "vreen/contact.h" #include "vreen/contact.h"

4
src/internet/vk/vkservice.h
View File

@ -22,8 +22,8 @@
#include <memory> #include <memory>
#include "internetservice.h" #include "internet/core/internetservice.h"
#include "internetmodel.h" #include "internet/core/internetmodel.h"
#include "core/song.h" #include "core/song.h"
#include "vreen/audio.h" #include "vreen/audio.h"

2
src/internet/vk/vksettingspage.cpp
View File

@ -24,7 +24,7 @@
#include "ui_vksettingspage.h" #include "ui_vksettingspage.h"
#include "core/application.h" #include "core/application.h"
#include "core/logging.h" #include "core/logging.h"
#include "internet/vkservice.h" #include "internet/vk/vkservice.h"
VkSettingsPage::VkSettingsPage(SettingsDialog* parent) VkSettingsPage::VkSettingsPage(SettingsDialog* parent)
: SettingsPage(parent), : SettingsPage(parent),

2
src/main.cpp
View File

@ -89,7 +89,7 @@
#endif #endif
#ifdef HAVE_LIBLASTFM #ifdef HAVE_LIBLASTFM
#include "internet/lastfmservice.h" #include "internet/lastfm/lastfmservice.h"
#else #else
class LastFMService; class LastFMService;
#endif #endif

4
src/networkremote/incomingdataparser.cpp
View File

@ -21,13 +21,13 @@
#include "core/logging.h" #include "core/logging.h"
#include "engines/enginebase.h" #include "engines/enginebase.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "playlist/playlistmanager.h" #include "playlist/playlistmanager.h"
#include "playlist/playlistsequence.h" #include "playlist/playlistsequence.h"
#include "playlist/playlist.h" #include "playlist/playlist.h"
#ifdef HAVE_LIBLASTFM #ifdef HAVE_LIBLASTFM
#include "internet/lastfmservice.h" #include "internet/lastfm/lastfmservice.h"
#endif #endif
IncomingDataParser::IncomingDataParser(Application* app) : app_(app) { IncomingDataParser::IncomingDataParser(Application* app) : app_(app) {

18
src/playlist/playlist.cpp
View File

@ -51,15 +51,15 @@
#include "core/qhash_qurl.h" #include "core/qhash_qurl.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"
#include "core/timeconstants.h" #include "core/timeconstants.h"
#include "internet/jamendoplaylistitem.h" #include "internet/jamendo/jamendoplaylistitem.h"
#include "internet/jamendoservice.h" #include "internet/jamendo/jamendoservice.h"
#include "internet/magnatuneplaylistitem.h" #include "internet/magnatune/magnatuneplaylistitem.h"
#include "internet/magnatuneservice.h" #include "internet/magnatune/magnatuneservice.h"
#include "internet/internetmimedata.h" #include "internet/core/internetmimedata.h"
#include "internet/internetmodel.h" #include "internet/core/internetmodel.h"
#include "internet/internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
#include "internet/internetsongmimedata.h" #include "internet/core/internetsongmimedata.h"
#include "internet/savedradio.h" #include "internet/internetradio/savedradio.h"
#include "library/library.h" #include "library/library.h"
#include "library/librarybackend.h" #include "library/librarybackend.h"
#include "library/librarymodel.h" #include "library/librarymodel.h"

10
src/playlist/playlistitem.cpp
View File

@ -19,11 +19,11 @@
#include "songplaylistitem.h" #include "songplaylistitem.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/song.h" #include "core/song.h"
#include "internet/jamendoplaylistitem.h" #include "internet/jamendo/jamendoplaylistitem.h"
#include "internet/jamendoservice.h" #include "internet/jamendo/jamendoservice.h"
#include "internet/magnatuneplaylistitem.h" #include "internet/magnatune/magnatuneplaylistitem.h"
#include "internet/magnatuneservice.h" #include "internet/magnatune/magnatuneservice.h"
#include "internet/internetplaylistitem.h" #include "internet/core/internetplaylistitem.h"
#include "library/library.h" #include "library/library.h"
#include "library/libraryplaylistitem.h" #include "library/libraryplaylistitem.h"

2
src/playlist/playlisttabbar.cpp
View File

@ -21,7 +21,7 @@
#include "playlistview.h" #include "playlistview.h"
#include "songmimedata.h" #include "songmimedata.h"
#include "core/logging.h" #include "core/logging.h"
#include "internet/internetmimedata.h" #include "internet/core/internetmimedata.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "widgets/renametablineedit.h" #include "widgets/renametablineedit.h"
#include "widgets/favoritewidget.h" #include "widgets/favoritewidget.h"

Some files were not shown because too many files have changed in this diff Show More