diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-15 06:15:22 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-18 01:51:35 +0000 |
commit | 467c112d12c78d2d74ae53acde6e794bb4a67012 (patch) | |
tree | c316ea357b42e5067e116ed7a10067e8cef6fc79 /src/corelib/serialization/qcbormap.h | |
parent | c1345bda996d27ba51d4806150ef54b9a1150aa0 (diff) |
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 <liang.qi@qt.io>
Diffstat (limited to 'src/corelib/serialization/qcbormap.h')
-rw-r--r-- | src/corelib/serialization/qcbormap.h | 16 |
1 files changed, 8 insertions, 8 deletions
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); } |