From d082bf07a94b637f4dd9bb8614b0876cdd83789b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 13 Jun 2023 10:37:15 +0200 Subject: [PATCH] Mark all ctors of [[nodiscard]] classes as Q_NODISCARD_CTOR This works around around the difference in class-level [[nodiscard]] behavior between Clang and GCC. While Clang already warns about QClass(~~~args~~~); when QClass is marked as [[nodiscard]] at the class level, GCC does not, and requires the ctor to be marked as [[nodiscard]] instead. Fixes: QTBUG-104164 Change-Id: Ifd7076ee422fb9472ae8bbba43d9bfeee1968a78 Reviewed-by: Thiago Macieira Reviewed-by: Fabian Kosmale (cherry picked from commit 603d6351cc32d07a5e4c349d6dc3db0889c3b120) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qfile.h | 1 + src/corelib/kernel/qproperty.h | 6 ++++++ src/corelib/kernel/qproperty_p.h | 1 + src/corelib/tools/qatomicscopedvaluerollback_p.h | 6 ++++++ src/corelib/tools/qscopedpointer.h | 3 +++ src/corelib/tools/qscopedvaluerollback.h | 2 ++ src/corelib/tools/qscopeguard.h | 3 +++ 7 files changed, 22 insertions(+) diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index cb06665a9f3..1153ba76869 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -41,6 +41,7 @@ class [[nodiscard]] QNtfsPermissionCheckGuard { Q_DISABLE_COPY_MOVE(QNtfsPermissionCheckGuard) public: + Q_NODISCARD_CTOR QNtfsPermissionCheckGuard() { qEnableNtfsPermissionChecks(); diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index e45d532fb94..3ed977d16ee 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -57,6 +57,7 @@ class [[nodiscard]] QScopedPropertyUpdateGroup { Q_DISABLE_COPY_MOVE(QScopedPropertyUpdateGroup) public: + Q_NODISCARD_CTOR QScopedPropertyUpdateGroup() { Qt::beginPropertyUpdateGroup(); } ~QScopedPropertyUpdateGroup() noexcept(false) @@ -290,6 +291,7 @@ class [[nodiscard]] QPropertyChangeHandler : public QPropertyObserver { Functor m_handler; public: + Q_NODISCARD_CTOR QPropertyChangeHandler(Functor handler) : QPropertyObserver([](QPropertyObserver *self, QUntypedPropertyData *) { auto This = static_cast*>(self); @@ -300,6 +302,7 @@ public: } template + Q_NODISCARD_CTOR QPropertyChangeHandler(const Property &property, Functor handler) : QPropertyObserver([](QPropertyObserver *self, QUntypedPropertyData *) { auto This = static_cast*>(self); @@ -315,8 +318,10 @@ class [[nodiscard]] QPropertyNotifier : public QPropertyObserver { std::function m_handler; public: + Q_NODISCARD_CTOR QPropertyNotifier() = default; template + Q_NODISCARD_CTOR QPropertyNotifier(Functor handler) : QPropertyObserver([](QPropertyObserver *self, QUntypedPropertyData *) { auto This = static_cast(self); @@ -327,6 +332,7 @@ public: } template + Q_NODISCARD_CTOR QPropertyNotifier(const Property &property, Functor handler) : QPropertyObserver([](QPropertyObserver *self, QUntypedPropertyData *) { auto This = static_cast(self); diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 5b1d0eb2739..9946482d7f1 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -99,6 +99,7 @@ struct [[nodiscard]] QPropertyObserverNodeProtector Q_DISABLE_COPY_MOVE(QPropertyObserverNodeProtector) QPropertyObserverBase m_placeHolder; + Q_NODISCARD_CTOR QPropertyObserverNodeProtector(QPropertyObserver *observer) { // insert m_placeholder after observer into the linked list diff --git a/src/corelib/tools/qatomicscopedvaluerollback_p.h b/src/corelib/tools/qatomicscopedvaluerollback_p.h index 147156d5854..e70889c288d 100644 --- a/src/corelib/tools/qatomicscopedvaluerollback_p.h +++ b/src/corelib/tools/qatomicscopedvaluerollback_p.h @@ -52,11 +52,13 @@ public: // // std::atomic: // + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(std::atomic &var, std::memory_order mo = std::memory_order_seq_cst) : m_atomic(var), m_value(var.load(mo)), m_mo(mo) {} + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(std::atomic &var, T value, std::memory_order mo = std::memory_order_seq_cst) @@ -65,11 +67,13 @@ public: // // Q(Basic)AtomicInteger: // + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(QBasicAtomicInteger &var, std::memory_order mo = std::memory_order_seq_cst) : QAtomicScopedValueRollback(var._q_value, mo) {} + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(QBasicAtomicInteger &var, T value, std::memory_order mo = std::memory_order_seq_cst) @@ -78,11 +82,13 @@ public: // // Q(Basic)AtomicPointer: // + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(QBasicAtomicPointer> &var, std::memory_order mo = std::memory_order_seq_cst) : QAtomicScopedValueRollback(var._q_value, mo) {} + Q_NODISCARD_CTOR explicit constexpr QAtomicScopedValueRollback(QBasicAtomicPointer> &var, T value, std::memory_order mo = std::memory_order_seq_cst) diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 1637bb40a5a..a8da14b769d 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -70,6 +70,7 @@ template > class [[nodiscard]] QScopedPointer { public: + Q_NODISCARD_CTOR explicit QScopedPointer(T *p = nullptr) noexcept : d(p) { } @@ -192,10 +193,12 @@ class [[nodiscard]] QScopedArrayPointer : public QScopedPointer template using if_same_type = typename std::enable_if::type, Ptr>::value, bool>::type; public: + Q_NODISCARD_CTOR inline QScopedArrayPointer() : QScopedPointer(nullptr) {} inline ~QScopedArrayPointer() = default; template = true> + Q_NODISCARD_CTOR explicit QScopedArrayPointer(D *p) : QScopedPointer(p) { diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h index 53a31e46759..6e724886f4a 100644 --- a/src/corelib/tools/qscopedvaluerollback.h +++ b/src/corelib/tools/qscopedvaluerollback.h @@ -12,11 +12,13 @@ template class [[nodiscard]] QScopedValueRollback { public: + Q_NODISCARD_CTOR explicit constexpr QScopedValueRollback(T &var) : varRef(var), oldValue(var) { } + Q_NODISCARD_CTOR explicit constexpr QScopedValueRollback(T &var, T value) : varRef(var), oldValue(std::move(var)) // ### C++20: std::exchange(var, std::move(value)) { diff --git a/src/corelib/tools/qscopeguard.h b/src/corelib/tools/qscopeguard.h index 5bd202ce336..0d756ebbd9f 100644 --- a/src/corelib/tools/qscopeguard.h +++ b/src/corelib/tools/qscopeguard.h @@ -16,16 +16,19 @@ template class [[nodiscard]] QScopeGuard { public: + Q_NODISCARD_CTOR explicit QScopeGuard(F &&f) noexcept : m_func(std::move(f)) { } + Q_NODISCARD_CTOR explicit QScopeGuard(const F &f) noexcept : m_func(f) { } + Q_NODISCARD_CTOR QScopeGuard(QScopeGuard &&other) noexcept : m_func(std::move(other.m_func)) , m_invoke(std::exchange(other.m_invoke, false))