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.h | |
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.h')
-rw-r--r-- | src/xkbcomp/ast.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xkbcomp/ast.h b/src/xkbcomp/ast.h index 1e267ed..c9b801f 100644 --- a/src/xkbcomp/ast.h +++ b/src/xkbcomp/ast.h @@ -85,8 +85,8 @@ enum stmt_type { STMT_SYMBOLS, STMT_MODMAP, STMT_GROUP_COMPAT, - STMT_INDICATOR_MAP, - STMT_INDICATOR_NAME, + STMT_LED_MAP, + STMT_LED_NAME, _STMT_NUM_VALUES }; @@ -263,14 +263,14 @@ typedef struct { int ndx; ExprDef *name; bool virtual; -} IndicatorNameDef; +} LedNameDef; typedef struct { ParseCommon common; enum merge_mode merge; xkb_atom_t name; VarDef *body; -} IndicatorMapDef; +} LedMapDef; enum xkb_map_flags { MAP_IS_DEFAULT = (1 << 0), |