The recent commit b097efc0
used qobject_decref(QOBJECT(E)), even
though we already have QDECREF(E) for that purpose. We can update
our coccinelle script to catch any future relapses; with that in
place, the rest of the patch is generated with:
spatch --sp-file scripts/coccinelle/qobject.cocci \
--macro-file scripts/cocci-macro-file.h --dir . --in-place
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170624181008.25497-3-eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
42 lines
804 B
Plaintext
42 lines
804 B
Plaintext
// Use QDict macros where they make sense
|
|
@@
|
|
expression Obj, Key, E;
|
|
@@
|
|
(
|
|
- qobject_incref(QOBJECT(E));
|
|
+ QINCREF(E);
|
|
|
|
|
- qobject_decref(QOBJECT(E));
|
|
+ QDECREF(E);
|
|
|
|
|
- qdict_put_obj(Obj, Key, QOBJECT(E));
|
|
+ qdict_put(Obj, Key, E);
|
|
|
|
|
- qdict_put(Obj, Key, qnum_from_int(E));
|
|
+ qdict_put_int(Obj, Key, E);
|
|
|
|
|
- qdict_put(Obj, Key, qbool_from_bool(E));
|
|
+ qdict_put_bool(Obj, Key, E);
|
|
|
|
|
- qdict_put(Obj, Key, qstring_from_str(E));
|
|
+ qdict_put_str(Obj, Key, E);
|
|
)
|
|
|
|
// Use QList macros where they make sense
|
|
@@
|
|
expression Obj, E;
|
|
@@
|
|
(
|
|
- qlist_append_obj(Obj, QOBJECT(E));
|
|
+ qlist_append(Obj, E);
|
|
|
|
|
- qlist_append(Obj, qnum_from_int(E));
|
|
+ qlist_append_int(Obj, E);
|
|
|
|
|
- qlist_append(Obj, qbool_from_bool(E));
|
|
+ qlist_append_bool(Obj, E);
|
|
|
|
|
- qlist_append(Obj, qstring_from_str(E));
|
|
+ qlist_append_str(Obj, E);
|
|
)
|