From: Rémi Duraffort <ivoire@videolan.org>
Date: Thu, 31 Jul 2008 16:26:26 +0000 (+0200)
Subject: Don't mix malloc and delete.
X-Git-Tag: 0.9.0-test3~109
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b06464e4a8277e77dd7da3053b40d881e4861ee6;p=vlc

Don't mix malloc and delete.
---

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index a37dc279d2..5d7b426a36 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -273,9 +273,9 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
 DiscOpenPanel::~DiscOpenPanel()
 {
-    delete psz_dvddiscpath;
-    delete psz_vcddiscpath;
-    delete psz_cddadiscpath;
+    free( psz_dvddiscpath );
+    free( psz_vcddiscpath );
+    free( psz_cddadiscpath );
 }
 
 void DiscOpenPanel::clear()
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 2f62769b09..206283f276 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -365,8 +365,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 {
                     ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
                 }
-                delete psz_cddadiscpath; delete psz_dvddiscpath;
-                delete psz_vcddiscpath;
+                free( psz_cddadiscpath );
+                free( psz_dvddiscpath );
+                free( psz_vcddiscpath );
             }
 
             CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );