diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-08-21 22:54:17 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-08-23 11:17:43 +0200 |
commit | 4527b2d16537e7b6b6b8733117f536435d99175f (patch) | |
tree | 87ae97a782aea2887ddc9fad06b0a55b2e601ab3 /src/widgets/dialogs | |
parent | 550623a8eff6cf9422caa75b9e30111821941aac (diff) |
QAutoPointer: port to explicit operator bool
Change-Id: Ic8ec02d7225e884bfd98d93398502a8b8b825da8
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qdialog_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 74f775a0bd..0c31593ced 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -137,8 +137,6 @@ private: template <typename T> class QAutoPointer { QPointer<T> o; - struct internal { void func() {} }; - typedef void (internal::*RestrictedBool)(); public: explicit QAutoPointer(T *t) noexcept : o(t) {} ~QAutoPointer() { delete o; } @@ -146,7 +144,7 @@ public: T *operator->() const noexcept { return get(); } T *get() const noexcept { return o; } T &operator*() const { return *get(); } - operator RestrictedBool() const noexcept { return o ? &internal::func : nullptr; } + explicit operator bool() const noexcept { return !o.isNull(); } bool operator!() const noexcept { return !o; } private: Q_DISABLE_COPY(QAutoPointer); |