diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-08 18:51:19 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-09 04:44:22 +0200 |
commit | 85c1009dbbb73fc9bee5911d70cdd96469ad8270 (patch) | |
tree | db3c98f459aab795025e68775e4b71b5084ac32d | |
parent | c55f45e875ece0624f549b0ead9d72803434931a (diff) |
QPointer: add get()
[ChangeLog][QtCore][QPointer] Added get() for STL
compatibility.
Change-Id: I84bf9d58cd92e1bc74f731c3e9002031045f8f5c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r-- | src/corelib/kernel/qpointer.cpp | 7 | ||||
-rw-r--r-- | src/corelib/kernel/qpointer.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index 068314633b..5f6826b269 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -156,6 +156,13 @@ */ /*! + \fn template <class T> T* QPointer<T>::get() const + \since 6.0 + + Same as data(). This function is provided for STL compatibility. +*/ + +/*! \fn template <class T> bool QPointer<T>::isNull() const Returns \c true if the referenced object has been destroyed or if diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 5efdb0b395..769ace5a71 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -75,6 +75,8 @@ public: inline T* data() const { return static_cast<T*>(wp.internalData()); } + inline T* get() const + { return data(); } inline T* operator->() const { return data(); } inline T& operator*() const |