vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Jul 18 23:07:11 2012 +0200| [5d58894f43e4481b1dc222e86095d4d3ad4cb753] | committer: Francois Cartegnie
Qt: PL/MLModel: remove nolonger used SelectedUri() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d58894f43e4481b1dc222e86095d4d3ad4cb753 --- modules/gui/qt4/components/playlist/ml_model.cpp | 12 ---------- modules/gui/qt4/components/playlist/ml_model.hpp | 1 - .../gui/qt4/components/playlist/playlist_model.cpp | 25 -------------------- .../gui/qt4/components/playlist/playlist_model.hpp | 1 - 4 files changed, 39 deletions(-) diff --git a/modules/gui/qt4/components/playlist/ml_model.cpp b/modules/gui/qt4/components/playlist/ml_model.cpp index 11e34f6..69ae782 100644 --- a/modules/gui/qt4/components/playlist/ml_model.cpp +++ b/modules/gui/qt4/components/playlist/ml_model.cpp @@ -566,18 +566,6 @@ bool MLModel::isCurrentItem( const QModelIndex &index, playLocation where ) cons return false; } -QStringList MLModel::selectedURIs( QModelIndexList *current_selection ) -{ - QStringList list; - for( int i = 0; i < current_selection->count(); i++ ) - { - QModelIndex idx = current_selection->value(i); - MLItem *item = static_cast< MLItem* >( idx.internalPointer() ); - list.append( QString( item->getUri().toString() ) ); - } - return list; -} - QModelIndex MLModel::getIndexByMLID( int id ) const { for( int i = 0; i < rowCount( ); i++ ) diff --git a/modules/gui/qt4/components/playlist/ml_model.hpp b/modules/gui/qt4/components/playlist/ml_model.hpp index 40b0975..2bf86f1 100644 --- a/modules/gui/qt4/components/playlist/ml_model.hpp +++ b/modules/gui/qt4/components/playlist/ml_model.hpp @@ -95,7 +95,6 @@ public: void clear(); void play( const QModelIndex &idx ); - QStringList selectedURIs( QModelIndexList * ); virtual QString getURI( const QModelIndex &index ) const; virtual QModelIndex rootIndex() const; virtual bool isTree() const; diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp index cd98b8d..96fcc04 100644 --- a/modules/gui/qt4/components/playlist/playlist_model.cpp +++ b/modules/gui/qt4/components/playlist/playlist_model.cpp @@ -593,31 +593,6 @@ int PLModel::rowCount( const QModelIndex &parent ) const return parentItem->childCount(); } -QStringList PLModel::selectedURIs( QModelIndexList *current_selection ) -{ - QStringList lst; - for( int i = 0; i < current_selection->count(); i++ ) - { - const PLItem *item = getItem( current_selection->at(i) ); - if( item ) - { - PL_LOCK; - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id ); - if( p_item ) - { - char *psz = input_item_GetURI( p_item->p_input ); - if( psz ) - { - lst.append( qfu(psz) ); - free( psz ); - } - } - PL_UNLOCK; - } - } - return lst; -} - /************************* Lookups *****************************/ PLItem *PLModel::findById( PLItem *root, int i_id ) const { diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp index c9e8c99..948c353 100644 --- a/modules/gui/qt4/components/playlist/playlist_model.hpp +++ b/modules/gui/qt4/components/playlist/playlist_model.hpp @@ -150,7 +150,6 @@ private: return static_cast<PLItem*>( index.internalPointer() ); else return rootItem; } - QStringList selectedURIs( QModelIndexList * ); QModelIndex index( PLItem *, const int c ) const; bool isCurrent( const QModelIndex &index ) const; bool isParent( const QModelIndex &index, const QModelIndex ¤t) const; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
