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/qcborvalue.cpp | |
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/qcborvalue.cpp')
-rw-r--r-- | src/corelib/serialization/qcborvalue.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index c61a7f7eae..96d3feaf1b 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -1832,17 +1832,20 @@ QCborValue::QCborValue(const QCborMap &m) } /*! + \fn QCborValue::QCborValue(QCborTag t, const QCborValue &tv) + \fn QCborValue::QCborValue(QCborKnownTags t, const QCborValue &tv) + Creates a QCborValue for the extended type represented by the tag value \a - tag, tagging value \a tv. The tag can later be retrieved using tag() and + t, tagging value \a tv. The tag can later be retrieved using tag() and the tagged value using taggedValue(). \sa isTag(), tag(), taggedValue(), QCborKnownTags */ -QCborValue::QCborValue(QCborTag tag, const QCborValue &tv) +QCborValue::QCborValue(QCborTag t, const QCborValue &tv) : n(-1), container(new QCborContainerPrivate), t(Tag) { container->ref.store(1); - container->append(tag); + container->append(t); container->append(tv); } |