mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Move more JSPlugin implementations to their own file

Browse Source
This commit is contained in:
Dominik Schmidt
2014-12-05 07:02:01 +01:00
parent b2c3ab8532
commit dbd047b42a
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libtomahawk/resolvers/JSPlugin.cpp
View File

@@ -26,7 +26,7 @@
#include <QWebFrame> #include <QWebFrame>
#include <QFile> #include <QFile>
#include <QThread>
using namespace Tomahawk; using namespace Tomahawk;
@@ -132,3 +132,32 @@ JSPlugin::name() const
{ {
return m_name; 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 );
}

29
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -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 Tomahawk::ExternalResolver::ErrorState
JSResolver::error() const JSResolver::error() const
{ {