Qt: Ok is not ok as a button label.

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

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index 71308534961c685d0c2c81fe7f6741ebd1bff7de..c652396f9f8b559a3a40367846fed049db8b4fb6 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -26,17 +26,12 @@
 
 #include "dialogs/playlist.hpp"
 
-#include "main_interface.hpp"
 #include "components/playlist/playlist.hpp"
-#include "dialogs_provider.hpp"
-#include "menus.hpp"
+
+#include "util/qt_dirs.hpp"
 
 #include <QUrl>
 #include <QHBoxLayout>
-#include <QSignalMapper>
-#include <QMenu>
-#include <QAction>
-#include <QMenuBar>
 
 PlaylistDialog *PlaylistDialog::instance = NULL;
 
@@ -50,36 +45,31 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
 
     QHBoxLayout *l = new QHBoxLayout( centralWidget() );
 
-    settings = new QSettings( "vlc", "vlc-qt-interface" );
-    settings->beginGroup("playlistdialog");
+    getSettings()->beginGroup("playlistdialog");
 
-    playlistWidget = new PlaylistWidget( p_intf, settings, this );
+    playlistWidget = new PlaylistWidget( p_intf );
     l->addWidget( playlistWidget );
 
-    readSettings( settings, QSize( 600,700 ) );
+    readSettings( getSettings(), QSize( 600,700 ) );
 
-    settings->endGroup();
+    getSettings()->endGroup();
 }
 
 PlaylistDialog::~PlaylistDialog()
 {
-    settings->beginGroup("playlistdialog");
-
-    writeSettings(settings);
-    playlistWidget->savingSettings(settings);
-
-    settings->endGroup();
-    delete settings;
+    getSettings()->beginGroup("playlistdialog");
+    writeSettings( getSettings() );
+    getSettings()->endGroup();
 }
 
 void PlaylistDialog::dropEvent( QDropEvent *event )
 {
      const QMimeData *mimeData = event->mimeData();
      foreach( QUrl url, mimeData->urls() ) {
-        QString s = url.toString();
+        QString s = toNativeSeparators( url.toString() );
         if( s.length() > 0 ) {
             playlist_Add( THEPL, qtu(s), NULL,
-                          PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+                          PLAYLIST_APPEND, PLAYLIST_END, true, false );
         }
      }
      event->acceptProposedAction();