diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-02-10 10:57:43 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-13 15:15:56 +0100 |
commit | cc7239da8d1ab95e68e12a64df3ca3051419cb34 (patch) | |
tree | b2bfc4ac5a8fd24b2bb6852d36469ce95922b8c0 /src/corelib/kernel/qpointer.h | |
parent | 60cde0bd1496c528153d21769dfbcb2b0a9ffc91 (diff) |
Make it possible to use QPointer<const T>
This is possible with QWeakPointer, so allow it for migrating
code too.
In the process, replace the QPointerBase with a member variable for
simplicity. The functionality of the QPointerBase is replaced
by a TypeSelector template.
Change-Id: I3b4c77bdeda2b863cc33e84a3da8a25bae928c8c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qpointer.h')
-rw-r--r-- | src/corelib/kernel/qpointer.h | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 385bc2814b..230b6b66eb 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -50,56 +50,44 @@ QT_BEGIN_NAMESPACE class QVariant; -class QPointerBase -{ - QWeakPointer<QObject> wp; - -protected: - inline QPointerBase() : wp() { } - inline QPointerBase(QObject *p) : wp(p, true) { } - // compiler-generated copy/move ctor/assignment operators are fine! (even though public) - inline ~QPointerBase() { } - - inline QObject* data() const - { return wp.data(); } - - inline void assign(QObject *p) - { wp.assign(p); } - - inline bool isNull() const - { return wp.isNull(); } - - inline void clear() - { wp.clear(); } -}; - template <class T> -class QPointer : private QPointerBase +class QPointer { + template<typename U> + struct TypeSelector + { + typedef QObject Type; + }; + template<typename U> + struct TypeSelector<const U> + { + typedef const QObject Type; + }; + typedef typename TypeSelector<T>::Type QObjectType; + QWeakPointer<QObjectType> wp; public: inline QPointer() { } - inline QPointer(T *p) : QPointerBase(p) { } + inline QPointer(T *p) : wp(p, true) { } // compiler-generated copy/move ctor/assignment operators are fine! inline ~QPointer() { } inline QPointer<T> &operator=(T* p) - { QPointerBase::assign(p); return *this; } + { wp.assign(static_cast<QObjectType*>(p)); return *this; } inline T* data() const - { return static_cast<T*>(QPointerBase::data()); } + { return static_cast<T*>( wp.data()); } inline T* operator->() const { return data(); } inline T& operator*() const { return *data(); } inline operator T*() const { return data(); } -#ifdef Q_QDOC - inline bool isNull() const; - inline void clear(); -#else - using QPointerBase::isNull; - using QPointerBase::clear; -#endif + + inline bool isNull() const + { return wp.isNull(); } + + inline void clear() + { wp.clear(); } }; template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_MOVABLE_TYPE); |