diff --git a/src/libtomahawk/resolvers/JSPlugin.cpp b/src/libtomahawk/resolvers/JSPlugin.cpp index 0924a09ab..726c04a01 100644 --- a/src/libtomahawk/resolvers/JSPlugin.cpp +++ b/src/libtomahawk/resolvers/JSPlugin.cpp @@ -26,7 +26,7 @@ #include #include - +#include using namespace Tomahawk; @@ -132,3 +132,32 @@ JSPlugin::name() const { return m_name; } + + +QVariant +JSPlugin::evaluateJavaScriptInternal( const QString& scriptSource ) +{ + return m_engine->mainFrame()->evaluateJavaScript( scriptSource ); +} + + +void +JSPlugin::evaluateJavaScript( const QString& scriptSource ) +{ + if ( QThread::currentThread() != thread() ) + { + QMetaObject::invokeMethod( this, "evaluateJavaScript", Qt::QueuedConnection, Q_ARG( QString, scriptSource ) ); + return; + } + + evaluateJavaScriptInternal( scriptSource ); +} + + +QVariant +JSPlugin::evaluateJavaScriptWithResult( const QString& scriptSource ) +{ + Q_ASSERT( QThread::currentThread() == thread() ); + + return evaluateJavaScriptInternal( scriptSource ); +} diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp index 5c46102ca..ee3baa003 100644 --- a/src/libtomahawk/resolvers/JSResolver.cpp +++ b/src/libtomahawk/resolvers/JSResolver.cpp @@ -478,35 +478,6 @@ JSResolver::lookupUrl( const QString& url ) } -QVariant -JSPlugin::evaluateJavaScriptInternal( const QString& scriptSource ) -{ - return m_engine->mainFrame()->evaluateJavaScript( scriptSource ); -} - - -void -JSPlugin::evaluateJavaScript( const QString& scriptSource ) -{ - if ( QThread::currentThread() != thread() ) - { - QMetaObject::invokeMethod( this, "evaluateJavaScript", Qt::QueuedConnection, Q_ARG( QString, scriptSource ) ); - return; - } - - evaluateJavaScriptInternal( scriptSource ); -} - - -QVariant -JSPlugin::evaluateJavaScriptWithResult( const QString& scriptSource ) -{ - Q_ASSERT( QThread::currentThread() == thread() ); - - return evaluateJavaScriptInternal( scriptSource ); -} - - Tomahawk::ExternalResolver::ErrorState JSResolver::error() const {