From 606ecb58658789a982b9d550ac2435fb515aef92 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 1 Feb 2013 10:13:41 +0100 Subject: [PATCH] Move all resolver-related classes to libtomahawk/resolvers --- src/SettingsDialog.cpp | 4 ++-- src/libtomahawk/CMakeLists.txt | 7 ++++--- src/libtomahawk/Pipeline.cpp | 2 +- src/libtomahawk/Query.cpp | 2 +- src/libtomahawk/Result.cpp | 4 ++-- src/libtomahawk/SourceList.cpp | 2 +- src/libtomahawk/accounts/ResolverAccount.cpp | 4 ++-- src/libtomahawk/database/DatabaseResolver.h | 2 +- src/libtomahawk/{ => resolvers}/ExternalResolver.cpp | 0 src/libtomahawk/{ => resolvers}/ExternalResolver.h | 0 src/libtomahawk/{ => resolvers}/ExternalResolverGui.cpp | 0 src/libtomahawk/{ => resolvers}/ExternalResolverGui.h | 0 src/libtomahawk/{ => resolvers}/Resolver.cpp | 0 src/libtomahawk/{ => resolvers}/Resolver.h | 0 14 files changed, 14 insertions(+), 13 deletions(-) rename src/libtomahawk/{ => resolvers}/ExternalResolver.cpp (100%) rename src/libtomahawk/{ => resolvers}/ExternalResolver.h (100%) rename src/libtomahawk/{ => resolvers}/ExternalResolverGui.cpp (100%) rename src/libtomahawk/{ => resolvers}/ExternalResolverGui.h (100%) rename src/libtomahawk/{ => resolvers}/Resolver.cpp (100%) rename src/libtomahawk/{ => resolvers}/Resolver.h (100%) diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 3da35d300..c3a1bc0cf 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -33,8 +33,8 @@ #include "TomahawkSettings.h" #include "accounts/DelegateConfigWrapper.h" #include "Pipeline.h" -#include "Resolver.h" -#include "ExternalResolverGui.h" +#include "resolvers/Resolver.h" +#include "resolvers/ExternalResolverGui.h" #include "utils/TomahawkUtilsGui.h" #include "utils/GuiHelpers.h" #include "accounts/AccountDelegate.h" diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index c3ac2c64c..2007be8da 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/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 @@ -306,6 +304,9 @@ list(APPEND libSources playlist/dynamic/database/DatabaseGenerator.cpp playlist/dynamic/database/DatabaseControl.cpp playlist/dynamic/DynamicControl.cpp + + resolvers/Resolver.cpp + resolvers/ExternalResolver.cpp utils/TomahawkUtils.cpp utils/Logger.cpp diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp index 88a2f9fc9..e4e105d34 100644 --- a/src/libtomahawk/Pipeline.cpp +++ b/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" diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 62dcc9ee6..28cd4668f 100644 --- a/src/libtomahawk/Query.cpp +++ b/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" diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index d4c08e7a6..91bfd0ecf 100644 --- a/src/libtomahawk/Result.cpp +++ b/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; diff --git a/src/libtomahawk/SourceList.cpp b/src/libtomahawk/SourceList.cpp index 2d2fd378d..91ba0b831 100644 --- a/src/libtomahawk/SourceList.cpp +++ b/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" diff --git a/src/libtomahawk/accounts/ResolverAccount.cpp b/src/libtomahawk/accounts/ResolverAccount.cpp index 184790505..1384cdb63 100644 --- a/src/libtomahawk/accounts/ResolverAccount.cpp +++ b/src/libtomahawk/accounts/ResolverAccount.cpp @@ -20,8 +20,8 @@ #include "AccountManager.h" #include "AtticaManager.h" -#include "ExternalResolver.h" -#include "ExternalResolverGui.h" +#include "resolvers/ExternalResolver.h" +#include "resolvers/ExternalResolverGui.h" #include "Pipeline.h" #include "TomahawkSettings.h" #include "Source.h" diff --git a/src/libtomahawk/database/DatabaseResolver.h b/src/libtomahawk/database/DatabaseResolver.h index 2a26bbef8..4a120f35d 100644 --- a/src/libtomahawk/database/DatabaseResolver.h +++ b/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" diff --git a/src/libtomahawk/ExternalResolver.cpp b/src/libtomahawk/resolvers/ExternalResolver.cpp similarity index 100% rename from src/libtomahawk/ExternalResolver.cpp rename to src/libtomahawk/resolvers/ExternalResolver.cpp diff --git a/src/libtomahawk/ExternalResolver.h b/src/libtomahawk/resolvers/ExternalResolver.h similarity index 100% rename from src/libtomahawk/ExternalResolver.h rename to src/libtomahawk/resolvers/ExternalResolver.h diff --git a/src/libtomahawk/ExternalResolverGui.cpp b/src/libtomahawk/resolvers/ExternalResolverGui.cpp similarity index 100% rename from src/libtomahawk/ExternalResolverGui.cpp rename to src/libtomahawk/resolvers/ExternalResolverGui.cpp diff --git a/src/libtomahawk/ExternalResolverGui.h b/src/libtomahawk/resolvers/ExternalResolverGui.h similarity index 100% rename from src/libtomahawk/ExternalResolverGui.h rename to src/libtomahawk/resolvers/ExternalResolverGui.h diff --git a/src/libtomahawk/Resolver.cpp b/src/libtomahawk/resolvers/Resolver.cpp similarity index 100% rename from src/libtomahawk/Resolver.cpp rename to src/libtomahawk/resolvers/Resolver.cpp diff --git a/src/libtomahawk/Resolver.h b/src/libtomahawk/resolvers/Resolver.h similarity index 100% rename from src/libtomahawk/Resolver.h rename to src/libtomahawk/resolvers/Resolver.h