mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 07:49:42 +01:00
Code Issues Releases Wiki Activity

Do not rely on the object to be removed to be deleted after the callback

Browse Source
This commit is contained in:
Uwe L. Korn 2013-06-14 10:35:22 +02:00
parent e79935c1ca
commit a334c87e17
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libtomahawk/sip/WeakPeerHash.cpp
View File

@ -19,11 +19,12 @@
#include "WeakPeerHash_p.h"
#include "PeerInfo.h"
#include "utils/Closure.h"
#define WEAKPEERHASH_KEY "WeakPeerHashKey"
WeakPeerHash::WeakPeerHash(QObject *parent)
: QObject(parent)
WeakPeerHash::WeakPeerHash( QObject *parent )
: QObject( parent )
, d_ptr( new WeakPeerHashPrivate( this ) )
{
}
@ -36,10 +37,10 @@ WeakPeerHash::WeakPeerHash( const WeakPeerHash &hash )
}
void
WeakPeerHash::insert(const QString &key, const Tomahawk::peerinfo_ptr &value)
WeakPeerHash::insert( const QString &key, const Tomahawk::peerinfo_ptr &value )
{
value->setProperty( WEAKPEERHASH_KEY, key );
connect( value.data(), SIGNAL( destroyed( QObject* ) ), SLOT( remove( QObject* ) ) );
_detail::Closure* cl = NewClosure( value, SIGNAL( destroyed( QObject* ) ), this, SLOT( remove( QString ) ), key );
cl->setAutoDelete( true );
d_func()->hash.insert( key, value.toWeakRef() );
}
@ -50,22 +51,7 @@ WeakPeerHash::hash()
}
void
WeakPeerHash::remove( QObject *value )
WeakPeerHash::remove( const QString& key )
{
if ( value )
{
const QString key = value->property( WEAKPEERHASH_KEY ).toString();
d_func()->hash.remove( key );
}
else
{
// Scan for null-Pointers
foreach ( QString key, d_func()->hash.keys() )
{
if ( d_func()->hash.value( key ).isNull() )
{
d_func()->hash.remove( key );
}
}
}
d_func()->hash.remove( key );
}

2
src/libtomahawk/sip/WeakPeerHash.h
View File

@ -37,7 +37,7 @@ public:
signals:
private slots:
void remove( QObject* value );
void remove( const QString& key );
private:
Q_DECLARE_PRIVATE( WeakPeerHash )
WeakPeerHashPrivate* d_ptr;