From eb918f107c6433cd8d547a3104e7d87328d9de20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 15 Dec 2007 16:07:40 +0000 Subject: [PATCH] Remove code killed by previous commit --- modules/gui/beos/PreferencesWindow.cpp | 6 ------ modules/gui/macosx/prefs_widgets.m | 5 ----- modules/gui/qt4/components/preferences_widgets.cpp | 1 - modules/gui/wince/preferences_widgets.cpp | 4 ---- modules/gui/wxwidgets/dialogs/preferences_widgets.cpp | 6 ------ 5 files changed, 22 deletions(-) diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp index 248741a40d..9d5c0320ae 100644 --- a/modules/gui/beos/PreferencesWindow.cpp +++ b/modules/gui/beos/PreferencesWindow.cpp @@ -614,12 +614,6 @@ ConfigWidget::ConfigWidget( intf_thread_t * _p_intf, BRect rect, BRect r; BMenuItem * menuItem; - /* Skip deprecated options */ - if( p_item->psz_current ) - { - fInitOK = false; - return; - } fInitOK = true; diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m index b4d40b8eab..d23d3705c6 100644 --- a/modules/gui/macosx/prefs_widgets.m +++ b/modules/gui/macosx/prefs_widgets.m @@ -812,11 +812,6 @@ withView: (NSView *)o_parent_view { VLCConfigControl *p_control = NULL; - /* Skip depracated options */ - if( _p_item->psz_current ) - { - return NULL; - } switch( _p_item->i_type ) { diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 83d4833a0e..e7d8247e8d 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -74,7 +74,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, QGridLayout *l, int &line ) { ConfigControl *p_control = NULL; - if( p_item->psz_current || p_item->b_unsaveable ) return NULL; switch( p_item->i_type ) { diff --git a/modules/gui/wince/preferences_widgets.cpp b/modules/gui/wince/preferences_widgets.cpp index 648dfd6857..298954ad9f 100644 --- a/modules/gui/wince/preferences_widgets.cpp +++ b/modules/gui/wince/preferences_widgets.cpp @@ -47,10 +47,6 @@ ConfigControl *CreateConfigControl( vlc_object_t *p_this, { ConfigControl *p_control = NULL; - if( p_item->psz_current ) - { - return NULL; - } switch( p_item->i_type ) { case CONFIG_ITEM_MODULE: diff --git a/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp b/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp index 57f8d012d2..1d3974195c 100644 --- a/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp +++ b/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp @@ -38,12 +38,6 @@ ConfigControl *CreateConfigControl( vlc_object_t *p_this, { ConfigControl *p_control = NULL; - /*Skip deprecated options */ - if( p_item->psz_current || p_item->b_unsaveable ) - { - return NULL; - } - switch( p_item->i_type ) { case CONFIG_ITEM_MODULE: -- 2.39.5