From 3a82481e6ba4bd218decbd7480c16ae32f5208fd Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 14 Oct 2014 06:58:31 +0200 Subject: [PATCH] Fixed dupe signal connection in TemporaryPageItem. --- src/tomahawk/sourcetree/items/SourceTreeItem.cpp | 1 - src/tomahawk/sourcetree/items/TemporaryPageItem.cpp | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/tomahawk/sourcetree/items/SourceTreeItem.cpp b/src/tomahawk/sourcetree/items/SourceTreeItem.cpp index 6eb95d8db..18db77459 100644 --- a/src/tomahawk/sourcetree/items/SourceTreeItem.cpp +++ b/src/tomahawk/sourcetree/items/SourceTreeItem.cpp @@ -274,7 +274,6 @@ SourceTreeItem::removeFromList() void SourceTreeItem::pageDestroyed() { - //FIXME: this seems to be triggered twice for temporary pages model()->removeSourceItemLink( this ); int idx = parent()->children().indexOf( this ); diff --git a/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp b/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp index 08e8d79fa..7f8b48cd9 100644 --- a/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp +++ b/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp @@ -81,12 +81,6 @@ TemporaryPageItem::TemporaryPageItem( SourcesModel* mdl, SourceTreeItem* parent, NewClosure( action, SIGNAL( triggered() ), this, SLOT( linkActionTriggered( QAction* ) ), action ); } - if ( QObject* obj = dynamic_cast< QObject* >( page ) ) - { - if ( obj->metaObject()->indexOfSignal( "destroyed(QObject*)" ) > -1 ) - connect( obj, SIGNAL( destroyed( QObject* ) ), SLOT( pageDestroyed() ) ); - } - model()->linkSourceItemToPage( this, page ); }