Browse Source

purge remaining set_category() artifacts

see e967f81f6a.
pull/132/head
Lyndon Brown 7 years ago
committed by Hugo Beauzée-Luyssen
parent
commit
79d852d5be
  1. 7
      include/vlc_plugin.h
  2. 3
      modules/gui/macosx/preferences/prefs.m
  3. 6
      modules/gui/qt/dialogs/preferences/complete_preferences.cpp
  4. 1
      src/config/help.c

7
include/vlc_plugin.h

@ -110,7 +110,6 @@ enum vlc_module_properties
/* Configuration hint types */
#define CONFIG_HINT_CATEGORY 0x02 /* Start of new category */
#define CONFIG_CATEGORY 0x06 /* Set category */
#define CONFIG_SUBCATEGORY 0x07 /* Set subcategory */
#define CONFIG_SECTION 0x08 /* Start of new section */
@ -206,7 +205,7 @@ enum vlc_module_properties
/**
* Current plugin ABI version
*/
#define VLC_API_VERSION_STRING "4.0.5"
#define VLC_API_VERSION_STRING "4.0.6"
/*****************************************************************************
* Add a few defines. You do not want to read this section. Really.
@ -380,10 +379,6 @@ VLC_METADATA_EXPORTS
vlc_config_set (VLC_CONFIG_VALUE, (int64_t)(v));
#define set_category( i_id ) \
add_type_inner( CONFIG_CATEGORY ) \
vlc_config_set (VLC_CONFIG_VALUE, (int64_t)(i_id));
#define set_subcategory( i_id ) \
add_type_inner( CONFIG_SUBCATEGORY ) \
vlc_config_set (VLC_CONFIG_VALUE, (int64_t)(i_id));

3
modules/gui/macosx/preferences/prefs.m

@ -497,9 +497,6 @@
for (unsigned int j = 0; j < confsize; j++) {
int configType = p_configs[j].i_type;
if (configType == CONFIG_CATEGORY)
continue; /* ignore */
if (configType == CONFIG_SUBCATEGORY) {
lastsubcat = (int)p_configs[j].value.i;
if( lastsubcat == SUBCAT_HIDDEN ) {

6
modules/gui/qt/dialogs/preferences/complete_preferences.cpp

@ -192,9 +192,6 @@ PrefsTree::PrefsTree( qt_intf_t *_p_intf, QWidget *_parent,
{
const module_config_t *p_item = p_config + i;
if( p_item->i_type == CONFIG_CATEGORY )
continue; /* ignore */
if( p_item->i_type == CONFIG_SUBCATEGORY )
{
i_subcategory = p_item->value.i;
@ -557,9 +554,6 @@ bool PrefsItemData::contains( const QString &text, Qt::CaseSensitivity cs )
do
{
if ( p_item->i_type == CONFIG_CATEGORY )
continue; /* ignore */
if ( p_item->i_type == CONFIG_SUBCATEGORY )
{
/* for core, if we hit a subcat, stop */

1
src/config/help.c

@ -360,7 +360,6 @@ static void print_item(const module_t *m, const struct vlc_param *param,
module_gettext(m, item->psz_longtext));
break;
case CONFIG_CATEGORY:
case CONFIG_SUBCATEGORY:
/* We ignore these here, using 'hints' instead */
break;

Loading…
Cancel
Save