Revert "[3.0] Fix WeakHandleBase::Reset()"

This reverts commit 1fb1e0d143de0d345183c5d61f84c58abd36c01b.

Change-Id: Ieaf6520c18912a3a1123879fb99891dd2450f9a9

diff --git a/automated-tests/src/dali/utc-Dali-WeakHandle.cpp b/automated-tests/src/dali/utc-Dali-WeakHandle.cpp
index 9fc86a5..fedb2e1 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-WeakHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-WeakHandle.cpp
@@ -356,23 +356,6 @@ int UtcDaliWeakHandleBaseGetBaseHandle(void)
   END_TEST;
 }
 
-int UtcDaliWeakHandleBaseReset(void)
-{
-  TestApplication application;
-  tet_infoline( "Testing Daku::WeakHandleBase::Reset()" );
-
-  Actor actor = Actor::New();
-  WeakHandleBase object(actor);
-  DALI_TEST_CHECK(object.GetBaseHandle() == actor);
-
-  object.Reset();
-
-  DALI_TEST_CHECK(object == WeakHandleBase());
-  DALI_TEST_CHECK(object.GetBaseHandle() == Handle());
-
-  END_TEST;
-}
-
 int UtcDaliWeakHandleGetHandle(void)
 {
   TestApplication application;

diff --git a/dali/devel-api/object/weak-handle.cpp b/dali/devel-api/object/weak-handle.cpp
index cfe628b..eeed348 100644 (file)
--- a/dali/devel-api/object/weak-handle.cpp
+++ b/dali/devel-api/object/weak-handle.cpp
@@ -49,15 +49,9 @@ struct WeakHandleBase::Impl : public Internal::Object::Observer
   // Destruction
   ~Impl()
   {
-    Reset();
-  }
-
-  void Reset()
-  {
     if( mObject )
     {
       mObject->RemoveObserver( *this );
-      mObject = NULL;
     }
   }
 
@@ -140,7 +134,8 @@ Handle WeakHandleBase::GetBaseHandle() const
 
 void WeakHandleBase::Reset()
 {
-  mImpl->Reset();
+  delete mImpl;
+  mImpl = NULL;
 }