From 0a383146c57d85c6d73b28a69beb86657060ec05 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 3 Jan 2018 12:45:11 +0100 Subject: [PATCH] doc: Correct remaining qdoc warnings in qvariant.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang required adding template clauses to several \fn commands. Change-Id: I1ee9855c626b41e499392c05160df01daa5c0618 Reviewed-by: Topi Reiniƶ --- src/corelib/kernel/qvariant.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 29429b5e55..dcd8974848 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3776,7 +3776,7 @@ void* QVariant::data() \warning Null variants is not a single state and two null variants may easily return \c false on the == operator if they do not contain similar null values. - \sa QVariant(Type), convert(int) + \sa convert(int) */ bool QVariant::isNull() const { @@ -3820,7 +3820,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) #endif -/*! \fn void QVariant::setValue(const T &value) +/*! \fn template void QVariant::setValue(const T &value) Stores a copy of \a value. If \c{T} is a type that QVariant doesn't support, QMetaType is used to store the value. A compile @@ -3833,7 +3833,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa value(), fromValue(), canConvert() */ -/*! \fn T QVariant::value() const +/*! \fn template T QVariant::value() const Returns the stored value converted to the template type \c{T}. Call canConvert() to find out whether a type can be converted. @@ -3877,7 +3877,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa convert() */ -/*! \fn static QVariant QVariant::fromValue(const T &value) +/*! \fn template static QVariant QVariant::fromValue(const T &value) Returns a QVariant containing a copy of \a value. Behaves exactly like setValue() otherwise. @@ -3893,7 +3893,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) */ /*! - \fn QVariant qVariantFromValue(const T &value) + \fn template QVariant qVariantFromValue(const T &value) \relates QVariant \obsolete @@ -3914,7 +3914,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa QVariant::fromValue() */ -/*! \fn void qVariantSetValue(QVariant &variant, const T &value) +/*! \fn template void qVariantSetValue(QVariant &variant, const T &value) \relates QVariant \obsolete @@ -3931,7 +3931,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) */ /*! - \fn T qvariant_cast(const QVariant &value) + \fn template T qvariant_cast(const QVariant &value) \relates QVariant Returns the given \a value converted to the template type \c{T}. @@ -3941,7 +3941,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa QVariant::value() */ -/*! \fn T qVariantValue(const QVariant &value) +/*! \fn template T qVariantValue(const QVariant &value) \relates QVariant \obsolete