diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp index 1d459048a..2cac2e7b3 100644 --- a/src/libtomahawk/pipeline.cpp +++ b/src/libtomahawk/pipeline.cpp @@ -115,7 +115,7 @@ Pipeline::addResolver( Resolver* r ) void -Pipeline::addExternalResolverFactory(boost::function< ExternalResolver*(QString) > resolverFactory) +Pipeline::addExternalResolverFactory(ResolverFactoryFunc resolverFactory) { m_resolverFactories << resolverFactory; } @@ -126,7 +126,7 @@ Pipeline::addScriptResolver( const QString& path, bool start ) { ExternalResolver* res = 0; - Q_FOREACH(boost::function factory, m_resolverFactories) + foreach( ResolverFactoryFunc factory, m_resolverFactories) { res = factory( path ); diff --git a/src/libtomahawk/pipeline.h b/src/libtomahawk/pipeline.h index 1ffcf42ed..c3d92c936 100644 --- a/src/libtomahawk/pipeline.h +++ b/src/libtomahawk/pipeline.h @@ -36,6 +36,7 @@ namespace Tomahawk { class Resolver; class ExternalResolver; +typedef boost::function ResolverFactoryFunc; class DLLEXPORT Pipeline : public QObject { @@ -52,7 +53,7 @@ public: void reportResults( QID qid, const QList< result_ptr >& results ); - void addExternalResolverFactory( boost::function resolverFactory ); + void addExternalResolverFactory( ResolverFactoryFunc resolverFactory ); Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath, bool start = true ); void stopScriptResolver( const QString& scriptPath ); void removeScriptResolver( const QString& scriptPath ); @@ -104,7 +105,7 @@ private: QList< Resolver* > m_resolvers; QList< Tomahawk::ExternalResolver* > m_scriptResolvers; - QList< boost::function > m_resolverFactories; + QList< ResolverFactoryFunc > m_resolverFactories; QMap< QID, bool > m_qidsTimeout; QMap< QID, unsigned int > m_qidsState; QMap< QID, query_ptr > m_qids;