Move Collection.{h,cpp} to its own directory.

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"

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"

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;

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"

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"

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

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"

src/libtomahawk/EchonestCatalogSynchronizer.cpp

@@ -21,7 +21,7 @@
 #include <echonest/CatalogUpdateEntry.h>
 #include <echonest/Config.h>
 
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "database/DatabaseCommand_GenericSelect.h"

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"

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"

src/libtomahawk/Source.cpp

@@ -19,7 +19,7 @@
 
 #include "Source.h"
 
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "SourceList.h"
 #include "SourcePlaylistInterface.h"
 

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"
 

src/libtomahawk/ViewManager.h

@@ -25,7 +25,7 @@
 #include <QStackedWidget>
 
 #include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "PlaylistInterface.h"
 #include "playlist/QueueView.h"
 #include "ViewPage.h"

src/libtomahawk/collection/Collection.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Collection.h"
+#include "collection/Collection.h"
 
 #include "Source.h"
 

src/libtomahawk/database/DatabaseCollection.h

@@ -23,7 +23,7 @@
 
 #include <QDir>
 
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "Source.h"
 #include "Typedefs.h"
 

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"

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"
 

src/libtomahawk/database/DatabaseCommand_AllArtists.h

@@ -23,7 +23,7 @@
 #include <QVariantMap>
 
 #include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "Typedefs.h"
 #include "DatabaseCommand.h"
 

src/libtomahawk/database/DatabaseCommand_AllTracks.h

@@ -23,7 +23,7 @@
 #include <QVariantMap>
 
 #include "DatabaseCommand.h"
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "Typedefs.h"
 #include "Query.h"
 #include "Artist.h"

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"

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"
 

src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp

@@ -21,7 +21,7 @@
 
 #include <QSqlQuery>
 
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "database/Database.h"
 #include "DatabaseImpl.h"
 #include "network/Servent.h"

src/libtomahawk/database/DatabaseCommand_PlaybackCharts.h

@@ -23,7 +23,7 @@
 #include <QVariantMap>
 
 #include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "Typedefs.h"
 #include "DatabaseCommand.h"
 

src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp

@@ -21,7 +21,7 @@
 #include <QSqlQuery>
 
 #include "DatabaseImpl.h"
-#include "Collection.h"
+#include "collection/Collection.h"
 #include "Source.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"

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"

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"