1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAutoPointer: port to explicit operator bool

Browse Source 
Change-Id: Ic8ec02d7225e884bfd98d93398502a8b8b825da8
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2020-08-21 22:54:17 +02:00
parent 550623a8ef
commit 4527b2d165
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dialogs/qdialog_p.h
View File

@ -137,8 +137,6 @@ private:
template <typename T> template <typename T>
class QAutoPointer { class QAutoPointer {
QPointer<T> o; QPointer<T> o;
struct internal { void func() {} };
typedef void (internal::*RestrictedBool)();
public: public:
explicit QAutoPointer(T *t) noexcept : o(t) {} explicit QAutoPointer(T *t) noexcept : o(t) {}
~QAutoPointer() { delete o; } ~QAutoPointer() { delete o; }
@ -146,7 +144,7 @@ public:
T *operator->() const noexcept { return get(); } T *operator->() const noexcept { return get(); }
T *get() const noexcept { return o; } T *get() const noexcept { return o; }
T &operator*() const { return *get(); } 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; } bool operator!() const noexcept { return !o; }
private: private:
Q_DISABLE_COPY(QAutoPointer); Q_DISABLE_COPY(QAutoPointer);