]> git.sesse.net Git - vlc/commitdiff
Qt: toAscii has been deprecated
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 28 Aug 2013 11:35:27 +0000 (13:35 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 28 Aug 2013 11:35:27 +0000 (13:35 +0200)
Ref #8532

modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp

index 2e09c27583e2dec8d0b6dd8e364524dce4f8a92c..0c7e762a6f4abee6c8f6a172be8a98724a3689b7 100644 (file)
@@ -1007,7 +1007,7 @@ bool PLModel::action( QAction *action, const QModelIndexList &indexes )
 
     case ACTION_ENQUEUEFILE:
         foreach( const QString &uri, a.uris )
-            playlist_Add( THEPL, uri.toAscii().constData(),
+            playlist_Add( THEPL, uri.toLatin1().constData(),
                           NULL, PLAYLIST_APPEND | PLAYLIST_PREPARSE,
                           PLAYLIST_END,
                           getPLRootType() == ROOTTYPE_CURRENT_PLAYING,
@@ -1016,7 +1016,7 @@ bool PLModel::action( QAction *action, const QModelIndexList &indexes )
 
     case ACTION_ENQUEUEDIR:
         if( a.uris.isEmpty() ) break;
-        p_input = input_item_New( a.uris.first().toAscii().constData(), NULL );
+        p_input = input_item_New( a.uris.first().toLatin1().constData(), NULL );
         if( unlikely( p_input == NULL ) ) break;
 
         /* FIXME: playlist_AddInput() can fail */
index e03a9180fd71409dcf393c733270654013ac85db..2cc7e189bb99864a8e1a5e8cf07b9dcd768a2387 100644 (file)
@@ -296,7 +296,7 @@ void StandardPLPanel::popupAction( QAction *action )
     case VLCModelSubInterface::ACTION_EXPLORE:
         /* locally handled only */
         temp = model->getURI( index );
-        if( ! temp.isEmpty() ) path = make_path( temp.toAscii().constData() );
+        if( ! temp.isEmpty() ) path = make_path( temp.toLatin1().constData() );
         if( path == NULL ) return;
         QDesktopServices::openUrl(
                     QUrl::fromLocalFile( QFileInfo( qfu( path ) ).absolutePath() ) );