qobject: Add helper macros for common scalar insertions
Rather than making lots of callers wrap a scalar in a QInt, QString, or QBool, provide helper macros that do the wrapping automatically. Update the Coccinelle script to make mass conversions easy, although the conversion itself will be done as a separate patches to ease review and backport efforts. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20170427215821.19397-6-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
de6e7951fe
commit
a92c21591b
|
@ -52,6 +52,14 @@ void qdict_destroy_obj(QObject *obj);
|
||||||
#define qdict_put(qdict, key, obj) \
|
#define qdict_put(qdict, key, obj) \
|
||||||
qdict_put_obj(qdict, key, QOBJECT(obj))
|
qdict_put_obj(qdict, key, QOBJECT(obj))
|
||||||
|
|
||||||
|
/* Helpers for int, bool, and string */
|
||||||
|
#define qdict_put_int(qdict, key, value) \
|
||||||
|
qdict_put(qdict, key, qint_from_int(value))
|
||||||
|
#define qdict_put_bool(qdict, key, value) \
|
||||||
|
qdict_put(qdict, key, qbool_from_bool(value))
|
||||||
|
#define qdict_put_str(qdict, key, value) \
|
||||||
|
qdict_put(qdict, key, qstring_from_str(value))
|
||||||
|
|
||||||
/* High level helpers */
|
/* High level helpers */
|
||||||
double qdict_get_double(const QDict *qdict, const char *key);
|
double qdict_get_double(const QDict *qdict, const char *key);
|
||||||
int64_t qdict_get_int(const QDict *qdict, const char *key);
|
int64_t qdict_get_int(const QDict *qdict, const char *key);
|
||||||
|
|
|
@ -29,6 +29,14 @@ typedef struct QList {
|
||||||
#define qlist_append(qlist, obj) \
|
#define qlist_append(qlist, obj) \
|
||||||
qlist_append_obj(qlist, QOBJECT(obj))
|
qlist_append_obj(qlist, QOBJECT(obj))
|
||||||
|
|
||||||
|
/* Helpers for int, bool, and string */
|
||||||
|
#define qlist_append_int(qlist, value) \
|
||||||
|
qlist_append(qlist, qint_from_int(value))
|
||||||
|
#define qlist_append_bool(qlist, value) \
|
||||||
|
qlist_append(qlist, qbool_from_bool(value))
|
||||||
|
#define qlist_append_str(qlist, value) \
|
||||||
|
qlist_append(qlist, qstring_from_str(value))
|
||||||
|
|
||||||
#define QLIST_FOREACH_ENTRY(qlist, var) \
|
#define QLIST_FOREACH_ENTRY(qlist, var) \
|
||||||
for ((var) = ((qlist)->head.tqh_first); \
|
for ((var) = ((qlist)->head.tqh_first); \
|
||||||
(var); \
|
(var); \
|
||||||
|
|
|
@ -2,12 +2,34 @@
|
||||||
@@
|
@@
|
||||||
expression Obj, Key, E;
|
expression Obj, Key, E;
|
||||||
@@
|
@@
|
||||||
|
(
|
||||||
- qdict_put_obj(Obj, Key, QOBJECT(E));
|
- qdict_put_obj(Obj, Key, QOBJECT(E));
|
||||||
+ qdict_put(Obj, Key, E);
|
+ qdict_put(Obj, Key, E);
|
||||||
|
|
|
||||||
|
- qdict_put(Obj, Key, qint_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
|
// Use QList macros where they make sense
|
||||||
@@
|
@@
|
||||||
expression Obj, E;
|
expression Obj, E;
|
||||||
@@
|
@@
|
||||||
|
(
|
||||||
- qlist_append_obj(Obj, QOBJECT(E));
|
- qlist_append_obj(Obj, QOBJECT(E));
|
||||||
+ qlist_append(Obj, E);
|
+ qlist_append(Obj, E);
|
||||||
|
|
|
||||||
|
- qlist_append(Obj, qint_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);
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue