[vlc-commits] Qt: rename playlist root* functions and getters for clarity

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 20 19:27:07 2011 +0200| [639eca0ef43b79aba3deeaf2c414c3556c33c7aa] | committer: Jean-Baptiste Kempf

Qt: rename playlist root* functions and getters for clarity

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

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

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 019bad4..382a7ef 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -159,8 +159,8 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
 
     /* Connect the activation of the selector to a redefining of the PL */
     DCONNECT( selector, categoryActivated( playlist_item_t *, bool ),
-              mainView, setRoot( playlist_item_t *, bool ) );
-    mainView->setRoot( p_root, false );
+              mainView, setRootItem( playlist_item_t *, bool ) );
+    mainView->setRootItem( p_root, false );
 
     /* */
     split = new PlaylistSplitter( this );
diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 183038c..a55dd9b 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -676,7 +676,7 @@ void PLModel::rebuild( playlist_item_t *p_root )
     /* And signal the view */
     reset();
 
-    if( p_root ) emit rootChanged();
+    if( p_root ) emit rootIndexChanged();
 }
 
 void PLModel::takeItem( PLItem *item )
diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index e4dab02..4caab5d 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -116,7 +116,7 @@ public:
 
 signals:
     void currentIndexChanged( const QModelIndex& );
-    void rootChanged();
+    void rootIndexChanged();
 
 public slots:
     virtual void activateItem( const QModelIndex &index );
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 95fa90e..9ae14e9 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -84,9 +84,9 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
 
     CONNECT( model, currentIndexChanged( const QModelIndex& ),
              this, handleExpansion( const QModelIndex& ) );
-    CONNECT( model, rootChanged(), this, browseInto() );
+    CONNECT( model, rootIndexChanged(), this, browseInto() );
 
-    setRoot( p_root, false );
+    setRootItem( p_root, false );
 }
 
 StandardPLPanel::~StandardPLPanel()
@@ -179,7 +179,7 @@ void StandardPLPanel::searchDelayed( const QString& searchText )
 
 /* Set the root of the new Playlist */
 /* This activated by the selector selection */
-void StandardPLPanel::setRoot( playlist_item_t *p_item, bool b )
+void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
 {
 #ifdef MEDIA_LIBRARY
     if( b )
diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index 6b936a0..15128de 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -102,7 +102,7 @@ private:
     bool eventFilter ( QObject * watched, QEvent * event );
 
 public slots:
-    void setRoot( playlist_item_t *, bool );
+    void setRootItem( playlist_item_t *, bool );
     void browseInto( const QModelIndex& );
 
 private slots: