expr: drop ExprResult from ResolveKeyCode

[platform/upstream/libxkbcommon.git] / src / xkbcomp / expr.h

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index c5222a1..4712ca1 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -69,9 +69,8 @@ ExprResolveVModMask(struct xkb_keymap *keymap, ExprDef *expr,
 bool
 ExprResolveBoolean(struct xkb_context *ctx, ExprDef *expr, bool *set_rtrn);
 
-extern int
-ExprResolveKeyCode(struct xkb_context *ctx, ExprDef *expr,
-                   ExprResult *val_rtrn);
+bool
+ExprResolveKeyCode(struct xkb_context *ctx, ExprDef *expr, xkb_keycode_t *kc);
 
 extern int
 ExprResolveInteger(struct xkb_context *ctx, ExprDef *expr,
@@ -80,8 +79,9 @@ ExprResolveInteger(struct xkb_context *ctx, ExprDef *expr,
 extern int
 ExprResolveLevel(struct xkb_context *ctx, ExprDef *expr, ExprResult *val_rtrn);
 
-extern int
-ExprResolveGroup(struct xkb_context *ctx, ExprDef *expr, ExprResult *val_rtrn);
+bool
+ExprResolveGroup(struct xkb_context *ctx, ExprDef *expr,
+                 xkb_group_index_t *group_rtrn);
 
 extern int
 ExprResolveButton(struct xkb_context *ctx, ExprDef *expr,