[vlmc-devel] commit: TracksView: Fixing signal connection. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Oct  7 15:02:41 2010 +0200| [726682b1a21da7d37d17ee508fe665c3201a7ab4] | committer: Hugo Beauzée-Luyssen 

TracksView: Fixing signal connection.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=726682b1a21da7d37d17ee508fe665c3201a7ab4
---

 src/Gui/timeline/TracksView.cpp |    6 +++---
 src/Workflow/Helper.cpp         |    4 ++++
 src/Workflow/Helper.h           |    1 +
 src/Workflow/TrackWorkflow.cpp  |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Gui/timeline/TracksView.cpp b/src/Gui/timeline/TracksView.cpp
index f6dca13..560a462 100644
--- a/src/Gui/timeline/TracksView.cpp
+++ b/src/Gui/timeline/TracksView.cpp
@@ -132,11 +132,11 @@ TracksView::addTrack( Workflow::TrackType type )
     m_scene->invalidate(); // Redraw the background
     //Clips part:
     connect( track->trackWorkflow(), SIGNAL( clipAdded( TrackWorkflow*, Workflow::Helper*, qint64 ) ),
-             this, SLOT( addItem( TrackWorkflow*, Workflow::Helper*, qint64 ) ), Qt::QueuedConnection );
+             this, SLOT( addItem( TrackWorkflow*, Workflow::Helper*, qint64 ) ) );
     connect( track->trackWorkflow(), SIGNAL( clipRemoved( TrackWorkflow*, const QUuid& ) ),
-             this, SLOT( removeItem( TrackWorkflow*, const QUuid& ) ), Qt::QueuedConnection );
+             this, SLOT( removeItem( TrackWorkflow*, const QUuid& ) ) );
     connect( track->trackWorkflow(), SIGNAL( clipMoved( TrackWorkflow*, const QUuid&, qint64 ) ),
-             this, SLOT( moveItem( TrackWorkflow*, const QUuid&, qint64 ) ), Qt::QueuedConnection );
+             this, SLOT( moveItem( TrackWorkflow*, const QUuid&, qint64 ) ) );
     //Effect part:
     connect( track->trackWorkflow(), SIGNAL( effectAdded( TrackWorkflow*, Workflow::Helper*, qint64 ) ),
              this, SLOT(addItem( TrackWorkflow*, Workflow::Helper*, qint64 ) ), Qt::QueuedConnection );
diff --git a/src/Workflow/Helper.cpp b/src/Workflow/Helper.cpp
index acff838..9ce16ae 100644
--- a/src/Workflow/Helper.cpp
+++ b/src/Workflow/Helper.cpp
@@ -34,6 +34,10 @@ Helper::Helper( qint64 begin /*= 0*/, qint64 end /*= -1*/, const QString &uuid/*
         m_uuid = uuid;
 }
 
+Helper::~Helper()
+{
+}
+
 qint64
 Helper::begin() const
 {
diff --git a/src/Workflow/Helper.h b/src/Workflow/Helper.h
index f825c4b..a50ce0c 100644
--- a/src/Workflow/Helper.h
+++ b/src/Workflow/Helper.h
@@ -35,6 +35,7 @@ namespace   Workflow
 
         protected: //This class is not meant to be used by itself.
             Helper( qint64 begin = 0, qint64 end = -1, const QString &uuid = QString() );
+            ~Helper();
 
         public:
             virtual const QUuid&    uuid() const;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index b3c7730..2a578bc 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -417,7 +417,7 @@ TrackWorkflow::clipDestroyed( const QUuid& id )
             computeLength();
             cw->disconnect();
             cw->getClipHelper()->disconnect( this );
-            emit clipRemoved( this, cw->getClipHelper()->uuid() );
+            emit clipRemoved( this, id );
             cw->deleteLater();
             return ;
         }