From d32eb8fe1e3e8ab00ebd90b13216757de8902236 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 24 May 2014 12:13:44 +0100 Subject: [PATCH] Do less work in the constructor body --- src/libtomahawk/resolvers/JSResolverHelper.cpp | 8 ++++---- src/libtomahawk/resolvers/JSResolverHelper.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/resolvers/JSResolverHelper.cpp b/src/libtomahawk/resolvers/JSResolverHelper.cpp index b8b30bbc9..353612573 100644 --- a/src/libtomahawk/resolvers/JSResolverHelper.cpp +++ b/src/libtomahawk/resolvers/JSResolverHelper.cpp @@ -39,21 +39,21 @@ #include "UrlHandler.h" #include +#include #include #include -#include -#include #include +#include using namespace Tomahawk; JSResolverHelper::JSResolverHelper( const QString& scriptPath, JSResolver* parent ) : QObject( parent ) + , m_resolver( parent ) + , m_scriptPath( scriptPath ) , m_urlCallbackIsAsync( false ) , m_urlTranslatorIsAsync( false ) { - m_scriptPath = scriptPath; - m_resolver = parent; } diff --git a/src/libtomahawk/resolvers/JSResolverHelper.h b/src/libtomahawk/resolvers/JSResolverHelper.h index fd1acd207..20e9939ed 100644 --- a/src/libtomahawk/resolvers/JSResolverHelper.h +++ b/src/libtomahawk/resolvers/JSResolverHelper.h @@ -90,13 +90,13 @@ private: boost::function< void( QSharedPointer< QIODevice >& ) > callback ); void returnUrlTranslation( const QString& streamUrl, boost::function< void( const QString& ) > callback ); + QVariantMap m_resolverConfig; + JSResolver* m_resolver; QString m_scriptPath, m_urlCallback, m_urlTranslator; QHash< QString, boost::function< void( QSharedPointer< QIODevice >& ) > > m_streamCallbacks; QHash< QString, boost::function< void( const QString& ) > > m_translatorCallbacks; bool m_urlCallbackIsAsync; bool m_urlTranslatorIsAsync; - QVariantMap m_resolverConfig; - JSResolver* m_resolver; QString m_pendingUrl; Tomahawk::album_ptr m_pendingAlbum; };