From 8e46ac8d05bec962f747a1334390ca90cc536acf Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 15 May 2023 12:28:35 +0200 Subject: [PATCH] Doc: fix warnings from parameters not matching the documentation Change-Id: I6588336e12db0a3af9b9dfd2ab22a3e1b7c54238 Reviewed-by: Safiyyah Moosa Reviewed-by: Thiago Macieira --- src/corelib/thread/qthreadpool.cpp | 10 +++++----- src/gui/text/qfont.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index a6c2a7e54b2..fb7ef030601 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -521,9 +521,9 @@ void QThreadPool::start(QRunnable *runnable, int priority) \overload \since 5.15 - Reserves a thread and uses it to run \a functionToRun, unless this thread will + Reserves a thread and uses it to run \a callableToRun, unless this thread will make the current thread count exceed maxThreadCount(). In that case, - \a functionToRun is added to a run queue instead. The \a priority argument can + \a callableToRun is added to a run queue instead. The \a priority argument can be used to control the run queue's order of execution. \note This function participates in overload resolution only if \c Callable @@ -566,10 +566,10 @@ bool QThreadPool::tryStart(QRunnable *runnable) \fn template> bool QThreadPool::tryStart(Callable &&callableToRun) \overload \since 5.15 - Attempts to reserve a thread to run \a functionToRun. + Attempts to reserve a thread to run \a callableToRun. If no threads are available at the time of calling, then this function - does nothing and returns \c false. Otherwise, \a functionToRun is run immediately + does nothing and returns \c false. Otherwise, \a callableToRun is run immediately using one available thread and this function returns \c true. \note This function participates in overload resolution only if \c Callable @@ -796,7 +796,7 @@ void QThreadPool::startOnReservedThread(QRunnable *runnable) \since 6.3 Releases a thread previously reserved with reserveThread() and uses it - to run \a functionToRun. + to run \a callableToRun. \note This function participates in overload resolution only if \c Callable is a function or function object which can be called with zero arguments. diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 94529badec9..01f0b478dcb 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2326,10 +2326,10 @@ void QFont::setFontFeature(const char *fontFeature, quint32 value) \sa setFontFeatures(), setFontFeature(), fontFeatures() */ -void QFont::unsetFontFeature(quint32 tag) +void QFont::unsetFontFeature(quint32 fontFeature) { d->detachButKeepEngineData(this); - d->unsetFontFeature(tag); + d->unsetFontFeature(fontFeature); resolve_mask |= QFont::FontFeaturesResolved; }