From c9e773071684f90bd01a02b48eed978c539537c2 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Mon, 4 Feb 2013 16:51:30 +0100
Subject: [PATCH] Make sure we eliminate all references to finished
 ScriptCommands.

---
 .../resolvers/ScriptCommandQueue.cpp          | 31 ++++++++++++-------
 .../resolvers/ScriptCommandQueue.h            |  4 +--
 .../resolvers/ScriptCommand_AllTracks.cpp     |  4 ---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/libtomahawk/resolvers/ScriptCommandQueue.cpp b/src/libtomahawk/resolvers/ScriptCommandQueue.cpp
index ce4662145..06b9e19f8 100644
--- a/src/libtomahawk/resolvers/ScriptCommandQueue.cpp
+++ b/src/libtomahawk/resolvers/ScriptCommandQueue.cpp
@@ -18,8 +18,6 @@
 
 #include "ScriptCommandQueue.h"
 
-#include "utils/Closure.h"
-
 #include <QMetaType>
 
 ScriptCommandQueue::ScriptCommandQueue( QObject* parent )
@@ -47,11 +45,11 @@ ScriptCommandQueue::nextCommand()
 
     QSharedPointer< ScriptCommand > req = m_queue.first();
 
-    NewClosure( req.data(), SIGNAL( done() ),
-                this, SLOT( onCommandDone( QSharedPointer< ScriptCommand > ) ), req );
+    connect( req.data(), SIGNAL( done() ),
+             this, SLOT( onCommandDone() ) );
 
-    NewClosure( m_timer, SIGNAL( timeout() ),
-                this, SLOT( onTimeout( QSharedPointer< ScriptCommand > ) ), req );
+    connect( m_timer, SIGNAL( timeout() ),
+             this, SLOT( onTimeout() ) );
 
     m_timer->start( 5000 );
 
@@ -60,28 +58,39 @@ ScriptCommandQueue::nextCommand()
 
 
 void
-ScriptCommandQueue::onCommandDone( const QSharedPointer< ScriptCommand >& req )
+ScriptCommandQueue::onCommandDone()
 {
-    disconnect( this, SLOT( onTimeout( QSharedPointer< ScriptCommand > ) ) );
     m_timer->stop();
 
+    const QSharedPointer< ScriptCommand > req = m_queue.first();
+
     m_queue.removeAll( req );
 
+    disconnect( req.data(), SIGNAL( done() ),
+                this, SLOT( onCommandDone() ) );
+    disconnect( m_timer, SIGNAL( timeout() ),
+                this, SLOT( onTimeout() ) );
+
     if ( m_queue.count() > 0 )
         nextCommand();
 }
 
 
 void
-ScriptCommandQueue::onTimeout( const QSharedPointer< ScriptCommand >& req )
+ScriptCommandQueue::onTimeout()
 {
-    disconnect( this, SLOT( onCommandDone( QSharedPointer< ScriptCommand > ) ) );
-
     m_timer->stop();
 
+    const QSharedPointer< ScriptCommand > req = m_queue.first();
+
     req->reportFailure();
     m_queue.removeAll( req );
 
+    disconnect( req.data(), SIGNAL( done() ),
+                this, SLOT( onCommandDone() ) );
+    disconnect( m_timer, SIGNAL( timeout() ),
+                this, SLOT( onTimeout() ) );
+
     if ( m_queue.count() > 0 )
         nextCommand();
 }
diff --git a/src/libtomahawk/resolvers/ScriptCommandQueue.h b/src/libtomahawk/resolvers/ScriptCommandQueue.h
index c26aabc95..a233ccf44 100644
--- a/src/libtomahawk/resolvers/ScriptCommandQueue.h
+++ b/src/libtomahawk/resolvers/ScriptCommandQueue.h
@@ -37,8 +37,8 @@ public:
 
 private slots:
     void nextCommand();
-    void onCommandDone( const QSharedPointer< ScriptCommand >& req );
-    void onTimeout( const QSharedPointer< ScriptCommand >& req );
+    void onCommandDone();
+    void onTimeout();
 
 private:
     QQueue< QSharedPointer< ScriptCommand > > m_queue;
diff --git a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
index 480fa1065..c218fdc6b 100644
--- a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
+++ b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
@@ -73,8 +73,6 @@ ScriptCommand_AllTracks::reportFailure()
 {
     emit tracks( QList< Tomahawk::query_ptr >() );
     emit done();
-    disconnect();
-    sender()->disconnect( this );
 }
 
 
@@ -83,7 +81,5 @@ ScriptCommand_AllTracks::onResolverDone( const QList< Tomahawk::query_ptr >& q )
 {
     emit tracks( q );
     emit done();
-    disconnect();
-    sender()->disconnect( this );
     //FIXME: find a way to delete this object when its job is done
 }