[vlc-commits] Remove useless binary and with CONFIG_ITEM

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 29 21:27:39 2011 +0300| [9ffda48047e72d70e9b31cb7e5bd0aecd120849f] | committer: Rémi Denis-Courmont

Remove useless binary and with CONFIG_ITEM

If the high nibble is set, the type is item type and the low nibble is
necessarily zero.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ffda48047e72d70e9b31cb7e5bd0aecd120849f
---

 .../gui/qt4/components/complete_preferences.cpp    |    2 +-
 modules/gui/qt4/components/extended_panels.cpp     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index bd7d6ec..f29f1be 100644
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -456,7 +456,7 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             boxlayout = new QGridLayout();
         }
         /* Only one hotkey control */
-        if( (p_item->i_type & CONFIG_ITEM) == CONFIG_ITEM_KEY )
+        if( p_item->i_type == CONFIG_ITEM_KEY )
         {
             if( has_hotkey )
                 continue;
diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index d848d90..c78f672 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -428,7 +428,7 @@ void ExtVideo::initComboBoxItems( QObject *widget )
                                                  qtu( option ) );
     if( p_item )
     {
-        int i_type = p_item->i_type & CONFIG_ITEM;
+        int i_type = p_item->i_type;
         for( int i_index = 0; i_index < p_item->i_list; i_index++ )
         {
             if( i_type == CONFIG_ITEM_INTEGER