From 4d8ead1605ca4117fd70e36766990c28ca4a161e Mon Sep 17 00:00:00 2001 From: Sergey Udaltsov Date: Tue, 7 Mar 2006 23:31:46 +0000 Subject: change enum to foreach, as nsh advised --- libxklavier/xkl_config_registry.h | 50 ++++++++++++++++--------------- libxklavier/xklavier_config.c | 62 ++++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/libxklavier/xkl_config_registry.h b/libxklavier/xkl_config_registry.h index 9c9ba1f..4daf649 100644 --- a/libxklavier/xkl_config_registry.h +++ b/libxklavier/xkl_config_registry.h @@ -99,20 +99,21 @@ extern "C" { * @param func is a callback to call for every model * @param data is anything which can be stored into the pointer */ - extern void xkl_config_registry_enum_models(XklConfigRegistry * - config, - ConfigItemProcessFunc - func, gpointer data); + extern void xkl_config_registry_foreach_model(XklConfigRegistry * + config, + ConfigItemProcessFunc + func, gpointer data); /** * Enumerates keyboard layouts from the XML configuration registry * @param func is a callback to call for every layout * @param data is anything which can be stored into the pointer */ - extern void xkl_config_registry_enum_layouts(XklConfigRegistry * - config, - ConfigItemProcessFunc - func, gpointer data); + extern void xkl_config_registry_foreach_layout(XklConfigRegistry * + config, + ConfigItemProcessFunc + func, + gpointer data); /** * Enumerates keyboard layout variants from the XML configuration registry @@ -121,12 +122,12 @@ extern "C" { * @param data is anything which can be stored into the pointer */ extern void - xkl_config_registry_enum_layout_variants(XklConfigRegistry * - config, - const gchar * - layout_name, - ConfigItemProcessFunc - func, gpointer data); + xkl_config_registry_foreach_layout_variant(XklConfigRegistry * + config, + const gchar * + layout_name, + ConfigItemProcessFunc + func, gpointer data); /** * Enumerates keyboard option groups from the XML configuration registry @@ -134,10 +135,10 @@ extern "C" { * @param data is anything which can be stored into the pointer */ extern void - xkl_config_registry_enum_option_groups(XklConfigRegistry * - config, - GroupProcessFunc func, - gpointer data); + xkl_config_registry_foreach_option_group(XklConfigRegistry * + config, + GroupProcessFunc func, + gpointer data); /** * Enumerates keyboard options from the XML configuration registry @@ -146,12 +147,13 @@ extern "C" { * @param func is a callback to call for every option * @param data is anything which can be stored into the pointer */ - extern void xkl_config_registry_enum_options(XklConfigRegistry * - config, - const gchar * - option_group_name, - ConfigItemProcessFunc - func, gpointer data); + extern void xkl_config_registry_foreach_option(XklConfigRegistry * + config, + const gchar * + option_group_name, + ConfigItemProcessFunc + func, + gpointer data); /** @} */ diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index d9acd47..3c1d166 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -156,7 +156,7 @@ xkl_read_config_item(xmlNodePtr iptr, XklConfigItem * item) } static void -xkl_config_registry_enum_from_node_set(XklConfigRegistry * config, +xkl_config_registry_foreach_in_nodeset(XklConfigRegistry * config, xmlNodeSetPtr nodes, ConfigItemProcessFunc func, gpointer data) @@ -175,9 +175,10 @@ xkl_config_registry_enum_from_node_set(XklConfigRegistry * config, } static void -xkl_config_registry_enum_simple(XklConfigRegistry * config, - xmlXPathCompExprPtr xpath_comp_expr, - ConfigItemProcessFunc func, gpointer data) +xkl_config_registry_foreach_in_xpath(XklConfigRegistry * config, + xmlXPathCompExprPtr xpath_comp_expr, + ConfigItemProcessFunc func, + gpointer data) { xmlXPathObjectPtr xpath_obj; @@ -187,7 +188,7 @@ xkl_config_registry_enum_simple(XklConfigRegistry * config, xkl_config_registry_priv(config, xpath_context)); if (xpath_obj != NULL) { - xkl_config_registry_enum_from_node_set(config, + xkl_config_registry_foreach_in_nodeset(config, xpath_obj-> nodesetval, func, data); @@ -196,9 +197,11 @@ xkl_config_registry_enum_simple(XklConfigRegistry * config, } static void -xkl_config_registry_enum_direct(XklConfigRegistry * config, - const gchar * format, const gchar * value, - ConfigItemProcessFunc func, gpointer data) +xkl_config_registry_foreach_in_xpath_with_param(XklConfigRegistry * config, + const gchar * format, + const gchar * value, + ConfigItemProcessFunc func, + gpointer data) { char xpath_expr[1024]; xmlXPathObjectPtr xpath_obj; @@ -210,7 +213,7 @@ xkl_config_registry_enum_direct(XklConfigRegistry * config, xkl_config_registry_priv(config, xpath_context)); if (xpath_obj != NULL) { - xkl_config_registry_enum_from_node_set(config, + xkl_config_registry_foreach_in_nodeset(config, xpath_obj-> nodesetval, func, data); @@ -375,35 +378,39 @@ xkl_config_registry_free(XklConfigRegistry * config) } void -xkl_config_registry_enum_models(XklConfigRegistry * config, - ConfigItemProcessFunc func, gpointer data) +xkl_config_registry_foreach_model(XklConfigRegistry * config, + ConfigItemProcessFunc func, + gpointer data) { - xkl_config_registry_enum_simple(config, models_xpath, func, data); + xkl_config_registry_foreach_in_xpath(config, models_xpath, func, + data); } void -xkl_config_registry_enum_layouts(XklConfigRegistry * config, - ConfigItemProcessFunc func, gpointer data) +xkl_config_registry_foreach_layout(XklConfigRegistry * config, + ConfigItemProcessFunc func, + gpointer data) { - xkl_config_registry_enum_simple(config, layouts_xpath, func, data); + xkl_config_registry_foreach_in_xpath(config, layouts_xpath, func, + data); } void -xkl_config_registry_enum_layout_variants(XklConfigRegistry * config, - const gchar * layout_name, - ConfigItemProcessFunc func, - gpointer data) +xkl_config_registry_foreach_layout_variant(XklConfigRegistry * config, + const gchar * layout_name, + ConfigItemProcessFunc func, + gpointer data) { - xkl_config_registry_enum_direct + xkl_config_registry_foreach_in_xpath_with_param (config, "/xkbConfigRegistry/layoutList/layout/variantList/variant[../../configItem/name = '%s']", layout_name, func, data); } void -xkl_config_registry_enum_option_groups(XklConfigRegistry * config, - GroupProcessFunc func, - gpointer data) +xkl_config_registry_foreach_option_group(XklConfigRegistry * config, + GroupProcessFunc func, + gpointer data) { xmlXPathObjectPtr xpath_obj; gint i; @@ -444,11 +451,12 @@ xkl_config_registry_enum_option_groups(XklConfigRegistry * config, } void -xkl_config_registry_enum_options(XklConfigRegistry * config, - const gchar * option_group_name, - ConfigItemProcessFunc func, gpointer data) +xkl_config_registry_foreach_option(XklConfigRegistry * config, + const gchar * option_group_name, + ConfigItemProcessFunc func, + gpointer data) { - xkl_config_registry_enum_direct + xkl_config_registry_foreach_in_xpath_with_param (config, "/xkbConfigRegistry/optionList/group/option[../configItem/name = '%s']", option_group_name, func, data); -- cgit v1.2.1