mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 23:03:54 -06:00
qapi: Replace qobject_to_X(o) by qobject_to(X, o)
This patch was generated using the following Coccinelle script: @@ expression Obj; @@ ( - qobject_to_qnum(Obj) + qobject_to(QNum, Obj) | - qobject_to_qstring(Obj) + qobject_to(QString, Obj) | - qobject_to_qdict(Obj) + qobject_to(QDict, Obj) | - qobject_to_qlist(Obj) + qobject_to(QList, Obj) | - qobject_to_qbool(Obj) + qobject_to(QBool, Obj) ) and a bit of manual fix-up for overly long lines and three places in tests/check-qjson.c that Coccinelle did not find. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-Id: <20180224154033.29559-4-mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> [eblake: swap order from qobject_to(o, X), rebase to master, also a fix to latent false-positive compiler complaint about hw/i386/acpi-build.c] Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
1a56b1e2ab
commit
7dc847ebba
51 changed files with 231 additions and 227 deletions
|
@ -479,7 +479,7 @@ static void test_visitor_in_any(TestInputVisitorData *data,
|
|||
|
||||
v = visitor_input_test_init(data, "-42");
|
||||
visit_type_any(v, NULL, &res, &error_abort);
|
||||
qnum = qobject_to_qnum(res);
|
||||
qnum = qobject_to(QNum, res);
|
||||
g_assert(qnum);
|
||||
g_assert(qnum_get_try_int(qnum, &val));
|
||||
g_assert_cmpint(val, ==, -42);
|
||||
|
@ -487,22 +487,22 @@ static void test_visitor_in_any(TestInputVisitorData *data,
|
|||
|
||||
v = visitor_input_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo' }");
|
||||
visit_type_any(v, NULL, &res, &error_abort);
|
||||
qdict = qobject_to_qdict(res);
|
||||
qdict = qobject_to(QDict, res);
|
||||
g_assert(qdict && qdict_size(qdict) == 3);
|
||||
qobj = qdict_get(qdict, "integer");
|
||||
g_assert(qobj);
|
||||
qnum = qobject_to_qnum(qobj);
|
||||
qnum = qobject_to(QNum, qobj);
|
||||
g_assert(qnum);
|
||||
g_assert(qnum_get_try_int(qnum, &val));
|
||||
g_assert_cmpint(val, ==, -42);
|
||||
qobj = qdict_get(qdict, "boolean");
|
||||
g_assert(qobj);
|
||||
qbool = qobject_to_qbool(qobj);
|
||||
qbool = qobject_to(QBool, qobj);
|
||||
g_assert(qbool);
|
||||
g_assert(qbool_get_bool(qbool) == true);
|
||||
qobj = qdict_get(qdict, "string");
|
||||
g_assert(qobj);
|
||||
qstring = qobject_to_qstring(qobj);
|
||||
qstring = qobject_to(QString, qobj);
|
||||
g_assert(qstring);
|
||||
g_assert_cmpstr(qstring_get_str(qstring), ==, "foo");
|
||||
qobject_decref(res);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue