From 55d0c6c6cf2c1244a7a42db5d97753640d02598c Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 30 May 2012 15:52:21 +0200
Subject: Add clear() to QPointer for QWeakPointer compatibility.

Change-Id: I9efc162bf56775c7ebcff4e3b79a997edc4ceaeb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qpointer.cpp | 8 ++++++++
 src/corelib/kernel/qpointer.h   | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index cd88baf9bf..ec719e9cdc 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -170,6 +170,14 @@
     there is no referenced object; otherwise returns false.
 */
 
+/*!
+    \fn void QPointer::clear()
+
+    Clears this QPointer object.
+
+    \sa isNull()
+*/
+
 /*!
     \fn T* QPointer::operator->() const
 
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index a3035ebc94..5544a59705 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -69,6 +69,9 @@ protected:
 
     inline bool isNull() const
     { return wp.isNull(); }
+
+    inline void clear()
+    { wp.clear(); }
 };
 
 template <class T>
@@ -93,8 +96,10 @@ public:
     { return data(); }
 #ifdef qdoc
     inline bool isNull() const;
+    inline void clear() const;
 #else
     using QPointerBase::isNull;
+    using QPointerBase::clear;
 #endif
 };
 template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_MOVABLE_TYPE);
-- 
cgit v1.2.3