From 50150e3b4edc8728c86e1cfddf83ebec80f4458c Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 23 May 2023 12:45:42 +0000 Subject: [PATCH] Doc: Add \relates command to two global swap() functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And fix incorrect copy-paste error in QBasicTimer's swap() description, 'string' -> 'timer'. Change-Id: I28f5e4d6c8e3b8698ab9b4587d503b06c5628b78 Reviewed-by: Topi Reiniö (cherry picked from commit 2f283489ef6a2f77c6a5ecc85a4f2c109969d393) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/ipc/qtipccommon.cpp | 13 ++++++++++--- src/corelib/kernel/qbasictimer.cpp | 12 ++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/corelib/ipc/qtipccommon.cpp b/src/corelib/ipc/qtipccommon.cpp index 1dcc774c855..be9383f38aa 100644 --- a/src/corelib/ipc/qtipccommon.cpp +++ b/src/corelib/ipc/qtipccommon.cpp @@ -403,10 +403,17 @@ void QNativeIpcKey::destroy_internal() noexcept /*! \fn QNativeIpcKey::swap(QNativeIpcKey &other) noexcept - \fn swap(QNativeIpcKey &lhs, QNativeIpcKey &rhs) noexcept - Swaps the native IPC key and type \a other with this object, or \a lhs with - \a rhs. This operation is very fast and never fails. + Swaps the native IPC key and type \a other with this object. + This operation is very fast and never fails. +*/ + +/*! + \fn swap(QNativeIpcKey &value1, QNativeIpcKey &value2) noexcept + \relates QNativeIpcKey + + Swaps the native IPC key and type \a value1 with \a value2. + This operation is very fast and never fails. */ /*! diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index b843ec1ecfd..cf9c0bbccd0 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -86,10 +86,18 @@ QT_BEGIN_NAMESPACE /*! \fn QBasicTimer::swap(QBasicTimer &other) - \fn swap(QBasicTimer &lhs, QBasicTimer &rhs) \since 5.14 - Swaps string \a other with this string, or \a lhs with \a rhs. + Swaps the timer \a other with this timer. + This operation is very fast and never fails. +*/ + +/*! + \fn swap(QBasicTimer &lhs, QBasicTimer &rhs) + \relates QBasicTimer + \since 5.14 + + Swaps the timer \a lhs with \a rhs. This operation is very fast and never fails. */