]> git.sesse.net Git - vlc/commitdiff
Qt4: use toURI()
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 10 Nov 2010 16:27:33 +0000 (18:27 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 10 Nov 2010 16:27:33 +0000 (18:27 +0200)
modules/gui/qt4/main_interface.cpp

index ec9c97e47241e8f1234abbba38cc7d59d755079b..318277528de89b41d44b67b0a2036d3d9ae8a167 100644 (file)
@@ -1110,11 +1110,10 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
     {
         if( url.isValid() )
         {
-            char* psz_uri = make_URI( url.toEncoded().constData(), NULL );
-            playlist_Add( THEPL, psz_uri, NULL,
+            QString mrl = toURI( url.toEncoded().constData() );
+            playlist_Add( THEPL, qtu(mrl), NULL,
                           PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE),
                           PLAYLIST_END, true, pl_Unlocked );
-            free( psz_uri );
             first = false;
             RecentsMRL::getInstance( p_intf )->addRecent( url.toString() );
         }
@@ -1126,11 +1125,10 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
     if( !mimeData->hasUrls() && mimeData->hasText() &&
         QUrl(mimeData->text()).isValid() )
     {
-        char *psz_uri = make_URI( qtu( mimeData->text() ), NULL );
-        playlist_Add( THEPL, psz_uri, NULL,
+        QString mrl = toURI( mimeData->text() );
+        playlist_Add( THEPL, qtu(mrl), NULL,
                       PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE),
                       PLAYLIST_END, true, pl_Unlocked );
-        free( psz_uri );
     }
     event->accept();
 }