Move all resolver-related classes to libtomahawk/resolvers

src/SettingsDialog.cpp

@@ -33,8 +33,8 @@
 #include "TomahawkSettings.h"
 #include "accounts/DelegateConfigWrapper.h"
 #include "Pipeline.h"
-#include "Resolver.h"
+#include "resolvers/Resolver.h"
-#include "ExternalResolverGui.h"
+#include "resolvers/ExternalResolverGui.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/GuiHelpers.h"
 #include "accounts/AccountDelegate.h"

src/libtomahawk/CMakeLists.txt

@@ -86,7 +86,7 @@ set( libGuiSources
     playlist/dynamic/widgets/CollapsibleControls.cpp
     playlist/dynamic/widgets/DynamicSetupWidget.cpp
 
-    ExternalResolverGui.cpp
+    resolvers/ExternalResolverGui.cpp
     resolvers/ScriptResolver.cpp
     resolvers/QtScriptResolver.cpp
     resolvers/ScriptCollection.cpp
@@ -183,8 +183,6 @@ list(APPEND libSources
     Playlist.cpp
     PlaylistPlaylistInterface.cpp
     MetaPlaylistInterface.cpp
-    Resolver.cpp
-    ExternalResolver.cpp
     Query.cpp
     Result.cpp
     Source.cpp
@@ -307,6 +305,9 @@ list(APPEND libSources
     playlist/dynamic/database/DatabaseControl.cpp
     playlist/dynamic/DynamicControl.cpp
     
+    resolvers/Resolver.cpp
+    resolvers/ExternalResolver.cpp
+
     utils/TomahawkUtils.cpp
     utils/Logger.cpp
     utils/Qnr_IoDeviceStream.cpp

src/libtomahawk/Pipeline.cpp

@@ -22,7 +22,7 @@
 
 #include "FuncTimeout.h"
 #include "database/Database.h"
-#include "ExternalResolver.h"
+#include "resolvers/ExternalResolver.h"
 #include "resolvers/ScriptResolver.h"
 #include "resolvers/QtScriptResolver.h"
 #include "Source.h"

src/libtomahawk/Query.cpp

@@ -31,7 +31,7 @@
 #include "Album.h"
 #include "Collection.h"
 #include "Pipeline.h"
-#include "Resolver.h"
+#include "resolvers/Resolver.h"
 #include "SourceList.h"
 #include "audio/AudioEngine.h"
 

src/libtomahawk/Result.cpp

@@ -20,7 +20,7 @@
 
 #include "Album.h"
 #include "Collection.h"
-#include "Resolver.h"
+#include "resolvers/Resolver.h"
 #include "Source.h"
 #include "Pipeline.h"
 #include "database/Database.h"
@@ -31,7 +31,7 @@
 
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
-#include "ExternalResolverGui.h"
+#include "resolvers/ExternalResolverGui.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/SourceList.cpp

@@ -25,7 +25,7 @@
 #include "network/RemoteCollection.h"
 #include "network/ControlConnection.h"
 #include "infosystem/InfoSystemCache.h"
-#include "ExternalResolver.h"
+#include "resolvers/ExternalResolver.h"
 #include "resolvers/ScriptCollection.h"
 
 #include "utils/Logger.h"

src/libtomahawk/accounts/ResolverAccount.cpp

@@ -20,8 +20,8 @@
 
 #include "AccountManager.h"
 #include "AtticaManager.h"
-#include "ExternalResolver.h"
+#include "resolvers/ExternalResolver.h"
-#include "ExternalResolverGui.h"
+#include "resolvers/ExternalResolverGui.h"
 #include "Pipeline.h"
 #include "TomahawkSettings.h"
 #include "Source.h"

src/libtomahawk/database/DatabaseResolver.h

@@ -19,7 +19,7 @@
 #ifndef DATABASERESOLVER_H
 #define DATABASERESOLVER_H
 
-#include "Resolver.h"
+#include "resolvers/Resolver.h"
 #include "Result.h"
 #include "Artist.h"
 #include "Album.h"