Use VLC_VAR_CLASS when applicable.

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 203b53b3b684921a79a6c6b6e313caa71fbf0330..1630ed78d24ff855d743b7b3ca9ebf0dba4aa059 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -426,7 +426,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
                  "Module instance %s not found, looking in config values.",
                  qtu( module ) );
 #endif
-        i_type = config_GetType( p_intf, qtu( option ) ) & 0xf0;
+        i_type = config_GetType( p_intf, qtu( option ) ) & VLC_VAR_CLASS;
         switch( i_type )
         {
             case VLC_VAR_INTEGER:
@@ -443,7 +443,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
     }
     else
     {
-        i_type = var_Type( p_obj, qtu( option ) ) & 0xf0;
+        i_type = var_Type( p_obj, qtu( option ) ) & VLC_VAR_CLASS;
         var_Get( p_obj, qtu( option ), &val );
         vlc_object_release( p_obj );
     }
@@ -540,7 +540,7 @@ void ExtVideo::updateFilterOptions()
     QLineEdit      *lineedit      = qobject_cast<QLineEdit*>     ( sender() );
     QComboBox      *combobox      = qobject_cast<QComboBox*>     ( sender() );
 
-    i_type &= 0xf0;
+    i_type &= VLC_VAR_CLASS;
     if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
     {
         int i_int = 0;

diff --git a/modules/misc/lua/libs/variables.c b/modules/misc/lua/libs/variables.c
index 15e86491332c82069ec8e0ea07243a9603064120..c0b7765089dfa210199e09f2c01611b6c767c1af 100644 (file)
--- a/modules/misc/lua/libs/variables.c
+++ b/modules/misc/lua/libs/variables.c
@@ -48,7 +48,7 @@
  *****************************************************************************/
 int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val )
 {
-    switch( i_type &= 0xf0 )
+    switch( i_type &= VLC_VAR_CLASS )
     {
         case VLC_VAR_VOID:
             vlclua_error( L );
@@ -98,7 +98,7 @@ int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val )
 
 static int vlclua_tovalue( lua_State *L, int i_type, vlc_value_t *val )
 {
-    switch( i_type & 0xf0 )
+    switch( i_type & VLC_VAR_CLASS )
     {
         case VLC_VAR_VOID:
             break;