diff options
author | Ran Benita <ran234@gmail.com> | 2013-11-27 12:52:20 +0200 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2013-11-27 12:52:20 +0200 |
commit | 64b8da4b9a13f37ec1f9bd30f38abf41e5bb4535 (patch) | |
tree | 2aaca460399f6352649db26b3aaf2f45c7a8842c /src | |
parent | 5a5e4915b0880d1c4a474dd701210cc823dda593 (diff) | |
download | xorg-lib-libxkbcommon-64b8da4b9a13f37ec1f9bd30f38abf41e5bb4535.tar.gz |
symbols: rename info.modMaps -> modmaps
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/xkbcomp/symbols.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index 71435c6..673bc53 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -177,7 +177,7 @@ typedef struct { KeyInfo default_key; ActionsInfo *actions; darray(xkb_atom_t) group_names; - darray(ModMapEntry) modMaps; + darray(ModMapEntry) modmaps; struct xkb_keymap *keymap; } SymbolsInfo; @@ -203,7 +203,7 @@ ClearSymbolsInfo(SymbolsInfo *info) ClearKeyInfo(keyi); darray_free(info->keys); darray_free(info->group_names); - darray_free(info->modMaps); + darray_free(info->modmaps); ClearKeyInfo(&info->default_key); } @@ -437,7 +437,7 @@ AddModMapEntry(SymbolsInfo *info, ModMapEntry *new) ModMapEntry *old; bool clobber = (new->merge != MERGE_AUGMENT); - darray_foreach(old, info->modMaps) { + darray_foreach(old, info->modmaps) { xkb_mod_index_t use, ignore; if ((new->haveSymbol != old->haveSymbol) || @@ -470,7 +470,7 @@ AddModMapEntry(SymbolsInfo *info, ModMapEntry *new) return true; } - darray_append(info->modMaps, *new); + darray_append(info->modmaps, *new); return true; } @@ -517,7 +517,7 @@ MergeIncludedSymbols(SymbolsInfo *into, SymbolsInfo *from, into->errorCount++; } - darray_foreach(mm, from->modMaps) { + darray_foreach(mm, from->modmaps) { mm->merge = (merge == MERGE_DEFAULT ? mm->merge : merge); if (!AddModMapEntry(into, mm)) into->errorCount++; @@ -1596,7 +1596,7 @@ CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info) } } - darray_foreach(mm, info->modMaps) + darray_foreach(mm, info->modmaps) if (!CopyModMapDef(info, mm)) info->errorCount++; |