From 0e566bc300b3fc404c61f1d8fcc423f8e3d91cf4 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 1 Feb 2013 12:21:23 +0100 Subject: [PATCH] Move Collection.{h,cpp} to its own directory. --- src/TomahawkApp.cpp | 2 +- src/TomahawkTrayIcon.cpp | 2 +- src/libtomahawk/Album.h | 2 +- src/libtomahawk/Artist.cpp | 2 +- src/libtomahawk/ArtistPlaylistInterface.cpp | 2 +- src/libtomahawk/CMakeLists.txt | 13 +++++++------ src/libtomahawk/ContextMenu.cpp | 2 +- src/libtomahawk/EchonestCatalogSynchronizer.cpp | 2 +- src/libtomahawk/Query.cpp | 2 +- src/libtomahawk/Result.cpp | 2 +- src/libtomahawk/Source.cpp | 2 +- src/libtomahawk/Source.h | 2 +- src/libtomahawk/ViewManager.h | 2 +- src/libtomahawk/{ => collection}/Collection.cpp | 2 +- src/libtomahawk/{ => collection}/Collection.h | 0 src/libtomahawk/database/DatabaseCollection.h | 2 +- .../database/DatabaseCommand_AddFiles.cpp | 2 +- .../database/DatabaseCommand_AllAlbums.h | 2 +- .../database/DatabaseCommand_AllArtists.h | 2 +- .../database/DatabaseCommand_AllTracks.h | 2 +- .../database/DatabaseCommand_DeleteFiles.cpp | 2 +- .../database/DatabaseCommand_LoadFiles.cpp | 2 +- .../database/DatabaseCommand_LogPlayback.cpp | 2 +- .../database/DatabaseCommand_PlaybackCharts.h | 2 +- .../database/DatabaseCommand_RenamePlaylist.cpp | 2 +- src/libtomahawk/resolvers/ScriptCollection.h | 2 +- src/sourcetree/SourcesModel.cpp | 2 +- 27 files changed, 32 insertions(+), 31 deletions(-) rename src/libtomahawk/{ => collection}/Collection.cpp (99%) rename src/libtomahawk/{ => collection}/Collection.h (100%) diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index c5026fad4..c139da39a 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -26,7 +26,7 @@ #include "AclRegistryImpl.h" #include "Album.h" #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "infosystem/InfoSystem.h" #include "infosystem/InfoSystemCache.h" #include "accounts/AccountManager.h" diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp index 592c2c64e..868afbf98 100644 --- a/src/TomahawkTrayIcon.cpp +++ b/src/TomahawkTrayIcon.cpp @@ -25,7 +25,7 @@ #include "TomahawkWindow.h" #include "Query.h" #include "Source.h" -#include "Collection.h" +#include "collection/Collection.h" #include "ActionCollection.h" #include "utils/Logger.h" #include "utils/TomahawkUtilsGui.h" diff --git a/src/libtomahawk/Album.h b/src/libtomahawk/Album.h index 9f2252118..6565b400a 100644 --- a/src/libtomahawk/Album.h +++ b/src/libtomahawk/Album.h @@ -30,7 +30,7 @@ #include "Typedefs.h" #include "PlaylistInterface.h" #include "DllMacro.h" -#include "Collection.h" +#include "collection/Collection.h" #include "infosystem/InfoSystem.h" class IdThreadWorker; diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index 5f8518e3c..9a0f9dd25 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -21,7 +21,7 @@ #include "Artist.h" #include "ArtistPlaylistInterface.h" -#include "Collection.h" +#include "collection/Collection.h" #include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/DatabaseCommand_AllAlbums.h" diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp index f595b8a9c..40a2c744e 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.cpp +++ b/src/libtomahawk/ArtistPlaylistInterface.cpp @@ -20,7 +20,7 @@ #include "ArtistPlaylistInterface.h" #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Query.h" #include "database/Database.h" #include "database/DatabaseCommand_AllTracks.h" diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 2007be8da..9f6db902a 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -177,7 +177,6 @@ list(APPEND libSources ArtistPlaylistInterface.cpp Album.cpp AlbumPlaylistInterface.cpp - Collection.cpp CountryUtils.cpp FuncTimeout.cpp Playlist.cpp @@ -207,13 +206,10 @@ list(APPEND libSources accounts/spotify/SpotifyPlaylistUpdater.cpp accounts/spotify/SpotifyInfoPlugin.cpp - sip/SipPlugin.cpp - sip/SipInfo.cpp - sip/PeerInfo.cpp - sip/SipStatusMessage.cpp - audio/AudioEngine.cpp + collection/Collection.cpp + database/Database.cpp database/FuzzyIndex.cpp database/DatabaseCollection.cpp @@ -308,6 +304,11 @@ list(APPEND libSources resolvers/Resolver.cpp resolvers/ExternalResolver.cpp + sip/SipPlugin.cpp + sip/SipInfo.cpp + sip/PeerInfo.cpp + sip/SipStatusMessage.cpp + utils/TomahawkUtils.cpp utils/Logger.cpp utils/Qnr_IoDeviceStream.cpp diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index 2cf7bef16..c67a63c51 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -25,7 +25,7 @@ #include "ViewManager.h" #include "Query.h" #include "Result.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" #include "Artist.h" #include "Album.h" diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp index 066dadc69..720db8fd2 100644 --- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp +++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp @@ -21,7 +21,7 @@ #include #include -#include "Collection.h" +#include "collection/Collection.h" #include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/DatabaseCommand_GenericSelect.h" diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 28cd4668f..e38cfd0ab 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -29,7 +29,7 @@ #include "database/DatabaseCommand_SocialAction.h" #include "database/DatabaseCommand_TrackStats.h" #include "Album.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Pipeline.h" #include "resolvers/Resolver.h" #include "SourceList.h" diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index 91bfd0ecf..de9e12be8 100644 --- a/src/libtomahawk/Result.cpp +++ b/src/libtomahawk/Result.cpp @@ -19,7 +19,7 @@ #include "Result.h" #include "Album.h" -#include "Collection.h" +#include "collection/Collection.h" #include "resolvers/Resolver.h" #include "Source.h" #include "Pipeline.h" diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp index bcd693117..4be7dbd6f 100644 --- a/src/libtomahawk/Source.cpp +++ b/src/libtomahawk/Source.cpp @@ -19,7 +19,7 @@ #include "Source.h" -#include "Collection.h" +#include "collection/Collection.h" #include "SourceList.h" #include "SourcePlaylistInterface.h" diff --git a/src/libtomahawk/Source.h b/src/libtomahawk/Source.h index 7878c5c37..6a78b885b 100644 --- a/src/libtomahawk/Source.h +++ b/src/libtomahawk/Source.h @@ -26,7 +26,7 @@ #include "Typedefs.h" #include "network/DbSyncConnection.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Query.h" #include "utils/TomahawkUtils.h" diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index a4379516f..0f95c567e 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -25,7 +25,7 @@ #include #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "PlaylistInterface.h" #include "playlist/QueueView.h" #include "ViewPage.h" diff --git a/src/libtomahawk/Collection.cpp b/src/libtomahawk/collection/Collection.cpp similarity index 99% rename from src/libtomahawk/Collection.cpp rename to src/libtomahawk/collection/Collection.cpp index c0851f7c2..61d93e3bf 100644 --- a/src/libtomahawk/Collection.cpp +++ b/src/libtomahawk/collection/Collection.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" diff --git a/src/libtomahawk/Collection.h b/src/libtomahawk/collection/Collection.h similarity index 100% rename from src/libtomahawk/Collection.h rename to src/libtomahawk/collection/Collection.h diff --git a/src/libtomahawk/database/DatabaseCollection.h b/src/libtomahawk/database/DatabaseCollection.h index 9f8d6a688..4634acbfc 100644 --- a/src/libtomahawk/database/DatabaseCollection.h +++ b/src/libtomahawk/database/DatabaseCollection.h @@ -23,7 +23,7 @@ #include -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" #include "Typedefs.h" diff --git a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp index 64bd419f1..c8fc3c03d 100644 --- a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp @@ -22,7 +22,7 @@ #include "Artist.h" #include "Album.h" -#include "Collection.h" +#include "collection/Collection.h" #include "database/Database.h" #include "DatabaseImpl.h" #include "network/DbSyncConnection.h" diff --git a/src/libtomahawk/database/DatabaseCommand_AllAlbums.h b/src/libtomahawk/database/DatabaseCommand_AllAlbums.h index d659699d1..e0bb03b92 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllAlbums.h +++ b/src/libtomahawk/database/DatabaseCommand_AllAlbums.h @@ -24,7 +24,7 @@ #include "Album.h" #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Typedefs.h" #include "DatabaseCommand.h" diff --git a/src/libtomahawk/database/DatabaseCommand_AllArtists.h b/src/libtomahawk/database/DatabaseCommand_AllArtists.h index fec4944d8..2d0250bea 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllArtists.h +++ b/src/libtomahawk/database/DatabaseCommand_AllArtists.h @@ -23,7 +23,7 @@ #include #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Typedefs.h" #include "DatabaseCommand.h" diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.h b/src/libtomahawk/database/DatabaseCommand_AllTracks.h index 4aa8ee056..64247eae1 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllTracks.h +++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.h @@ -23,7 +23,7 @@ #include #include "DatabaseCommand.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Typedefs.h" #include "Query.h" #include "Artist.h" diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp index bd1d44c14..4d72550a0 100644 --- a/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp @@ -23,7 +23,7 @@ #include "Artist.h" #include "Album.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" #include "database/Database.h" #include "database/DatabaseImpl.h" diff --git a/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp b/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp index 24a89ff23..b4084bd15 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp @@ -19,7 +19,7 @@ #include "DatabaseCommand_LoadFiles.h" #include "DatabaseImpl.h" -#include "Collection.h" +#include "collection/Collection.h" #include "utils/Logger.h" #include "Source.h" diff --git a/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp b/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp index a9839b47e..9bba059e6 100644 --- a/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp @@ -21,7 +21,7 @@ #include -#include "Collection.h" +#include "collection/Collection.h" #include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" diff --git a/src/libtomahawk/database/DatabaseCommand_PlaybackCharts.h b/src/libtomahawk/database/DatabaseCommand_PlaybackCharts.h index b9084f1ef..77cf84f3d 100644 --- a/src/libtomahawk/database/DatabaseCommand_PlaybackCharts.h +++ b/src/libtomahawk/database/DatabaseCommand_PlaybackCharts.h @@ -23,7 +23,7 @@ #include #include "Artist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Typedefs.h" #include "DatabaseCommand.h" diff --git a/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp index 20ed97ec0..a5985001d 100644 --- a/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp @@ -21,7 +21,7 @@ #include #include "DatabaseImpl.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" #include "network/Servent.h" #include "utils/Logger.h" diff --git a/src/libtomahawk/resolvers/ScriptCollection.h b/src/libtomahawk/resolvers/ScriptCollection.h index 00645ac4d..abf9fd7e3 100644 --- a/src/libtomahawk/resolvers/ScriptCollection.h +++ b/src/libtomahawk/resolvers/ScriptCollection.h @@ -21,7 +21,7 @@ #define SCRIPTCOLLECTION_H #include "ExternalResolver.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/sourcetree/SourcesModel.cpp b/src/sourcetree/SourcesModel.cpp index ecb6b4711..7a3ed0325 100644 --- a/src/sourcetree/SourcesModel.cpp +++ b/src/sourcetree/SourcesModel.cpp @@ -33,7 +33,7 @@ #include "sourcetree/items/LovedTracksItem.h" #include "SourceList.h" #include "Playlist.h" -#include "Collection.h" +#include "collection/Collection.h" #include "Source.h" #include "ViewManager.h" #include "GlobalActionManager.h"