mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 11:30:49 +02:00
Code Issues Releases Wiki Activity

PlayableItem: Set parent in initialiser list

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-20 17:32:21 +02:00
parent 7423d56a9c
commit 718337ce26
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libtomahawk/playlist/PlayableItem.cpp
View File

@@ -47,16 +47,19 @@ PlayableItem::~PlayableItem()
PlayableItem::PlayableItem( PlayableItem* parent ) PlayableItem::PlayableItem( PlayableItem* parent )
: QObject( parent )
, m_parent( parent )
{ {
init( parent ); init();
} }
PlayableItem::PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_album( album ) , m_album( album )
, m_parent( parent )
{ {
init( parent, row ); init( row );
connect( album.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) ); connect( album.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
} }
@@ -65,8 +68,9 @@ PlayableItem::PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* pare
PlayableItem::PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_artist( artist ) , m_artist( artist )
, m_parent( parent )
{ {
init( parent, row ); init( row );
connect( artist.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) ); connect( artist.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
} }
@@ -75,8 +79,9 @@ PlayableItem::PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* pa
PlayableItem::PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_result( result ) , m_result( result )
, m_parent( parent )
{ {
init( parent, row ); init( row );
connect( result.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) ); connect( result.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
} }
@@ -85,8 +90,9 @@ PlayableItem::PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* pa
PlayableItem::PlayableItem( const Tomahawk::query_ptr& query, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::query_ptr& query, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_query( query ) , m_query( query )
, m_parent( parent )
{ {
init( parent, row ); init( row );
} }
@@ -94,25 +100,26 @@ PlayableItem::PlayableItem( const Tomahawk::plentry_ptr& entry, PlayableItem* pa
: QObject( parent ) : QObject( parent )
, m_entry( entry ) , m_entry( entry )
, m_query( entry->query() ) , m_query( entry->query() )
, m_parent( parent )
{ {
init( parent, row ); init( row );
} }
PlayableItem::PlayableItem( const Tomahawk::source_ptr& source, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::source_ptr& source, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_source( source ) , m_source( source )
, m_parent( parent )
{ {
init( parent, row ); init( row );
} }
void void
PlayableItem::init( PlayableItem* parent, int row ) PlayableItem::init( int row )
{ {
m_fetchingMore = false; m_fetchingMore = false;
m_isPlaying = false; m_isPlaying = false;
m_parent = parent;
track_ptr track; track_ptr track;
if ( m_query ) if ( m_query )
@@ -132,15 +139,15 @@ PlayableItem::init( PlayableItem* parent, int row )
connect( track.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) ); connect( track.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
} }
if ( parent ) if ( m_parent )
{ {
if ( row < 0 ) if ( row < 0 )
{ {
parent->children.append( this ); m_parent->children.append( this );
} }
else else
{ {
parent->children.insert( row, this ); m_parent->children.insert( row, this );
} }
} }

2
src/libtomahawk/playlist/PlayableItem.h
View File

@@ -77,7 +77,7 @@ private slots:
void onResultsChanged(); void onResultsChanged();
private: private:
void init( PlayableItem* parent, int row = -1 ); void init( int row = -1 );
Tomahawk::artist_ptr m_artist; Tomahawk::artist_ptr m_artist;
Tomahawk::album_ptr m_album; Tomahawk::album_ptr m_album;