Qt: rename a signal to be more self-documenting

[vlc] / modules / gui / qt4 / components / playlist / standardpanel.cpp

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 8f9e6dbb44de025d4c82aaeb681e103cc76acb28..95fa90e58714fd811324c9f3cf68ac794e822780 100644 (file)
--- 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() );
 
@@ -94,14 +94,7 @@ StandardPLPanel::~StandardPLPanel()
     getSettings()->beginGroup("Playlist");
     if( treeView )
         getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
-    if( currentView == treeView )
-        getSettings()->setValue( "view-mode", TREE_VIEW );
-    else if( currentView == listView )
-        getSettings()->setValue( "view-mode", LIST_VIEW );
-    else if( currentView == iconView )
-        getSettings()->setValue( "view-mode", ICON_VIEW );
-    else if( currentView == picFlowView )
-        getSettings()->setValue( "view-mode", PICTUREFLOW_VIEW );
+    getSettings()->setValue( "view-mode", currentViewIndex() );
     getSettings()->endGroup();
 }
 
@@ -195,6 +188,8 @@ void StandardPLPanel::setRoot( playlist_item_t *p_item, bool b )
         currentView->setModel( mlmodel );
     }
     else
+#else
+    Q_UNUSED( b );
 #endif
     {
         msg_Dbg( p_intf, "Normal PL/ML or SD" );
@@ -357,6 +352,10 @@ void StandardPLPanel::changeModel( bool b_ml )
         mod = model;
     if( currentView->model() != mod )
         currentView->setModel( mod );
+#else
+    Q_UNUSED( b_ml );
+    if( currentView->model() != model )
+        currentView->setModel( model );
 #endif
 }
 
@@ -422,8 +421,10 @@ void StandardPLPanel::cycleViews()
     else if( currentView == treeView )
         showView( LIST_VIEW );
     else if( currentView == listView )
+#ifndef NDEBUG
         showView( PICTUREFLOW_VIEW  );
     else if( currentView == picFlowView )
+#endif
         showView( ICON_VIEW );
     else
         assert( 0 );