[vlc-commits] config: remove unused config_ResetAll() parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 28 21:04:36 2018 +0200| [1151b5c914f6c9bbbdf29fb7f37b506fd195c47a] | committer: Rémi Denis-Courmont

config: remove unused config_ResetAll() parameter

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

 include/vlc_configuration.h                   | 3 +--
 modules/gui/macosx/VLCSimplePrefsController.m | 2 +-
 modules/gui/qt/dialogs/preferences.cpp        | 2 +-
 src/config/core.c                             | 5 +----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 60e89b4fe6..8aeafde1d7 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -255,8 +255,7 @@ VLC_API int config_SaveConfigFile( vlc_object_t * );
  * This function resets all configuration items to their respective
  * compile-time default value.
  */
-VLC_API void config_ResetAll( vlc_object_t * );
-#define config_ResetAll(a) config_ResetAll(VLC_OBJECT(a))
+VLC_API void config_ResetAll(void);
 
 /**
  * Looks up a configuration item.
diff --git a/modules/gui/macosx/VLCSimplePrefsController.m b/modules/gui/macosx/VLCSimplePrefsController.m
index 238746ffbb..48593264f6 100644
--- a/modules/gui/macosx/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/VLCSimplePrefsController.m
@@ -833,7 +833,7 @@ static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *p
 {
     if (i_return == NSAlertAlternateReturn) {
         /* reset VLC's config */
-        config_ResetAll(p_intf);
+        config_ResetAll();
         [self resetControls];
 
         /* force config file creation, since libvlc won't exit normally */
diff --git a/modules/gui/qt/dialogs/preferences.cpp b/modules/gui/qt/dialogs/preferences.cpp
index 110c60d1b6..8680c85768 100644
--- a/modules/gui/qt/dialogs/preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences.cpp
@@ -340,7 +340,7 @@ void PrefsDialog::reset()
 
     if( ret == QMessageBox::Ok )
     {
-        config_ResetAll( p_intf );
+        config_ResetAll();
         config_SaveConfigFile( p_intf );
         getSettings()->clear();
 
diff --git a/src/config/core.c b/src/config/core.c
index 9999fd72d5..430aadf9cf 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -441,8 +441,7 @@ void config_Free (module_config_t *tab, size_t confsize)
     free (tab);
 }
 
-#undef config_ResetAll
-void config_ResetAll( vlc_object_t *p_this )
+void config_ResetAll(void)
 {
     vlc_rwlock_wrlock (&config_lock);
     for (vlc_plugin_t *p = vlc_plugins; p != NULL; p = p->next)
@@ -466,6 +465,4 @@ void config_ResetAll( vlc_object_t *p_this )
         }
     }
     vlc_rwlock_unlock (&config_lock);
-
-    VLC_UNUSED(p_this);
 }