From ce1513f89f798defc6b1c0b7dcada26b95d3bc17 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Fri, 1 Nov 2013 16:07:01 +0100 Subject: [PATCH] WPrefs: Removed unused Screen argument to the 'Init*' functions The functions that create the different configuration panels were taking the screen structure as argument, but it turns out that none of them actually need it. We just remove the argument to make code simpler and easier to maintain. Signed-off-by: Christophe CURIS --- WPrefs.app/Appearance.c | 2 +- WPrefs.app/Configurations.c | 2 +- WPrefs.app/Docks.c | 2 +- WPrefs.app/Expert.c | 2 +- WPrefs.app/Focus.c | 2 +- WPrefs.app/FontSimple.c | 2 +- WPrefs.app/Icons.c | 2 +- WPrefs.app/KeyboardSettings.c | 2 +- WPrefs.app/KeyboardShortcuts.c | 2 +- WPrefs.app/Menu.c | 2 +- WPrefs.app/MenuPreferences.c | 2 +- WPrefs.app/MouseSettings.c | 2 +- WPrefs.app/Paths.c | 2 +- WPrefs.app/Preferences.c | 2 +- WPrefs.app/Themes.c | 2 +- WPrefs.app/WPrefs.c | 34 +++++++++++++++++----------------- WPrefs.app/WPrefs.h | 30 +++++++++++++++--------------- WPrefs.app/WindowHandling.c | 2 +- WPrefs.app/Workspace.c | 2 +- 19 files changed, 49 insertions(+), 49 deletions(-) diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index 11f90c7f..64a83d5b 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -2060,7 +2060,7 @@ static void prepareForClose(_Panel * panel) WMSynchronizeUserDefaults(udb); } -Panel *InitAppearance(WMScreen *scr, WMWidget *parent) +Panel *InitAppearance(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c index 55b15375..4fdc777c 100644 --- a/WPrefs.app/Configurations.c +++ b/WPrefs.app/Configurations.c @@ -425,7 +425,7 @@ static void storeData(_Panel *panel) SetIntegerForKey(WMGetSliderValue(panel->dithS), "ColormapSize"); } -Panel *InitConfigurations(WMScreen *scr, WMWidget *parent) +Panel *InitConfigurations(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Docks.c b/WPrefs.app/Docks.c index a109b701..91fa3380 100644 --- a/WPrefs.app/Docks.c +++ b/WPrefs.app/Docks.c @@ -302,7 +302,7 @@ static void showData(_Panel *panel) } } -Panel *InitDocks(WMScreen *scr, WMWidget *parent) +Panel *InitDocks(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c index e170bbdb..559f8cb6 100644 --- a/WPrefs.app/Expert.c +++ b/WPrefs.app/Expert.c @@ -165,7 +165,7 @@ static void storeDefaults(_Panel * panel) } } -Panel *InitExpert(WMScreen * scr, WMWidget * parent) +Panel *InitExpert(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c index 0a0916dc..294c6791 100644 --- a/WPrefs.app/Focus.c +++ b/WPrefs.app/Focus.c @@ -333,7 +333,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitFocus(WMScreen *scr, WMWidget *parent) +Panel *InitFocus(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c index 1bcb277c..ebcbaf26 100644 --- a/WPrefs.app/FontSimple.c +++ b/WPrefs.app/FontSimple.c @@ -716,7 +716,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitFontSimple(WMScreen * scr, WMWidget * parent) +Panel *InitFontSimple(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c index 98352a1b..5ebd5868 100644 --- a/WPrefs.app/Icons.c +++ b/WPrefs.app/Icons.c @@ -320,7 +320,7 @@ static void storeData(_Panel * panel) SetStringForKey("none", "IconificationStyle"); } -Panel *InitIcons(WMScreen * scr, WMWidget * parent) +Panel *InitIcons(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/KeyboardSettings.c b/WPrefs.app/KeyboardSettings.c index 3dc27ebc..9c4b94dd 100644 --- a/WPrefs.app/KeyboardSettings.c +++ b/WPrefs.app/KeyboardSettings.c @@ -155,7 +155,7 @@ static void createPanel(Panel * p) WMMapSubwidgets(panel->box); } -Panel *InitKeyboardSettings(WMScreen * scr, WMWidget * parent) +Panel *InitKeyboardSettings(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c index 8c9cafa6..d71d4bfd 100644 --- a/WPrefs.app/KeyboardShortcuts.c +++ b/WPrefs.app/KeyboardShortcuts.c @@ -581,7 +581,7 @@ static void storeData(_Panel * panel) } } -Panel *InitKeyboardShortcuts(WMScreen * scr, WMWidget * parent) +Panel *InitKeyboardShortcuts(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c index 55a1d562..7d1961cc 100644 --- a/WPrefs.app/Menu.c +++ b/WPrefs.app/Menu.c @@ -1734,7 +1734,7 @@ static void hideMenus(_Panel * panel) WEditMenuHide(panel->menu); } -Panel *InitMenu(WMScreen * scr, WMWidget * parent) +Panel *InitMenu(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c index c93ee30c..d15daf15 100644 --- a/WPrefs.app/MenuPreferences.c +++ b/WPrefs.app/MenuPreferences.c @@ -213,7 +213,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitMenuPreferences(WMScreen * scr, WMWidget * parent) +Panel *InitMenuPreferences(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c index 4ec23233..5f5f9b5b 100644 --- a/WPrefs.app/MouseSettings.c +++ b/WPrefs.app/MouseSettings.c @@ -774,7 +774,7 @@ static void storeData(_Panel * panel) wfree(tmp); } -Panel *InitMouseSettings(WMScreen * scr, WMWidget * parent) +Panel *InitMouseSettings(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Paths.c b/WPrefs.app/Paths.c index 4dc8d63f..86f27a40 100644 --- a/WPrefs.app/Paths.c +++ b/WPrefs.app/Paths.c @@ -305,7 +305,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitPaths(WMScreen * scr, WMWidget * parent) +Panel *InitPaths(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c index 3ab7d8ed..7d772139 100644 --- a/WPrefs.app/Preferences.c +++ b/WPrefs.app/Preferences.c @@ -326,7 +326,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitPreferences(WMScreen * scr, WMWidget * parent) +Panel *InitPreferences(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Themes.c b/WPrefs.app/Themes.c index 342edb0b..a8ce4d1d 100644 --- a/WPrefs.app/Themes.c +++ b/WPrefs.app/Themes.c @@ -202,7 +202,7 @@ static void storeData(_Panel * panel) { } -Panel *InitThemes(WMScreen * scr, WMWidget * parent) +Panel *InitThemes(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index f174a7df..8f223bc8 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -645,34 +645,34 @@ void Initialize(WMScreen * scr) WMSetLabelText(WPrefs.statusL, _("Initializing configuration panels...")); - InitFocus(scr, WPrefs.banner); - InitWindowHandling(scr, WPrefs.banner); + InitFocus(WPrefs.banner); + InitWindowHandling(WPrefs.banner); - InitMenuPreferences(scr, WPrefs.banner); - InitIcons(scr, WPrefs.banner); - InitPreferences(scr, WPrefs.banner); + InitMenuPreferences(WPrefs.banner); + InitIcons(WPrefs.banner); + InitPreferences(WPrefs.banner); - InitPaths(scr, WPrefs.banner); - InitDocks(scr, WPrefs.banner); - InitWorkspace(scr, WPrefs.banner); - InitConfigurations(scr, WPrefs.banner); + InitPaths(WPrefs.banner); + InitDocks(WPrefs.banner); + InitWorkspace(WPrefs.banner); + InitConfigurations(WPrefs.banner); - InitMenu(scr, WPrefs.banner); + InitMenu(WPrefs.banner); #ifdef not_yet_fully_implemented - InitKeyboardSettings(scr, WPrefs.banner); + InitKeyboardSettings(WPrefs.banner); #endif - InitKeyboardShortcuts(scr, WPrefs.banner); - InitMouseSettings(scr, WPrefs.banner); + InitKeyboardShortcuts(WPrefs.banner); + InitMouseSettings(WPrefs.banner); - InitAppearance(scr, WPrefs.banner); + InitAppearance(WPrefs.banner); - InitFontSimple(scr, WPrefs.banner); + InitFontSimple(WPrefs.banner); #ifdef not_yet_fully_implemented - InitThemes(scr, WPrefs.banner); + InitThemes(WPrefs.banner); #endif - InitExpert(scr, WPrefs.banner); + InitExpert(WPrefs.banner); WMRealizeWidget(WPrefs.scrollV); diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 824010c3..1db3a9bb 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -136,21 +136,21 @@ int ModifierFromKey(Display * dpy, const char *key); void Initialize(WMScreen *scr); /* in alphabetical order - in case you'd want to add one */ -Panel *InitAppearance(WMScreen *scr, WMWidget *parent); -Panel *InitConfigurations(WMScreen *scr, WMWidget *parent); -Panel *InitDocks(WMScreen *scr, WMWidget *parent); -Panel *InitExpert(WMScreen *scr, WMWidget *parent); -Panel *InitFocus(WMScreen *scr, WMWidget *parent); -Panel *InitFontSimple(WMScreen *scr, WMWidget *parent); -Panel *InitIcons(WMScreen *scr, WMWidget *parent); -Panel *InitKeyboardShortcuts(WMScreen *scr, WMWidget *parent); -Panel *InitMenu(WMScreen *scr, WMWidget *parent); -Panel *InitMenuPreferences(WMScreen *scr, WMWidget *parent); -Panel *InitMouseSettings(WMScreen *scr, WMWidget *parent); -Panel *InitPaths(WMScreen *scr, WMWidget *parent); -Panel *InitPreferences(WMScreen *scr, WMWidget *parent); -Panel *InitWindowHandling(WMScreen *scr, WMWidget *parent); -Panel *InitWorkspace(WMScreen *scr, WMWidget *parent); +Panel *InitAppearance(WMWidget *parent); +Panel *InitConfigurations(WMWidget *parent); +Panel *InitDocks(WMWidget *parent); +Panel *InitExpert(WMWidget *parent); +Panel *InitFocus(WMWidget *parent); +Panel *InitFontSimple(WMWidget *parent); +Panel *InitIcons(WMWidget *parent); +Panel *InitKeyboardShortcuts(WMWidget *parent); +Panel *InitMenu(WMWidget *parent); +Panel *InitMenuPreferences(WMWidget *parent); +Panel *InitMouseSettings(WMWidget *parent); +Panel *InitPaths(WMWidget *parent); +Panel *InitPreferences(WMWidget *parent); +Panel *InitWindowHandling(WMWidget *parent); +Panel *InitWorkspace(WMWidget *parent); #define FRAME_TOP 105 diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index dee15435..4d514d91 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -515,7 +515,7 @@ static void undo(_Panel * panel) showData(panel); } -Panel *InitWindowHandling(WMScreen * scr, WMWidget * parent) +Panel *InitWindowHandling(WMWidget *parent) { _Panel *panel; diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c index d84a3931..862d2db4 100644 --- a/WPrefs.app/Workspace.c +++ b/WPrefs.app/Workspace.c @@ -215,7 +215,7 @@ static void storeData(_Panel * panel) "WorkspaceNameDisplayPosition"); } -Panel *InitWorkspace(WMScreen * scr, WMWidget * parent) +Panel *InitWorkspace(WMWidget *parent) { _Panel *panel;