diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-09-12 11:36:04 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-09-12 14:05:21 +0000 |
| commit | 71a2dd955cdc15317c83ad35b4845ef864cba0ef (patch) | |
| tree | 12a645896fd3226be547737d67f7c16b78825be2 /src | |
| parent | 764854dc4799c21f739abc35e68f053849267f89 (diff) | |
QSharedPointer: add get() for STL compatibility
[ChangeLog][QtCore][QSharedPointer] Added get(), for compatibility
with std::shared_ptr.
Change-Id: I77189c89bc6a222313b9b2353f1fb3969433c750
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index af09ef6f40..7f1e9ed798 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -577,6 +577,15 @@ */ /*! + \fn T *QSharedPointer::get() const + \since 5.11 + + Same as data(). + + This function is provided for API compatibility with \c{std::shared_ptr}. +*/ + +/*! \fn T &QSharedPointer::operator *() const Provides access to the shared pointer's members. diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index 3b86eb238b..98b38b97d3 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -59,6 +59,7 @@ class QSharedPointer public: // basic accessor functions T *data() const; + T *get() const; bool isNull() const; operator bool() const; bool operator!() const; diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 15573c5588..9e1a5c7c62 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -303,6 +303,7 @@ public: typedef qptrdiff difference_type; T *data() const Q_DECL_NOTHROW { return value; } + T *get() const Q_DECL_NOTHROW { return value; } bool isNull() const Q_DECL_NOTHROW { return !data(); } operator RestrictedBool() const Q_DECL_NOTHROW { return isNull() ? Q_NULLPTR : &QSharedPointer::value; } bool operator !() const Q_DECL_NOTHROW { return isNull(); } |