[vlc-commits] Qt: rename a signal to be more self-documenting

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 20 19:17:23 2011 +0200| [139cf222f01e9d0f88d02d706618428b71147ba8] | committer: Jean-Baptiste Kempf

Qt: rename a signal to be more self-documenting

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

 .../gui/qt4/components/playlist/playlist_model.cpp |    8 ++++----
 .../gui/qt4/components/playlist/playlist_model.hpp |    2 +-
 .../gui/qt4/components/playlist/standardpanel.cpp  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index c40ea4d..183038c 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -599,7 +599,7 @@ void PLModel::processInputItemUpdate( input_thread_t *p_input )
     if( p_input && !( p_input->b_dead || !vlc_object_alive( p_input ) ) )
     {
         PLItem *item = findByInput( rootItem, input_GetItem( p_input )->i_id );
-        if( item ) emit currentChanged( index( item, 0 ) );
+        if( item ) emit currentIndexChanged( index( item, 0 ) );
     }
     processInputItemUpdate( input_GetItem( p_input ) );
 }
@@ -652,7 +652,7 @@ void PLModel::processItemAppend( int i_item, int i_parent )
     endInsertRows();
 
     if( newItem->inputItem() == THEMIM->currentInputItem() )
-        emit currentChanged( index( newItem, 0 ) );
+        emit currentIndexChanged( index( newItem, 0 ) );
 }
 
 void PLModel::rebuild( playlist_item_t *p_root )
@@ -846,11 +846,11 @@ void PLModel::sort( const int i_root_id, const int column, Qt::SortOrder order )
     if( i_popup_item > -1 )
     {
         PLItem *popupitem = findById( rootItem, i_popup_item );
-        if( popupitem ) emit currentChanged( index( popupitem, 0 ) );
+        if( popupitem ) emit currentIndexChanged( index( popupitem, 0 ) );
         /* reset i_popup_item as we don't show it as selected anymore anyway */
         i_popup_item = -1;
     }
-    else if( currentIndex().isValid() ) emit currentChanged( currentIndex() );
+    else if( currentIndex().isValid() ) emit currentIndexChanged( currentIndex() );
 }
 
 void PLModel::search( const QString& search_text, const QModelIndex & idx, bool b_recursive )
diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index a1cf540..e4dab02 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -115,7 +115,7 @@ public:
     }
 
 signals:
-    void currentChanged( const QModelIndex& );
+    void currentIndexChanged( const QModelIndex& );
     void rootChanged();
 
 public slots:
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 023ecf0..95fa90e 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -82,7 +82,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
     DCONNECT( THEMIM, leafBecameParent( int ),
               this, browseInto( int ) );
 
-    CONNECT( model, currentChanged( const QModelIndex& ),
+    CONNECT( model, currentIndexChanged( const QModelIndex& ),
              this, handleExpansion( const QModelIndex& ) );
     CONNECT( model, rootChanged(), this, browseInto() );