From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sat, 21 Oct 2006 19:17:09 +0000 (+0000)
Subject: Qt compile fix
X-Git-Tag: 0.9.0-test0~9829
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4119f97f857ae9f6ed4919daddedefd777aa6aaa;p=vlc

Qt compile fix
---

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index e61d502b3f..5c6bb53a6f 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -819,7 +819,7 @@ void KeySelectorControl::doApply()
 }
 
 KeyInputDialog::KeyInputDialog( QList<module_config_t*>& _values,
-                                char * _keyToChange ) :
+                                const char * _keyToChange ) :
                                                 QDialog(0), keyValue(0)
 {
     setModal( true );
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 11e3877c8f..f93dd48808 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -55,7 +55,7 @@ public:
     }
     virtual ~ConfigControl() {};
     virtual int getType() = 0;
-    char * getName() { return  p_item->psz_name; }
+    const char * getName() { return  p_item->psz_name; }
     QWidget *getWidget() { assert( widget ); return widget; }
     bool isAdvanced() { return p_item->b_advanced; }
     virtual void hide() { getWidget()->hide(); };
@@ -315,14 +315,14 @@ private slot:
 class KeyInputDialog : public QDialog
 {
 public:
-    KeyInputDialog( QList<module_config_t *> &, char * );
+    KeyInputDialog( QList<module_config_t *> &, const char * );
     int keyValue;
     bool conflicts;
 private:
     void keyPressEvent( QKeyEvent *);
     QLabel *selected;
     QLabel *warning;
-    char * keyToChange;
+    const char * keyToChange;
     QList<module_config_t*> values;
 };