From 84b30f0f5e55a8c9104f8b10510c9cd481100bc7 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 13 Nov 2014 20:10:20 +0100 Subject: [PATCH] Move Q_D underneath any thread guards --- src/libtomahawk/resolvers/JSInfoPlugin.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/resolvers/JSInfoPlugin.cpp b/src/libtomahawk/resolvers/JSInfoPlugin.cpp index 672b4637f..4109ae213 100644 --- a/src/libtomahawk/resolvers/JSInfoPlugin.cpp +++ b/src/libtomahawk/resolvers/JSInfoPlugin.cpp @@ -102,14 +102,14 @@ JSInfoPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tom void JSInfoPlugin::addInfoRequestResult( int requestId, qint64 maxAge, const QVariantMap& returnedData ) { - Q_D( JSInfoPlugin ); - if ( QThread::currentThread() != thread() ) { QMetaObject::invokeMethod( this, "addInfoRequestResult", Qt::QueuedConnection, Q_ARG( int, requestId ), Q_ARG( qint64, maxAge ), Q_ARG( QVariantMap, returnedData ) ); return; } + Q_D( JSInfoPlugin ); + // retrieve requestData from cache and delete it Tomahawk::InfoSystem::InfoRequestData requestData = d->requestDataCache[ requestId ]; d->requestDataCache.remove( requestId ); @@ -127,14 +127,15 @@ JSInfoPlugin::addInfoRequestResult( int requestId, qint64 maxAge, const QVariant void JSInfoPlugin::emitGetCachedInfo( int requestId, const QVariantMap& criteria, int newMaxAge ) { - Q_D( JSInfoPlugin ); - if ( QThread::currentThread() != thread() ) { QMetaObject::invokeMethod( this, "emitGetCachedInfo", Qt::QueuedConnection, Q_ARG( int, requestId ), Q_ARG( QVariantMap, criteria ), Q_ARG( int, newMaxAge ) ); return; } + Q_D( JSInfoPlugin ); + + emit getCachedInfo( convertQVariantMapToInfoStringHash( criteria ), newMaxAge, d->requestDataCache[ requestId ]); } @@ -142,14 +143,14 @@ JSInfoPlugin::emitGetCachedInfo( int requestId, const QVariantMap& criteria, int void JSInfoPlugin::emitInfo( int requestId, const QVariantMap& output ) { - Q_D( JSInfoPlugin ); - if ( QThread::currentThread() != thread() ) { QMetaObject::invokeMethod( this, "emitInfo", Qt::QueuedConnection, Q_ARG( int, requestId ), Q_ARG( QVariantMap, output ) ); return; } + Q_D( JSInfoPlugin ); + emit info( d->requestDataCache[ requestId ], output ); }