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

Un-deprecate QPointer per mailing list discussion.

Browse Source 
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>
This commit is contained in:
Robin Burchell 2012-03-15 20:11:04 +01:00 committed by Qt by Nokia
parent 83a70a7415
commit b8773165d7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/kernel/qpointer.cpp
View File

@ -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

6
src/corelib/kernel/qpointer.h
View File

@ -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