summaryrefslogtreecommitdiff
path: root/json-glib/json-parser.h
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@openedhand.com>2008-02-29 12:10:16 +0000
committerEmmanuele Bassi <ebassi@openedhand.com>2008-02-29 12:10:16 +0000
commit8537549a5a65f3111a4436b69499664c167b1534 (patch)
tree9aa0b06c58a59fedaa4dcbcd65da4ffe9e89187a /json-glib/json-parser.h
parent1ddd45d36a3a25aa86a95c60e0c29e83687971bd (diff)
downloadjson-glib-8537549a5a65f3111a4436b69499664c167b1534.tar.gz
Move JsonTokenType into JsonScanner
The GTokenType extension enumeration belongs with the tokenizer.
Diffstat (limited to 'json-glib/json-parser.h')
-rw-r--r--json-glib/json-parser.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/json-glib/json-parser.h b/json-glib/json-parser.h
index a31e0ff..bbe2a18 100644
--- a/json-glib/json-parser.h
+++ b/json-glib/json-parser.h
@@ -51,17 +51,6 @@ typedef enum {
JSON_PARSER_ERROR_UNKNOWN
} JsonParserError;
-typedef enum {
- JSON_TOKEN_INVALID = G_TOKEN_LAST,
-
- JSON_TOKEN_TRUE,
- JSON_TOKEN_FALSE,
- JSON_TOKEN_NULL,
- JSON_TOKEN_VAR,
-
- JSON_TOKEN_LAST
-} JsonTokenType;
-
/**
* JsonParser:
*
@@ -129,8 +118,8 @@ struct _JsonParserClass
void (* _json_reserved8) (void);
};
-GQuark json_parser_error_quark (void);
-GType json_parser_get_type (void) G_GNUC_CONST;
+GQuark json_parser_error_quark (void);
+GType json_parser_get_type (void) G_GNUC_CONST;
JsonParser *json_parser_new (void);
gboolean json_parser_load_from_file (JsonParser *parser,