From 467c112d12c78d2d74ae53acde6e794bb4a67012 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 15 Jun 2018 06:15:22 -0700 Subject: QCborValue: fix warning about shadowing members qcborvalue.h:145:9: error: declaration of 'taggedValue' shadows a member of 'this' [-Werror=shadow] Newer versions of GCC don't warn for variable shadowing a member function. Task-number: QTBUG-68889 Change-Id: I6efb28c3145047559ec0fffd153857b856267d6d Reviewed-by: Liang Qi --- src/corelib/serialization/qcbormap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/corelib/serialization/qcbormap.h') diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index a3eddfea20..63bfa154fa 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -269,28 +269,28 @@ public: const_iterator find(const QString & key) const { return constFind(key); } const_iterator find(const QCborValue &key) const { return constFind(key); } - iterator insert(qint64 key, const QCborValue &value) + iterator insert(qint64 key, const QCborValue &value_) { QCborValueRef v = operator[](key); // detaches - v = value; + v = value_; return { d.data(), v.i }; } - iterator insert(QLatin1String key, const QCborValue &value) + iterator insert(QLatin1String key, const QCborValue &value_) { QCborValueRef v = operator[](key); // detaches - v = value; + v = value_; return { d.data(), v.i }; } - iterator insert(const QString &key, const QCborValue &value) + iterator insert(const QString &key, const QCborValue &value_) { QCborValueRef v = operator[](key); // detaches - v = value; + v = value_; return { d.data(), v.i }; } - iterator insert(const QCborValue &key, const QCborValue &value) + iterator insert(const QCborValue &key, const QCborValue &value_) { QCborValueRef v = operator[](key); // detaches - v = value; + v = value_; return { d.data(), v.i }; } iterator insert(value_type v) { return insert(v.first, v.second); } -- cgit v1.2.3