diff options
| author | Ran Benita <ran234@gmail.com> | 2013-02-17 22:18:57 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2013-03-18 22:20:02 +0000 |
| commit | 8cee7490003381b7e1399e171a8c860edb3d634c (patch) | |
| tree | 5cb829b303322446fa72bf250ba037ab9200b75f /src/xkbcomp/ast-build.c | |
| parent | 10c351f5163ff8ce3be232207bf9c0f68fbbb47d (diff) | |
| download | xorg-lib-libxkbcommon-8cee7490003381b7e1399e171a8c860edb3d634c.tar.gz | |
Change 'indicator' to 'led' everywhere possible
The code currently uses the two names interchangeably.
Settle on 'led', because it is shorter, more recognizable, and what we
use in our API (though of course the parser still uses 'indicator').
In camel case we make it 'Led'.
We change 'xkb_indicator_map' to just 'xkb_led' and the variables of
this type are 'led'. This mimics 'xkb_key' and 'key'.
IndicatorNameInfo and LEDInfo are changed to 'LedNameInfo' and
'LedInfo', and the variables are 'ledi' (like 'keyi' etc.). This is
instead of 'ii' and 'im'.
This might make a few places a bit confusing, but less than before I
think. It's also shorter.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/ast-build.c')
| -rw-r--r-- | src/xkbcomp/ast-build.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xkbcomp/ast-build.c b/src/xkbcomp/ast-build.c index ad249ad..a650b05 100644 --- a/src/xkbcomp/ast-build.c +++ b/src/xkbcomp/ast-build.c @@ -273,14 +273,14 @@ ModMapCreate(uint32_t modifier, ExprDef * keys) return def; } -IndicatorMapDef * -IndicatorMapCreate(xkb_atom_t name, VarDef * body) +LedMapDef * +LedMapCreate(xkb_atom_t name, VarDef * body) { - IndicatorMapDef *def; + LedMapDef *def; def = malloc_or_die(sizeof(*def)); - def->common.type = STMT_INDICATOR_MAP; + def->common.type = STMT_LED_MAP; def->common.next = NULL; def->merge = MERGE_DEFAULT; def->name = name; @@ -288,14 +288,14 @@ IndicatorMapCreate(xkb_atom_t name, VarDef * body) return def; } -IndicatorNameDef * -IndicatorNameCreate(int ndx, ExprDef * name, bool virtual) +LedNameDef * +LedNameCreate(int ndx, ExprDef * name, bool virtual) { - IndicatorNameDef *def; + LedNameDef *def; def = malloc_or_die(sizeof(*def)); - def->common.type = STMT_INDICATOR_NAME; + def->common.type = STMT_LED_NAME; def->common.next = NULL; def->merge = MERGE_DEFAULT; def->ndx = ndx; @@ -639,10 +639,10 @@ FreeStmt(ParseCommon *stmt) case STMT_GROUP_COMPAT: FreeStmt(&u.groupCompat->def->common); break; - case STMT_INDICATOR_MAP: + case STMT_LED_MAP: FreeStmt(&u.ledMap->body->common); break; - case STMT_INDICATOR_NAME: + case STMT_LED_NAME: FreeStmt(&u.ledName->name->common); break; default: @@ -717,8 +717,8 @@ static const char *stmt_type_strings[_STMT_NUM_VALUES] = { [STMT_SYMBOLS] = "key symbols definition", [STMT_MODMAP] = "modifier map declaration", [STMT_GROUP_COMPAT] = "group declaration", - [STMT_INDICATOR_MAP] = "indicator map declaration", - [STMT_INDICATOR_NAME] = "indicator name declaration", + [STMT_LED_MAP] = "indicator map declaration", + [STMT_LED_NAME] = "indicator name declaration", }; const char * |