From 745a6f9329adc6ad7f866fc223f028f5ce3f0a1f Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 21 Jan 2015 23:03:00 +0100 Subject: [PATCH] Don't parent ScriptJobs --- src/libtomahawk/resolvers/ScriptAccount.cpp | 2 -- src/libtomahawk/resolvers/ScriptJob.cpp | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libtomahawk/resolvers/ScriptAccount.cpp b/src/libtomahawk/resolvers/ScriptAccount.cpp index 658c82a91..0bad7b8f2 100644 --- a/src/libtomahawk/resolvers/ScriptAccount.cpp +++ b/src/libtomahawk/resolvers/ScriptAccount.cpp @@ -131,8 +131,6 @@ ScriptAccount::invoke( const scriptobject_ptr& scriptObject, const QString& meth QString requestId = requestIdGenerator(); ScriptJob* job = new ScriptJob( requestId, scriptObject, methodName, arguments ); - // TODO: setParent through QueuedConnection - connect( job, SIGNAL( destroyed( QString ) ), SLOT( onJobDeleted( QString ) ) ); m_jobs.insert( requestId, job ); diff --git a/src/libtomahawk/resolvers/ScriptJob.cpp b/src/libtomahawk/resolvers/ScriptJob.cpp index 199c5b9de..3e52ca0da 100644 --- a/src/libtomahawk/resolvers/ScriptJob.cpp +++ b/src/libtomahawk/resolvers/ScriptJob.cpp @@ -25,8 +25,7 @@ using namespace Tomahawk; ScriptJob::ScriptJob( const QString& id, const scriptobject_ptr& scriptObject, const QString& methodName, const QVariantMap& arguments ) - : QObject( scriptObject->thread() == QThread::currentThread() ? scriptObject.data() : nullptr ) - , m_error( false ) + : m_error( false ) , m_id( id ) , m_scriptObject( scriptObject ) , m_methodName( methodName )