projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
symbols: rename SymbolsInfo groupNames to group_names
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
symbols.c
diff --git
a/src/xkbcomp/symbols.c
b/src/xkbcomp/symbols.c
index
e5fc7c1
..
a412495
100644
(file)
--- a/
src/xkbcomp/symbols.c
+++ b/
src/xkbcomp/symbols.c
@@
-167,7
+167,7
@@
typedef struct _SymbolsInfo {
KeyInfo dflt;
VModInfo vmods;
ActionsInfo *actions;
KeyInfo dflt;
VModInfo vmods;
ActionsInfo *actions;
- xkb_atom_t group
N
ames[XKB_NUM_GROUPS];
+ xkb_atom_t group
_n
ames[XKB_NUM_GROUPS];
darray(ModMapEntry) modMaps;
struct xkb_keymap *keymap;
darray(ModMapEntry) modMaps;
struct xkb_keymap *keymap;
@@
-558,10
+558,10
@@
MergeIncludedSymbols(SymbolsInfo *into, SymbolsInfo *from,
from->name = NULL;
}
for (i = 0; i < XKB_NUM_GROUPS; i++) {
from->name = NULL;
}
for (i = 0; i < XKB_NUM_GROUPS; i++) {
- if (from->group
N
ames[i] != XKB_ATOM_NONE) {
+ if (from->group
_n
ames[i] != XKB_ATOM_NONE) {
if ((merge != MERGE_AUGMENT) ||
if ((merge != MERGE_AUGMENT) ||
- (into->group
N
ames[i] == XKB_ATOM_NONE))
- into->group
Names[i] = from->groupN
ames[i];
+ (into->group
_n
ames[i] == XKB_ATOM_NONE))
+ into->group
_names[i] = from->group_n
ames[i];
}
}
}
}
@@
-773,7
+773,7
@@
AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx,
LongKeyNameText(keyi->name),
ndx + 1,
xkb_atom_text(info->keymap->ctx,
LongKeyNameText(keyi->name),
ndx + 1,
xkb_atom_text(info->keymap->ctx,
- info->group
N
ames[ndx]),
+ info->group
_n
ames[ndx]),
nSyms);
leveli->sym_index = 0;
leveli->num_syms = 0;
nSyms);
leveli->sym_index = 0;
leveli->num_syms = 0;
@@
-1056,7
+1056,7
@@
SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
return false;
}
return false;
}
- info->group
N
ames[grp - 1 + info->explicit_group] = name;
+ info->group
_n
ames[grp - 1 + info->explicit_group] = name;
return true;
}
return true;
}
@@
-1663,8
+1663,8
@@
CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info)
keymap->symbols_section_name = strdup_safe(info->name);
for (i = 0; i < XKB_NUM_GROUPS; i++)
keymap->symbols_section_name = strdup_safe(info->name);
for (i = 0; i < XKB_NUM_GROUPS; i++)
- if (info->group
N
ames[i] != XKB_ATOM_NONE)
- keymap->group_names[i] = info->group
N
ames[i];
+ if (info->group
_n
ames[i] != XKB_ATOM_NONE)
+ keymap->group_names[i] = info->group
_n
ames[i];
darray_foreach(keyi, info->keys)
if (!CopySymbolsDef(info, keyi))
darray_foreach(keyi, info->keys)
if (!CopySymbolsDef(info, keyi))