Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf-public

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

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 325554ce8d473ccc6cd2a546c0351f4b83b35f59..621c251b2fd9dbe55e9999e48aae33bbe5ee63f5 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -43,7 +43,6 @@
  **********************************************************************/
 
 PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
-                                QSettings *settings,
                                 QWidget *_parent )
                : p_intf ( _p_i ), parent( _parent )
 {
@@ -72,15 +71,18 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
     art->setMaximumWidth( 128 );
     art->setScaledContents( true );
     art->setPixmap( QPixmap( ":/noart.png" ) );
-    art->setToolTip( qtr( "Double click to get the media informations" ) );
+    art->setToolTip( qtr( "Double click to get media information" ) );
 
     artContLay->addWidget( art, 1 );
 
     leftW->addWidget( artContainer );
 
     /* Initialisation of the playlist */
+    playlist_t * p_playlist = THEPL;
+    PL_LOCK;
     playlist_item_t *p_root =
                   playlist_GetPreferredNode( THEPL, THEPL->p_local_category );
+    PL_UNLOCK;
 
     rightPanel = new StandardPLPanel( this, p_intf, THEPL, p_root );
 
@@ -119,8 +121,8 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
     /* In case we want to keep the splitter informations */
     // components shall never write there setting to a fixed location, may infer
     // with other uses of the same component...
-    // settings->beginGroup( "playlist" );
-    restoreState( settings->value("splitterSizes").toByteArray());
+    // getSettings()->beginGroup( "playlist" );
+    restoreState( getSettings()->value("splitterSizes").toByteArray());
 }
 
 void PlaylistWidget::setArt( QString url )
@@ -140,8 +142,8 @@ QSize PlaylistWidget::sizeHint() const
 PlaylistWidget::~PlaylistWidget()
 {}
 
-void PlaylistWidget::savingSettings( QSettings *settings )
+void PlaylistWidget::savingSettings()
 {
-    settings->setValue( "splitterSizes", saveState() );
+    getSettings()->setValue( "splitterSizes", saveState() );
 }