summaryrefslogtreecommitdiff
path: root/src/xkbcomp/expr.h
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-05-09 15:03:11 +0300
committerDaniel Stone <daniel@fooishbar.org>2012-05-09 17:52:26 +0100
commite7bb1e5fd99438b69bb7ce8c29de381d55c95b96 (patch)
tree62628e25b97ef542154fd00590dc1509b5d8248f /src/xkbcomp/expr.h
parent699a0b841c26020815cf276980ad5ccaded7494a (diff)
downloadlibxkbcommon-e7bb1e5fd99438b69bb7ce8c29de381d55c95b96.tar.gz
libxkbcommon-e7bb1e5fd99438b69bb7ce8c29de381d55c95b96.tar.bz2
libxkbcommon-e7bb1e5fd99438b69bb7ce8c29de381d55c95b96.zip
Shorten context to ctx
(This breaks the API.) "context" is really annoying to type all the time (and we're going to type it a lot more :). "ctx" is clear, concise and common in many other libraries. Use it! Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fix for xkb -> keymap change.]
Diffstat (limited to 'src/xkbcomp/expr.h')
-rw-r--r--src/xkbcomp/expr.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 9582234..29b46e5 100644
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -53,19 +53,19 @@ extern const char *
exprOpText(unsigned type);
extern bool
-LookupModMask(struct xkb_context *context, const void *priv, xkb_atom_t field,
+LookupModMask(struct xkb_ctx *ctx, const void *priv, xkb_atom_t field,
unsigned type, ExprResult *val_rtrn);
extern bool
-LookupVModMask(struct xkb_context *context, const void *priv, xkb_atom_t field,
+LookupVModMask(struct xkb_ctx *ctx, const void *priv, xkb_atom_t field,
unsigned type, ExprResult *val_rtrn);
extern bool
-LookupModIndex(struct xkb_context *context, const void *priv, xkb_atom_t field,
+LookupModIndex(struct xkb_ctx *ctx, const void *priv, xkb_atom_t field,
unsigned type, ExprResult *val_rtrn);
extern int
-ExprResolveModMask(struct xkb_context *context, ExprDef *expr,
+ExprResolveModMask(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
@@ -73,51 +73,51 @@ ExprResolveVModMask(ExprDef *expr, ExprResult *val_rtrn,
struct xkb_keymap *keymap);
extern int
-ExprResolveBoolean(struct xkb_context *context, ExprDef *expr,
+ExprResolveBoolean(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveKeyCode(struct xkb_context *context, ExprDef *expr,
+ExprResolveKeyCode(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveInteger(struct xkb_context *context, ExprDef *expr,
+ExprResolveInteger(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveLevel(struct xkb_context *context, ExprDef *expr,
+ExprResolveLevel(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveGroup(struct xkb_context *context, ExprDef *expr,
+ExprResolveGroup(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveButton(struct xkb_context *context, ExprDef *expr,
+ExprResolveButton(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveFloat(struct xkb_context *context, ExprDef *expr,
+ExprResolveFloat(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveString(struct xkb_context *context, ExprDef *expr,
+ExprResolveString(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveKeyName(struct xkb_context *context, ExprDef *expr,
+ExprResolveKeyName(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
extern int
-ExprResolveEnum(struct xkb_context *context, ExprDef *expr,
+ExprResolveEnum(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn, const LookupEntry *values);
extern int
-ExprResolveMask(struct xkb_context *context, ExprDef *expr,
+ExprResolveMask(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn, const LookupEntry *values);
extern int
-ExprResolveKeySym(struct xkb_context *context, ExprDef *expr,
+ExprResolveKeySym(struct xkb_ctx *ctx, ExprDef *expr,
ExprResult *val_rtrn);
#endif /* EXPR_H */