diff options
| author | Robin Burchell <robin+qt@viroteck.net> | 2012-03-15 20:11:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 23:18:00 +0100 |
| commit | b8773165d76e0d5d46287d92f9d6bdbbd2110180 (patch) | |
| tree | e9d368c8aaf52289a3a1802da591df1a224c8943 /src/corelib/kernel | |
| parent | 83a70a74152977cd83640c9887aeb15119917350 (diff) | |
Un-deprecate QPointer per mailing list discussion.
Now that QPointer is implemented in an efficient manner, there is really no need
to avoid it, deprecating it just adds a large amount of churn.
Change-Id: I32116faf14c3b07631d59ba9585f9ce422531646
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qpointer.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qpointer.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index b983bef5fe..f81451d906 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -44,7 +44,6 @@ \brief The QPointer class is a template class that provides guarded pointers to QObject. \ingroup objectmodel - \obsolete Use QWeakPointer instead. A guarded pointer, QPointer<T>, behaves like a normal C++ pointer \c{T *}, except that it is automatically set to 0 when the diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 9b4f8e4332..836c13e3fc 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -49,10 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#if QT_DEPRECATED_SINCE(5,0) - template <class T> -class QT_DEPRECATED QPointer +class QPointer { QWeakPointer<T> wp; @@ -161,8 +159,6 @@ inline bool operator!= (int i, const QPointer<T> &p) { Q_ASSERT(i == 0); return !i && !p.isNull(); } #endif -#endif // QT_DEPRECATED_SINCE(5,0) - QT_END_NAMESPACE QT_END_HEADER |