Use Reset() instead of setting to NULL

Will be eventually removing the assignment operator to NULL.

Change-Id: Ib007a660dcf15e3872794a0b8c808f621f30aceb

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
index 4d85f3f..e566cbd 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
@@ -66,7 +66,7 @@ int UtcDaliButtonNew(void)
 
   CheckBoxButton checkBoxButton2( checkBoxButton );
   DALI_TEST_CHECK( checkBoxButton2 );
-  checkBoxButton2 = NULL;
+  checkBoxButton2.Reset();
 
 
   //Additional check to ensure object is created by checking if it's registered

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp
index 71fc956..e584bb4 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp
@@ -121,7 +121,7 @@ int UtcDaliCubeTransitionWaveEffectNew(void)
 
   DALI_TEST_CHECK( waveEffect );
 
-  waveEffect = NULL;
+  waveEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
@@ -149,7 +149,7 @@ int UtcDaliCubeTransitionCrossEffectNew(void)
 
   DALI_TEST_CHECK( crossEffect );
 
-  crossEffect = NULL;
+  crossEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
@@ -177,7 +177,7 @@ int UtcDaliCubeTransitionFoldEffectNew(void)
 
   DALI_TEST_CHECK( foldEffect );
 
-  foldEffect = NULL;
+  foldEffect.Reset();
 
   //Additional check to ensure object is created by checking if it is registered
   ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp
index ab377f6..be76927 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp
@@ -618,14 +618,16 @@ int UtcDaliKeyInputFocusManagerSignalKeyInputFocusChanged(void)
   DALI_TEST_CHECK( gainActor == pushButton1 );
   DALI_TEST_CHECK( lostActor == Control() );
 
-  gainActor = lostActor = NULL;
+  gainActor.Reset();
+  lostActor.Reset();
 
   manager.SetFocus(pushButton2);
 
   DALI_TEST_CHECK( gainActor == pushButton2 );
   DALI_TEST_CHECK( lostActor == pushButton1 );
 
-  gainActor = lostActor = NULL;
+  gainActor.Reset();
+  lostActor.Reset();
 
   // Removing the focus actor from the stage would also result in signal emission.
   stage.Remove( pushButton1 );

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
index c731668..f9fc731 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
@@ -73,9 +73,9 @@ int UtcDaliViewNew(void)
   View view3 = view2;
   DALI_TEST_CHECK( view3 );
 
-  view1 = NULL;
-  view2 = NULL;
-  view3 = NULL;
+  view1.Reset();
+  view2.Reset();
+  view3.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index fd5c491..b0dd81d 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -76,7 +76,7 @@ int UtcDaliButtonNew(void)
 
   DALI_TEST_CHECK( pushButton2 );
 
-   pushButton2 = NULL;
+  pushButton2.Reset();
 
   // Test down cast
   Handle handleButton;