From fc48ffc39ed1060856475e4320d5896f26c945e8 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 15 May 2015 16:24:59 -0600 Subject: qobject: Use 'bool' for qbool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We require a C99 compiler, so let's use 'bool' instead of 'int' when dealing with boolean values. There are few enough clients to fix them all in one pass. Signed-off-by: Eric Blake Reviewed-by: Andreas Färber Reviewed-by: Alberto Garcia Acked-by: Luiz Capitulino Signed-off-by: Markus Armbruster --- qobject/json-parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qobject/json-parser.c') diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 717cb8f..015d785 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -558,9 +558,9 @@ static QObject *parse_keyword(JSONParserContext *ctxt) } if (token_is_keyword(token, "true")) { - ret = QOBJECT(qbool_from_int(true)); + ret = QOBJECT(qbool_from_bool(true)); } else if (token_is_keyword(token, "false")) { - ret = QOBJECT(qbool_from_int(false)); + ret = QOBJECT(qbool_from_bool(false)); } else if (token_is_keyword(token, "null")) { ret = qnull(); } else { @@ -593,7 +593,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap) if (token_is_escape(token, "%p")) { obj = va_arg(*ap, QObject *); } else if (token_is_escape(token, "%i")) { - obj = QOBJECT(qbool_from_int(va_arg(*ap, int))); + obj = QOBJECT(qbool_from_bool(va_arg(*ap, int))); } else if (token_is_escape(token, "%d")) { obj = QOBJECT(qint_from_int(va_arg(*ap, int))); } else if (token_is_escape(token, "%ld")) { -- cgit v1.1