From 2c07d59092a62557cb4fe8f4a72b6fecf9a39020 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 13 Jun 2023 09:34:12 +0200 Subject: [PATCH] Q(Read|Write)Locker: mark ctors [[nodiscard]] They're RAII classes, and RAII class' constructors should be marked [[nodiscard]]. Task-number: QTBUG-104164 Change-Id: I9b91c18e67e99bf84abdd12236a18a8c4ec39620 Reviewed-by: Thiago Macieira (cherry picked from commit 6dba28419bf6e8ee401708650bb60347bb79d978) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qreadwritelock.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index a00c0262fa7..6ca9be440ae 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -92,6 +92,7 @@ bool QReadWriteLock::tryLockForWrite(int timeout) class QT6_ONLY(Q_CORE_EXPORT) QReadLocker { public: + Q_NODISCARD_CTOR inline QReadLocker(QReadWriteLock *readWriteLock); inline ~QReadLocker() @@ -136,6 +137,7 @@ inline QReadLocker::QReadLocker(QReadWriteLock *areadWriteLock) class QT6_ONLY(Q_CORE_EXPORT) QWriteLocker { public: + Q_NODISCARD_CTOR inline QWriteLocker(QReadWriteLock *readWriteLock); inline ~QWriteLocker() @@ -210,6 +212,7 @@ private: class QT6_ONLY(Q_CORE_EXPORT) QReadLocker { public: + Q_NODISCARD_CTOR inline explicit QReadLocker(QReadWriteLock *) noexcept { } inline ~QReadLocker() noexcept { } @@ -224,6 +227,7 @@ private: class QT6_ONLY(Q_CORE_EXPORT) QWriteLocker { public: + Q_NODISCARD_CTOR inline explicit QWriteLocker(QReadWriteLock *) noexcept { } inline ~QWriteLocker() noexcept { }