From 01c7390be1a3b4bc76dfcf6baf651cf34c989106 Mon Sep 17 00:00:00 2001
From: Christophe CURIS <christophe.curis@free.fr>
Date: Fri, 8 Nov 2013 21:18:22 +0100
Subject: [PATCH] WPrefs: Use the macro 'wlengthof' to get the number of
 element in an array

The new macro 'wlengthof' from WUtil makes code easier to read than the
previous [sizeof() / sizeof([0]) ] construct.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
---
 WPrefs.app/Appearance.c        | 2 +-
 WPrefs.app/Expert.c            | 6 +++---
 WPrefs.app/KeyboardShortcuts.c | 2 +-
 WPrefs.app/MouseSettings.c     | 4 ++--
 WPrefs.app/Workspace.c         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 1fa9e85a..ca4396ee 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1111,7 +1111,7 @@ static void previewClick(XEvent * event, void *clientData)
 
 	switch (panel->oldTabItem) {
 	case 0:
-		for (i = 0; i < sizeof(previewPositions) / sizeof(previewPositions[0]); i++) {
+		for (i = 0; i < wlengthof(previewPositions); i++) {
 			if (event->xbutton.x >= previewPositions[i].pos.x
 			    && event->xbutton.y >= previewPositions[i].pos.y
 			    && event->xbutton.x < previewPositions[i].pos.x
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 559f8cb6..582013ef 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -115,11 +115,11 @@ static void createPanel(Panel * p)
 	WMSetScrollViewHasHorizontalScroller(sv, False);
 
 	f = WMCreateFrame(panel->box);
-	WMResizeWidget(f, 495, (sizeof(expert_options) / sizeof(expert_options[0])) * 25 + 8);
+	WMResizeWidget(f, 495, wlengthof(expert_options) * 25 + 8);
 	WMSetFrameRelief(f, WRFlat);
 
 	udb = WMGetStandardUserDefaults();
-	for (i = 0; i < sizeof(expert_options) / sizeof(expert_options[0]); i++) {
+	for (i = 0; i < wlengthof(expert_options); i++) {
 		panel->swi[i] = WMCreateSwitchButton(f);
 		WMResizeWidget(panel->swi[i], FRAME_WIDTH - 40, 25);
 		WMMoveWidget(panel->swi[i], 5, 5 + i * 25);
@@ -152,7 +152,7 @@ static void storeDefaults(_Panel * panel)
 	WMUserDefaults *udb = WMGetStandardUserDefaults();
 	int i;
 
-	for (i = 0; i < sizeof(expert_options) / sizeof(expert_options[0]); i++) {
+	for (i = 0; i < wlengthof(expert_options); i++) {
 		switch (expert_options[i].class) {
 		case OPTION_WMAKER:
 			SetBoolForKey(WMGetButtonSelected(panel->swi[i]), expert_options[i].op_name);
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index d71d4bfd..19e9905b 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -509,7 +509,7 @@ static void createPanel(Panel * p)
 	WMSetListUserDrawProc(panel->actLs, paintItem);
 	WMHangData(panel->actLs, panel);
 
-	for (i = 0; i < sizeof(keyOptions)/sizeof(keyOptions[0]); i++) {
+	for (i = 0; i < wlengthof(keyOptions); i++) {
 		WMAddListItem(panel->actLs, _(keyOptions[i].title));
 	}
 	WMSetListAction(panel->actLs, listClick, panel);
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 5f5f9b5b..32886dbb 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -613,13 +613,13 @@ static void createPanel(Panel * p)
 	WMResizeWidget(panel->wheelP, 135, 20);
 	WMMoveWidget(panel->wheelP, 95, 129);
 
-	for (i = 0; i < sizeof(buttonActions) / sizeof(buttonActions[0]); i++) {
+	for (i = 0; i < wlengthof(buttonActions); i++) {
 		WMAddPopUpButtonItem(panel->button1P, buttonActions[i]);
 		WMAddPopUpButtonItem(panel->button2P, buttonActions[i]);
 		WMAddPopUpButtonItem(panel->button3P, buttonActions[i]);
 	}
 
-	for (i = 0; i < sizeof(wheelActions) / sizeof(wheelActions[0]); i++) {
+	for (i = 0; i < wlengthof(wheelActions); i++) {
 		WMAddPopUpButtonItem(panel->wheelP, wheelActions[i]);
 	}
 
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index 862d2db4..75175427 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -81,7 +81,7 @@ static void showData(_Panel * panel)
 		str = "center";
 
 	idx = 1;		/* center */
-	for (i = 0; i < sizeof(WSNamePositions) / sizeof(WSNamePositions[0]); i++) {
+	for (i = 0; i < wlengthof(WSNamePositions); i++) {
 		if (strcasecmp(WSNamePositions[i], str) == 0) {
 			idx = i;
 			break;