From b4993fbbc5ce083ab999352748f504e4b254fd5e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Sat, 29 Apr 2023 10:25:54 +0000 Subject: [PATCH] Doc: Fix documentation warnings These warnings slipped in during a time period where documentation testing in the CI was disabled. src/network/kernel/qhostinfo.cpp:254: (qdoc) warning: clang couldn't find function when parsing \fn template int QHostInfo::lookupHost(const QString &name, Functor functor) src/widgets/widgets/qcheckbox.cpp:102: (qdoc) warning: clang couldn't find function when parsing \fn void QCheckBox::stateChanged(Qt::CheckState state) src/corelib/kernel/qcoreapplication.cpp:2769: (qdoc) warning: clang couldn't find function when parsing \fn template void QCoreApplication::requestPermission( const QPermission &permission, Functor functor) src/corelib/serialization/qxmlstream.cpp:3806: (qdoc) warning: clang couldn't find function when parsing \fn bool QXmlStreamAttributes::hasAttribute( const QString &qualifiedName) const src/corelib/text/qtliterals.qdoc:11: (qdoc) warning: Multiple topic commands found in comment: \namespace and \headerfile. Change-Id: I38c605f358dbca1ef3e2bfe20a6424f7a4d44b4a Reviewed-by: Volker Hilsheimer (cherry picked from commit 37dc52d4f24c216811cf14ceb8aeaa13766b249d) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qcoreapplication.cpp | 2 +- src/corelib/serialization/qxmlstream.cpp | 14 +++----------- src/corelib/text/qtliterals.qdoc | 4 ++-- src/network/kernel/qhostinfo.cpp | 2 +- src/widgets/widgets/qcheckbox.cpp | 1 + 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 579049814af..fd993eddb41 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2768,7 +2768,7 @@ Qt::PermissionStatus QCoreApplication::checkPermission(const QPermission &permis /*! \fn template void QCoreApplication::requestPermission( - const QPermission &permission, Functor functor) + const QPermission &permission, Functor &&functor) Requests the given \a permission. diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 6db7d688da2..eb54fac1bf0 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -3829,8 +3829,7 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) } /*! - \fn bool QXmlStreamAttributes::hasAttribute(const QString &qualifiedName) const - \since 4.5 + \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView qualifiedName) const Returns \c true if this QXmlStreamAttributes has an attribute whose qualified name is \a qualifiedName; otherwise returns \c false. @@ -3844,16 +3843,9 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) */ /*! - \fn bool QXmlStreamAttributes::hasAttribute(QLatin1StringView qualifiedName) const + \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView namespaceUri, + QAnyStringView name) const \overload - \since 4.5 -*/ - -/*! - \fn bool QXmlStreamAttributes::hasAttribute(const QString &namespaceUri, - const QString &name) const - \overload - \since 4.5 Returns \c true if this QXmlStreamAttributes has an attribute whose namespace URI and name correspond to \a namespaceUri and \a name; diff --git a/src/corelib/text/qtliterals.qdoc b/src/corelib/text/qtliterals.qdoc index b21de4f3585..99c478d6823 100644 --- a/src/corelib/text/qtliterals.qdoc +++ b/src/corelib/text/qtliterals.qdoc @@ -11,7 +11,7 @@ /*! \namespace Qt::Literals \inmodule QtCore - \headerfile QtLiterals + \inheaderfile QtLiterals \brief The Literals inline namespace declares literal operators for Qt types. */ @@ -19,7 +19,7 @@ /*! \namespace Qt::Literals::StringLiterals \inmodule QtCore - \headerfile QStringLiterals + \inheaderfile QStringLiterals \brief The StringLiterals namespace declares string literal operators for Qt types. diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 2283766b97b..1daac37f7be 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -262,7 +262,7 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, const char *me */ /*! - \fn template int QHostInfo::lookupHost(const QString &name, Functor functor) + \fn template int QHostInfo::lookupHost(const QString &name, Functor &&functor) \since 5.9 diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index 151c8b1e946..3679bc6aa07 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -91,6 +91,7 @@ public: /*! \fn void QCheckBox::stateChanged(int state) + //! Qt 7: \fn void QCheckBox::stateChanged(Qt::CheckState state) This signal is emitted whenever the checkbox's state changes, i.e., whenever the user checks or unchecks it.