[vlc-devel] commit: Qt4: remove b_current on PLItem, and store currentIndex when it changes (Ilkka Ollakka )

[git version control]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Fri Aug 14 19:00:52 2009 +0300| [753731a2c9d0fd724cc7c2fd6ad573483876bc7a] | committer: Ilkka Ollakka 

Qt4: remove b_current on PLItem, and store currentIndex when it changes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=753731a2c9d0fd724cc7c2fd6ad573483876bc7a
---

 .../gui/qt4/components/playlist/playlist_item.cpp  |    4 +---
 .../gui/qt4/components/playlist/playlist_item.hpp  |    3 +--
 .../gui/qt4/components/playlist/playlist_model.cpp |   14 +++++++++-----
 .../gui/qt4/components/playlist/playlist_model.hpp |    3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index 694fcaf..f160328 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -54,7 +54,6 @@ void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent, PLModel *m,
     i_id       = _playlist_item->i_id;           /* Playlist item specific id */
     model      = m;               /* PLModel (QAbsmodel) */
     i_type     = -1;              /* Item type - Avoid segfault */
-    b_current  = false;           /* Is the item the current Item or not */
     b_is_node  = _playlist_item->i_children > -1;
     p_input    = _playlist_item->p_input;
     vlc_gc_incref( p_input );
@@ -139,13 +138,12 @@ int PLItem::row() const
 }
 
 /* update the PL Item, get the good names and so on */
-void PLItem::update( playlist_item_t *p_item, bool iscurrent )
+void PLItem::update( playlist_item_t *p_item )
 {
     assert( p_item->p_input == p_input);
 
     /* Useful for the model */
     i_type = p_item->p_input->i_type;
-    b_current = iscurrent;
     b_is_node = p_item->i_children > -1;
 
     i_showflags = parentItem ? parentItem->i_showflags : i_showflags;
diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index 48fd164..c8cb2c6 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -59,11 +59,10 @@ public:
 
     PLItem *parent() { return parentItem; };
 
-    void update( playlist_item_t *, bool );
+    void update( playlist_item_t * );
 
 protected:
     QList<PLItem*> children;
-    bool b_current;
     int i_type;
     int i_id;
     int i_showflags;
diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index b2afe6b..33e6dd2 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -77,6 +77,7 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
     i_cached_id       = -1;
     i_cached_input_id = -1;
     i_popup_item      = i_popup_parent = -1;
+    currentIndex      = QModelIndex();
 
     rootItem          = NULL; /* PLItem rootItem, will be set in rebuild( ) */
 
@@ -370,7 +371,7 @@ QVariant PLModel::data( const QModelIndex &index, int role ) const
     }
     else if( role == Qt::FontRole )
     {
-        if( item->b_current == true )
+        if( isCurrent( index ) )
         {
             QFont f; f.setBold( true ); return QVariant( f );
         }
@@ -378,10 +379,12 @@ QVariant PLModel::data( const QModelIndex &index, int role ) const
     return QVariant();
 }
 
-bool PLModel::isCurrent( const QModelIndex &index )
+bool PLModel::isCurrent( const QModelIndex &index ) const
 {
     assert( index.isValid() );
-    return static_cast<PLItem*>(index.internalPointer())->b_current;
+    if(!currentIndex.isValid()) return false;
+    return static_cast<PLItem*>(index.internalPointer())->p_input ==
+        static_cast<PLItem*>(currentIndex.internalPointer())->p_input;
 }
 
 int PLModel::itemId( const QModelIndex &index ) const
@@ -647,6 +650,7 @@ void PLModel::ProcessInputItemUpdate( input_thread_t *p_input )
     {
         PLItem *item = FindByInput( rootItem, input_GetItem( p_input )->i_id );
         emit currentChanged( index( item, 0 ) );
+        currentIndex = index( item, 0 );
     }
 }
 void PLModel::ProcessInputItemUpdate( input_item_t *p_item )
@@ -782,9 +786,9 @@ void PLModel::UpdateTreeItem( playlist_item_t *p_item, PLItem *item,
     if( !force && i_depth == DEPTH_SEL && p_item->p_parent &&
                                  p_item->p_parent->i_id != rootItem->i_id )
         return;
-    item->update( p_item, p_item == playlist_CurrentPlayingItem( p_playlist ) );
+    item->update( p_item );
     if( signal )
-        emit dataChanged( index( item, 0 ) , index( item, 1 ) );
+        emit dataChanged( index( item, 0 ) , index( item, columnCount( QModelIndex() ) ) );
 }
 
 /************************* Actions ******************************/
diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 124e198..e09ac76 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -98,7 +98,7 @@ public:
     QModelIndex index( int r, int c, const QModelIndex &parent ) const;
     QModelIndex index( PLItem *, int c ) const;
     int itemId( const QModelIndex &index ) const;
-    bool isCurrent( const QModelIndex &index );
+    bool isCurrent( const QModelIndex &index ) const;
     QModelIndex parent( const QModelIndex &index ) const;
     int childrenCount( const QModelIndex &parent = QModelIndex() ) const;
     int rowCount( const QModelIndex &parent = QModelIndex() ) const;
@@ -155,6 +155,7 @@ private:
     /* Popup */
     int i_popup_item, i_popup_parent;
     QModelIndexList current_selection;
+    QModelIndex currentIndex;
     QSignalMapper *ContextUpdateMapper;
 
     /* Lookups */