expr: make ResolveString return an atom

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

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 7a2bf78..3d8f5c1 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -24,19 +24,14 @@
  *
  ********************************************************/
 
-#ifndef EXPR_H
-#define EXPR_H 1
-
-#include "xkbcomp-priv.h"
+#ifndef XKBCOMP_EXPR_H
+#define XKBCOMP_EXPR_H
 
 typedef struct _LookupEntry {
     const char *name;
     unsigned int value;
 } LookupEntry;
 
-extern const char *
-exprOpText(enum expr_op_type op);
-
 bool
 ExprResolveLhs(struct xkb_context *ctx, const ExprDef *expr,
                const char **elem_rtrn, const char **field_rtrn,
@@ -88,7 +83,7 @@ ExprResolveButton(struct xkb_context *ctx, const ExprDef *expr,
 
 bool
 ExprResolveString(struct xkb_context *ctx, const ExprDef *expr,
-                  const char **val_rtrn);
+                  xkb_atom_t *val_rtrn);
 
 bool
 ExprResolveKeyName(struct xkb_context *ctx, const ExprDef *expr,
@@ -106,4 +101,4 @@ bool
 ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr,
                   xkb_keysym_t *sym_rtrn);
 
-#endif /* EXPR_H */
+#endif