KeyToString: allocate key on heap

[vlc] / modules / gui / qt4 / util / customwidgets.cpp

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index c02945cbd807b87d27f752c8e5cc5049d4021974..820c8d308ff33d4e257d7c31b46e1454afd44272 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -231,16 +231,23 @@ int qtWheelEventToVLCKey( QWheelEvent *e )
 
 QString VLCKeyToString( int val )
 {
-    const char *base = KeyToString (val & ~KEY_MODIFIER);
+    char *base = KeyToString (val & ~KEY_MODIFIER);
 
     QString r = "";
     if( val & KEY_MODIFIER_CTRL )
-        r+= "Ctrl+";
+        r+= qfu( "Ctrl+" );
     if( val & KEY_MODIFIER_ALT )
-        r+= "Alt+";
+        r+= qfu( "Alt+" );
     if( val & KEY_MODIFIER_SHIFT )
-        r+= "Shift+";
+        r+= qfu( "Shift+" );
 
-    return r + (base ? base : qtr( "Unset" ) );
+    if (base)
+    {
+        r += qfu( base );
+        free( base );
+    }
+    else
+        r += qtr( "Unset" );
+    return r;
 }