Qt: rename playlist root* functions and getters for clarity

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 019bad47eb8ea5911f9a60b1feb180213d26c8cd..382a7efc7d15d50d399ed0c86aaa0984198c644f 100644 (file)
--- 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 183038cf7e2b15d4de2829883025354b06bc750f..a55dd9beb6200b61b672c8e8c628fd004eddb9ac 100644 (file)
--- 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 e4dab02d653cd7fd1270a3531689b2a12ffeb8e7..4caab5d0601a0722a00e581ce351a6fd3e3c18fc 100644 (file)
--- 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 95fa90e58714fd811324c9f3cf68ac794e822780..9ae14e96afc8cb63ba8d05df4d783362edd75308 100644 (file)
--- 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 6b936a0c8bddeede81b9303f3c06b32abb5a8b67..15128dee3d64cb1006ee64a385054378cbf7d4ef 100644 (file)
--- 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: