[vlc-commits] Qt: toAscii has been deprecated

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 28 13:35:27 2013 +0200| [8332a26a12947f24a3d2219d3265062840b2020f] | committer: Jean-Baptiste Kempf

Qt: toAscii has been deprecated

Ref #8532

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8332a26a12947f24a3d2219d3265062840b2020f
---

 modules/gui/qt4/components/playlist/playlist_model.cpp |    4 ++--
 modules/gui/qt4/components/playlist/standardpanel.cpp  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 2e09c27..0c7e762 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -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 */
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index e03a918..2cc7e18 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -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() ) );