From 82113c516f2ee38c08d3056e07b177c5f0b81a06 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 15 Nov 2012 15:49:26 +0100 Subject: [PATCH] * Removed obsolete CTOR param model in PlayableItem. --- src/libtomahawk/playlist/PlayableItem.cpp | 4 +--- src/libtomahawk/playlist/PlayableItem.h | 3 +-- src/libtomahawk/playlist/PlayableModel.cpp | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/playlist/PlayableItem.cpp b/src/libtomahawk/playlist/PlayableItem.cpp index 05882210a..f531cf83f 100644 --- a/src/libtomahawk/playlist/PlayableItem.cpp +++ b/src/libtomahawk/playlist/PlayableItem.cpp @@ -43,7 +43,7 @@ PlayableItem::~PlayableItem() } -PlayableItem::PlayableItem( PlayableItem* parent, QAbstractItemModel* model ) +PlayableItem::PlayableItem( PlayableItem* parent ) { init( parent ); } @@ -130,8 +130,6 @@ PlayableItem::init( PlayableItem* parent, int row ) { parent->children.insert( row, this ); } - - this->model = parent->model; } if ( !m_query.isNull() ) diff --git a/src/libtomahawk/playlist/PlayableItem.h b/src/libtomahawk/playlist/PlayableItem.h index 2c37f8cc5..a3903d402 100644 --- a/src/libtomahawk/playlist/PlayableItem.h +++ b/src/libtomahawk/playlist/PlayableItem.h @@ -34,7 +34,7 @@ Q_OBJECT public: ~PlayableItem(); - explicit PlayableItem( PlayableItem* parent = 0, QAbstractItemModel* model = 0 ); + explicit PlayableItem( PlayableItem* parent = 0 ); explicit PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* parent = 0, int row = -1 ); explicit PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* parent = 0, int row = -1 ); explicit PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* parent = 0, int row = -1 ); @@ -61,7 +61,6 @@ public: QList children; QPersistentModelIndex index; - QAbstractItemModel* model; signals: void dataChanged(); diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp index b752dfd75..bdb95f0eb 100644 --- a/src/libtomahawk/playlist/PlayableModel.cpp +++ b/src/libtomahawk/playlist/PlayableModel.cpp @@ -39,7 +39,7 @@ using namespace Tomahawk; PlayableModel::PlayableModel( QObject* parent, bool loading ) : QAbstractItemModel( parent ) - , m_rootItem( new PlayableItem( 0, this ) ) + , m_rootItem( new PlayableItem( 0 ) ) , m_readOnly( true ) , m_loading( loading ) { @@ -499,7 +499,7 @@ PlayableModel::clear() emit beginResetModel(); delete m_rootItem; m_rootItem = 0; - m_rootItem = new PlayableItem( 0, this ); + m_rootItem = new PlayableItem( 0 ); emit endResetModel(); } }