From f08ed1fa8a45955df537767df7d741be491cba4d Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 5 Mar 2012 17:43:33 -0500 Subject: [PATCH 06/98] QDict: Rename 'err_value' A missing key is not an error. Signed-off-by: Luiz Capitulino (cherry picked from commit 83aba69ec05e17ff34708a5b7a3b719dac5c8fc0) Signed-off-by: Jeff Cody Signed-off-by: Michal Novotny --- qdict.c | 6 +++--- qdict.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qdict.c b/qdict.c index 59e3c39..46926d3 100644 --- a/qdict.c +++ b/qdict.c @@ -293,16 +293,16 @@ const char *qdict_get_str(const QDict *qdict, const char *key) * * Return integer mapped by 'key', if it is not present in * the dictionary or if the stored object is not of QInt type - * 'err_value' will be returned. + * 'def_value' will be returned. */ int64_t qdict_get_try_int(const QDict *qdict, const char *key, - int64_t err_value) + int64_t def_value) { QObject *obj; obj = qdict_get(qdict, key); if (!obj || qobject_type(obj) != QTYPE_QINT) - return err_value; + return def_value; return qint_get_int(qobject_to_qint(obj)); } diff --git a/qdict.h b/qdict.h index 9804782..920a09d 100644 --- a/qdict.h +++ b/qdict.h @@ -48,7 +48,7 @@ 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); int64_t qdict_get_try_int(const QDict *qdict, const char *key, - int64_t err_value); + int64_t def_value); const char *qdict_get_try_str(const QDict *qdict, const char *key); #endif /* QDICT_H */ -- 1.7.7.6