On Thu, 15 Apr 2010 11:06:56 -0300
Miguel Di Ciurcio Filho <miguel.fi...@gmail.com> wrote:
> This is a helper function that converts a QDict to a QString, using the
> format:
>
> key1=value1 SPACE key2=value2 SPACE key3=value3
>
> Handy for debugging and other things.
Something I don't remember if we talked about is: why not use commas
instead of whitespaces?
I believe it's because there's a trailing whitespace there ;) I don't
think it's difficult to add a qstring_rstrip() though.
>
> Signed-off-by: Miguel Di Ciurcio Filho <miguel.fi...@gmail.com>
> ---
> qdict.c | 41 +++++++++++++++++++++++++++++++++++++++++
> qdict.h | 3 +++
> 2 files changed, 44 insertions(+), 0 deletions(-)
>
> diff --git a/qdict.c b/qdict.c
> index aae57bf..fddade0 100644
> --- a/qdict.c
> +++ b/qdict.c
> @@ -324,6 +324,47 @@ void qdict_iter(const QDict *qdict,
> }
> }
>
> +void qdict_to_qstring_iter(const char *key, QObject *obj, void *opaque)
> +{
> + QString *str = opaque;
> +
> + qstring_append(str, key);
> + qstring_append(str, "=");
> + switch (qobject_type(obj)) {
> + case QTYPE_QSTRING:
> + qstring_append(str, qstring_get_str(qobject_to_qstring(obj)));
> + break;
> + case QTYPE_QINT:
> + qstring_append_int(str, qint_get_int(qobject_to_qint(obj)));
> + break;
> + case QTYPE_QBOOL:
> + qstring_append(str, qbool_get_int(qobject_to_qbool(obj)) ? "true" :
> + "false" );
> + break;
> + default:
> + qstring_append(str, "NULL");
> + }
> +
> + qstring_append(str, " ");
> +}
> +
> +/**
> + * qdict_to_qstring(): Format a string with the keys and values of a QDict.
> + *
> + * Nested lists and dicts are not supported, yet.
> + *
> + * Return a pointer to a QString, with the following format:
> + * key1=value1 SPACE key2=value2 SPACE key3=value3
> + */
> +QString *qdict_to_qstring(const QDict *qdict)
> +{
> + QString *str;
> + str = qstring_new();
> + qdict_iter(qdict, qdict_to_qstring_iter, str);
> +
> + return str;
> +}
> +
> /**
> * qentry_destroy(): Free all the memory allocated by a QDictEntry
> */
> diff --git a/qdict.h b/qdict.h
> index 579dcdd..6731555 100644
> --- a/qdict.h
> +++ b/qdict.h
> @@ -3,6 +3,7 @@
>
> #include "qobject.h"
> #include "qlist.h"
> +#include "qstring.h"
> #include "qemu-queue.h"
> #include <stdint.h>
>
> @@ -43,6 +44,8 @@ int qdict_get_bool(const QDict *qdict, const char *key);
> QList *qdict_get_qlist(const QDict *qdict, const char *key);
> QDict *qdict_get_qdict(const QDict *qdict, const char *key);
> const char *qdict_get_str(const QDict *qdict, const char *key);
> +void qdict_to_qstring_iter(const char *key, QObject *obj, void *opaque);
> +QString *qdict_to_qstring(const QDict *qdict);
> int64_t qdict_get_try_int(const QDict *qdict, const char *key,
> int64_t err_value);
> const char *qdict_get_try_str(const QDict *qdict, const char *key);
