Permalink
Browse files

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

  • Loading branch information...
1 parent 606ecb5 commit 0e566bc300b3fc404c61f1d8fcc423f8e3d91cf4 @teo teo committed Feb 1, 2013
View
@@ -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"
View
@@ -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"
View
@@ -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;
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -19,7 +19,7 @@
#include "Source.h"
-#include "Collection.h"
+#include "collection/Collection.h"
#include "SourceList.h"
#include "SourcePlaylistInterface.h"
View
@@ -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"
@@ -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"
@@ -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"
@@ -23,7 +23,7 @@
#include <QDir>
-#include "Collection.h"
+#include "collection/Collection.h"
#include "Source.h"
#include "Typedefs.h"
@@ -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"
@@ -24,7 +24,7 @@
#include "Album.h"
#include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
#include "Typedefs.h"
#include "DatabaseCommand.h"
@@ -23,7 +23,7 @@
#include <QVariantMap>
#include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
#include "Typedefs.h"
#include "DatabaseCommand.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"
@@ -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"
@@ -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"
@@ -21,7 +21,7 @@
#include <QSqlQuery>
-#include "Collection.h"
+#include "collection/Collection.h"
#include "database/Database.h"
#include "DatabaseImpl.h"
#include "network/Servent.h"
@@ -23,7 +23,7 @@
#include <QVariantMap>
#include "Artist.h"
-#include "Collection.h"
+#include "collection/Collection.h"
#include "Typedefs.h"
#include "DatabaseCommand.h"
@@ -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"
@@ -21,7 +21,7 @@
#define SCRIPTCOLLECTION_H
#include "ExternalResolver.h"
-#include "Collection.h"
+#include "collection/Collection.h"
#include "Typedefs.h"
#include "DllMacro.h"
@@ -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"

0 comments on commit 0e566bc

Please sign in to comment.