From 4201fc9ccb4f5a06b44cd45407e6f3c8c6bd449c Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 5 Nov 2014 18:36:06 +0000 Subject: [PATCH] Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality and thus redundant [Problem] [Cause] [Solution] Change-Id: I1836b98ee0ad6d661e952e1c2beec27116879725 --- .../src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp | 2 +- .../src/dali-unmanaged/utc-Dali-TypeRegistry.cpp | 2 +- .../src/dali/dali-test-suite-utils/test-touch-utils.h | 2 +- automated-tests/src/dali/utc-Dali-CameraActor.cpp | 4 ++-- automated-tests/src/dali/utc-Dali-HoverProcessing.cpp | 4 ++-- automated-tests/src/dali/utc-Dali-KeyEvent.cpp | 2 +- .../src/dali/utc-Dali-LongPressGestureDetector.cpp | 4 ++-- .../src/dali/utc-Dali-PanGestureDetector.cpp | 4 ++-- .../src/dali/utc-Dali-PinchGestureDetector.cpp | 4 ++-- automated-tests/src/dali/utc-Dali-RenderableActor.cpp | 2 +- .../src/dali/utc-Dali-TapGestureDetector.cpp | 4 ++-- automated-tests/src/dali/utc-Dali-TouchProcessing.cpp | 4 ++-- dali/internal/event/events/hover-event-processor.cpp | 2 +- dali/internal/event/events/touch-event-processor.cpp | 2 +- dali/public-api/actors/actor.cpp | 7 ------- dali/public-api/actors/actor.h | 10 ---------- dali/public-api/actors/camera-actor.cpp | 7 ------- dali/public-api/actors/camera-actor.h | 10 ---------- dali/public-api/actors/custom-actor.cpp | 7 ------- dali/public-api/actors/custom-actor.h | 10 ---------- dali/public-api/actors/image-actor.cpp | 7 ------- dali/public-api/actors/image-actor.h | 10 ---------- dali/public-api/actors/layer.cpp | 7 ------- dali/public-api/actors/layer.h | 10 ---------- dali/public-api/actors/light-actor.cpp | 7 ------- dali/public-api/actors/light-actor.h | 10 ---------- dali/public-api/actors/mesh-actor.cpp | 7 ------- dali/public-api/actors/mesh-actor.h | 10 ---------- dali/public-api/actors/renderable-actor.cpp | 7 ------- dali/public-api/actors/renderable-actor.h | 10 ---------- dali/public-api/actors/text-actor.cpp | 7 ------- dali/public-api/actors/text-actor.h | 10 ---------- dali/public-api/animation/active-constraint.cpp | 7 ------- dali/public-api/animation/active-constraint.h | 10 ---------- dali/public-api/animation/animation.cpp | 7 ------- dali/public-api/animation/animation.h | 10 ---------- dali/public-api/animation/constraint.cpp | 7 ------- dali/public-api/animation/constraint.h | 10 ---------- dali/public-api/animation/key-frames.cpp | 7 ------- dali/public-api/animation/key-frames.h | 10 ---------- dali/public-api/common/light.cpp | 7 ------- dali/public-api/common/light.h | 10 ---------- dali/public-api/common/stage.cpp | 7 ------- dali/public-api/common/stage.h | 10 ---------- dali/public-api/dynamics/dynamics-body-config.cpp | 7 ------- dali/public-api/dynamics/dynamics-body-config.h | 10 ---------- dali/public-api/dynamics/dynamics-body.cpp | 7 ------- dali/public-api/dynamics/dynamics-body.h | 10 ---------- dali/public-api/dynamics/dynamics-collision.cpp | 7 ------- dali/public-api/dynamics/dynamics-collision.h | 10 ---------- dali/public-api/dynamics/dynamics-joint.cpp | 7 ------- dali/public-api/dynamics/dynamics-joint.h | 10 ---------- dali/public-api/dynamics/dynamics-shape.cpp | 7 ------- dali/public-api/dynamics/dynamics-shape.h | 10 ---------- dali/public-api/dynamics/dynamics-world-config.cpp | 7 ------- dali/public-api/dynamics/dynamics-world-config.h | 10 ---------- dali/public-api/dynamics/dynamics-world.cpp | 7 ------- dali/public-api/dynamics/dynamics-world.h | 10 ---------- dali/public-api/events/gesture-detector.cpp | 7 ------- dali/public-api/events/gesture-detector.h | 10 ---------- dali/public-api/events/long-press-gesture-detector.cpp | 7 ------- dali/public-api/events/long-press-gesture-detector.h | 10 ---------- dali/public-api/events/pan-gesture-detector.cpp | 7 ------- dali/public-api/events/pan-gesture-detector.h | 10 ---------- dali/public-api/events/pinch-gesture-detector.cpp | 7 ------- dali/public-api/events/pinch-gesture-detector.h | 10 ---------- dali/public-api/events/tap-gesture-detector.cpp | 7 ------- dali/public-api/events/tap-gesture-detector.h | 10 ---------- dali/public-api/geometry/animatable-mesh.cpp | 7 ------- dali/public-api/geometry/animatable-mesh.h | 10 ---------- dali/public-api/geometry/cloth.cpp | 7 ------- dali/public-api/geometry/cloth.h | 10 ---------- dali/public-api/geometry/mesh.cpp | 7 ------- dali/public-api/geometry/mesh.h | 10 ---------- dali/public-api/images/bitmap-image.cpp | 8 -------- dali/public-api/images/bitmap-image.h | 10 ---------- dali/public-api/images/encoded-buffer-image.cpp | 7 ------- dali/public-api/images/encoded-buffer-image.h | 10 ---------- dali/public-api/images/frame-buffer-image.cpp | 7 ------- dali/public-api/images/frame-buffer-image.h | 10 ---------- dali/public-api/images/glyph-image.cpp | 7 ------- dali/public-api/images/glyph-image.h | 10 ---------- dali/public-api/images/image.cpp | 7 ------- dali/public-api/images/image.h | 10 ---------- dali/public-api/images/nine-patch-image.cpp | 7 ------- dali/public-api/images/nine-patch-image.h | 10 ---------- dali/public-api/modeling/entity.cpp | 7 ------- dali/public-api/modeling/entity.h | 10 ---------- dali/public-api/modeling/material.cpp | 7 ------- dali/public-api/modeling/material.h | 10 ---------- dali/public-api/modeling/model-data.cpp | 7 ------- dali/public-api/modeling/model-data.h | 10 ---------- dali/public-api/modeling/model.cpp | 7 ------- dali/public-api/modeling/model.h | 10 ---------- dali/public-api/object/base-handle.cpp | 7 ------- dali/public-api/object/base-handle.h | 18 ------------------ dali/public-api/object/constrainable.cpp | 7 ------- dali/public-api/object/constrainable.h | 10 ---------- dali/public-api/object/handle.cpp | 7 ------- dali/public-api/object/handle.h | 10 ---------- dali/public-api/object/object-registry.cpp | 7 ------- dali/public-api/object/object-registry.h | 10 ---------- dali/public-api/object/property-conditions.cpp | 7 ------- dali/public-api/object/property-conditions.h | 10 ---------- dali/public-api/object/property-notification.cpp | 7 ------- dali/public-api/object/property-notification.h | 10 ---------- dali/public-api/object/type-info.cpp | 7 ------- dali/public-api/object/type-info.h | 10 ---------- dali/public-api/object/type-registry.cpp | 7 ------- dali/public-api/object/type-registry.h | 10 ---------- dali/public-api/render-tasks/render-task-list.cpp | 7 ------- dali/public-api/render-tasks/render-task-list.h | 10 ---------- dali/public-api/render-tasks/render-task.cpp | 7 ------- dali/public-api/render-tasks/render-task.h | 10 ---------- dali/public-api/shader-effects/shader-effect.cpp | 7 ------- dali/public-api/shader-effects/shader-effect.h | 10 ---------- dali/public-api/text/font.cpp | 7 ------- dali/public-api/text/font.h | 10 ---------- 118 files changed, 21 insertions(+), 914 deletions(-) diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp index 1b40e40..796916b 100644 --- a/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp +++ b/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp @@ -50,7 +50,7 @@ struct SignalData receivedMouseWheelEvent.z = 0; receivedMouseWheelEvent.timeStamp = 0; - mouseWheeledActor = NULL; + mouseWheeledActor.Reset(); } bool functorCalled; diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp index ebc7c0c..0ecf8ce 100644 --- a/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp +++ b/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp @@ -51,7 +51,7 @@ struct SignalData receivedGesture.screenPoint = Vector2(0.0f, 0.0f); receivedGesture.localPoint = Vector2(0.0f, 0.0f); - pressedActor = NULL; + pressedActor.Reset(); } bool functorCalled; diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h index 68d50f2..ebae313 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h @@ -40,7 +40,7 @@ struct TouchEventData receivedTouch.points.clear(); receivedTouch.time = 0; - touchActor = NULL; + touchActor.Reset(); } bool functorCalled; diff --git a/automated-tests/src/dali/utc-Dali-CameraActor.cpp b/automated-tests/src/dali/utc-Dali-CameraActor.cpp index ed304f3..c86d8e3 100644 --- a/automated-tests/src/dali/utc-Dali-CameraActor.cpp +++ b/automated-tests/src/dali/utc-Dali-CameraActor.cpp @@ -89,7 +89,7 @@ int UtcDaliCameraActorNew(void) DALI_TEST_CHECK(actor); - actor = NULL; + actor.Reset(); DALI_TEST_CHECK(!actor); END_TEST; @@ -108,7 +108,7 @@ int UtcDaliCameraActorDownCast(void) CameraActor cameraActor = CameraActor::DownCast( child ); DALI_TEST_CHECK( cameraActor ); - cameraActor = NULL; + cameraActor.Reset(); DALI_TEST_CHECK( !cameraActor ); cameraActor = DownCast< CameraActor >( child ); diff --git a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp index 686fe95..efd4e34 100644 --- a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp @@ -57,7 +57,7 @@ struct SignalData hoverEvent.time = 0u; hoverEvent.points.clear(); - hoveredActor = NULL; + hoveredActor.Reset(); } bool functorCalled; @@ -1088,7 +1088,7 @@ int UtcDaliHoverActorRemovedInSignal(void) data.Reset(); // Completely delete the actor - actor = NULL; + actor.Reset(); // Emit event, should not crash and should not receive an event. application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) ); diff --git a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp index c73dee8..0ffb592 100644 --- a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp +++ b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp @@ -64,7 +64,7 @@ struct SignalData receivedKeyEvent.keyPressedName.clear(); receivedKeyEvent.keyPressed.clear(); - keyedActor = NULL; + keyedActor.Reset(); } bool functorCalled; diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp index 56c1146..3fbf425 100644 --- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp @@ -60,7 +60,7 @@ struct SignalData receivedGesture.screenPoint = Vector2(0.0f, 0.0f); receivedGesture.localPoint = Vector2(0.0f, 0.0f); - pressedActor = NULL; + pressedActor.Reset(); } bool functorCalled; @@ -1224,7 +1224,7 @@ int UtcDaliLongPressGestureActorStagedAndDestroyed(void) application.Render(); // Delete actor as well - actor = NULL; + actor.Reset(); // Render and notify application.SendNotification(); diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp index 887ce23..f4d7afc 100644 --- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp @@ -69,7 +69,7 @@ struct SignalData receivedGesture.screenPosition = Vector2(0.0f, 0.0f); receivedGesture.numberOfTouches = 0; - pannedActor = NULL; + pannedActor.Reset(); } bool functorCalled; @@ -1557,7 +1557,7 @@ int UtcDaliPanGestureActorStagedAndDestroyed(void) application.Render(); // Delete actor as well - actor = NULL; + actor.Reset(); // Render and notify application.SendNotification(); diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp index 33b583c..6a137b2 100644 --- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp @@ -61,7 +61,7 @@ struct SignalData receivedGesture.screenCenterPoint = Vector2(0.0f, 0.0f); receivedGesture.localCenterPoint = Vector2(0.0f, 0.0f); - pinchedActor = NULL; + pinchedActor.Reset(); } bool functorCalled; @@ -1138,7 +1138,7 @@ int UtcDaliPinchGestureActorStagedAndDestroyed(void) application.Render(); // Delete actor as well - actor = NULL; + actor.Reset(); // Render and notify application.SendNotification(); diff --git a/automated-tests/src/dali/utc-Dali-RenderableActor.cpp b/automated-tests/src/dali/utc-Dali-RenderableActor.cpp index b144a6f..5361c55 100644 --- a/automated-tests/src/dali/utc-Dali-RenderableActor.cpp +++ b/automated-tests/src/dali/utc-Dali-RenderableActor.cpp @@ -73,7 +73,7 @@ int UtcDaliRenderableActorDownCast(void) RenderableActor renderableActor = RenderableActor::DownCast( child ); DALI_TEST_CHECK( renderableActor ); - renderableActor = NULL; + renderableActor.Reset(); DALI_TEST_CHECK( !renderableActor ); renderableActor = DownCast< RenderableActor >( child ); diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp index fbe9622..d81fb58 100644 --- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp @@ -59,7 +59,7 @@ struct SignalData receivedGesture.screenPoint = Vector2(0.0f, 0.0f); receivedGesture.localPoint = Vector2(0.0f, 0.0f); - tappedActor = NULL; + tappedActor.Reset(); } bool functorCalled; @@ -1133,7 +1133,7 @@ int UtcDaliTapGestureActorRemovedWhilePossible(void) Stage::GetCurrent().Remove(actor); application.SendNotification(); application.Render(); - actor = NULL; + actor.Reset(); // Send a Started state, no signal. application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f))); diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp index 6f11247..19327d6 100644 --- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp @@ -57,7 +57,7 @@ struct SignalData touchEvent.time = 0u; touchEvent.points.clear(); - touchedActor = NULL; + touchedActor.Reset(); } bool functorCalled; @@ -1088,7 +1088,7 @@ int UtcDaliTouchActorRemovedInSignal(void) data.Reset(); // Completely delete the actor - actor = NULL; + actor.Reset(); // Emit event, should not crash and should not receive an event. application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) ); diff --git a/dali/internal/event/events/hover-event-processor.cpp b/dali/internal/event/events/hover-event-processor.cpp index 3ab14d4..ba02688 100644 --- a/dali/internal/event/events/hover-event-processor.cpp +++ b/dali/internal/event/events/hover-event-processor.cpp @@ -219,7 +219,7 @@ void HoverEventProcessor::ProcessHoverEvent( const Integration::HoverEvent& even mHoverStartConsumedActor.SetActor( NULL ); mLastRenderTask.Reset(); - hoverEvent.points[0].hitActor = NULL; + hoverEvent.points[0].hitActor.Reset(); return; // No need for hit testing } diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp index 393114c..8426d77 100644 --- a/dali/internal/event/events/touch-event-processor.cpp +++ b/dali/internal/event/events/touch-event-processor.cpp @@ -196,7 +196,7 @@ void TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even mTouchDownConsumedActor.SetActor( NULL ); mLastRenderTask.Reset(); - touchEvent.points[0].hitActor = NULL; + touchEvent.points[0].hitActor.Reset(); mStage.EmitTouchedSignal( touchEvent ); return; // No need for hit testing diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp index 88fc0d6..bd56f4b 100644 --- a/dali/public-api/actors/actor.cpp +++ b/dali/public-api/actors/actor.cpp @@ -89,13 +89,6 @@ Actor& Actor::operator=(const Actor& rhs) return *this; } -Actor& Actor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - const std::string& Actor::GetName() const { return GetImplementation(*this).GetName(); diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index 9066309..28f5be1 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -353,16 +353,6 @@ public: Actor& operator=(const Actor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Actor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Retrieve the Actor's name. * * @pre The Actor has been initialized. diff --git a/dali/public-api/actors/camera-actor.cpp b/dali/public-api/actors/camera-actor.cpp index 2683c87..e3a0807 100644 --- a/dali/public-api/actors/camera-actor.cpp +++ b/dali/public-api/actors/camera-actor.cpp @@ -68,13 +68,6 @@ CameraActor& CameraActor::operator=(const CameraActor& rhs) return *this; } -CameraActor& CameraActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void CameraActor::SetType( Dali::Camera::Type type ) { GetImplementation(*this).SetType(type); diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h index 43d24aa..6887298 100644 --- a/dali/public-api/actors/camera-actor.h +++ b/dali/public-api/actors/camera-actor.h @@ -144,16 +144,6 @@ public: CameraActor& operator=(const CameraActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - CameraActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the camera type. * The default type is Dali::Camera::FREE_LOOK * @param[in] type The camera type diff --git a/dali/public-api/actors/custom-actor.cpp b/dali/public-api/actors/custom-actor.cpp index f536e7b..1707f01 100644 --- a/dali/public-api/actors/custom-actor.cpp +++ b/dali/public-api/actors/custom-actor.cpp @@ -65,13 +65,6 @@ CustomActor& CustomActor::operator=(const CustomActor& rhs) return *this; } -CustomActor& CustomActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - CustomActorImpl& CustomActor::GetImplementation() { Internal::CustomActor& internal = GetImpl(*this); diff --git a/dali/public-api/actors/custom-actor.h b/dali/public-api/actors/custom-actor.h index 12976c1..5e97a1a 100644 --- a/dali/public-api/actors/custom-actor.h +++ b/dali/public-api/actors/custom-actor.h @@ -101,16 +101,6 @@ public: */ CustomActor& operator=(const CustomActor& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - CustomActor& operator=(BaseHandle::NullType* rhs); - public: // Not intended for application developers /** diff --git a/dali/public-api/actors/image-actor.cpp b/dali/public-api/actors/image-actor.cpp index b3984cc..5d80724 100644 --- a/dali/public-api/actors/image-actor.cpp +++ b/dali/public-api/actors/image-actor.cpp @@ -73,13 +73,6 @@ ImageActor& ImageActor::operator=(const ImageActor& rhs) return *this; } -ImageActor& ImageActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void ImageActor::SetImage(Image image) { Internal::ImagePtr imagePtr; diff --git a/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h index 28dbe06..1311398 100644 --- a/dali/public-api/actors/image-actor.h +++ b/dali/public-api/actors/image-actor.h @@ -218,16 +218,6 @@ public: ImageActor& operator=(const ImageActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - ImageActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the image rendered by the actor. * Set the image rendered by the actor. * If actor was already displaying a different image, the old image is dropped and actor may diff --git a/dali/public-api/actors/layer.cpp b/dali/public-api/actors/layer.cpp index 76fa041..ca32115 100644 --- a/dali/public-api/actors/layer.cpp +++ b/dali/public-api/actors/layer.cpp @@ -64,13 +64,6 @@ Layer& Layer::operator=(const Layer& rhs) return *this; } -Layer& Layer::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - unsigned int Layer::GetDepth() const { return GetImplementation(*this).GetDepth(); diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h index 9a61203..a00e85b 100644 --- a/dali/public-api/actors/layer.h +++ b/dali/public-api/actors/layer.h @@ -125,16 +125,6 @@ public: Layer& operator=(const Layer& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Layer& operator=(BaseHandle::NullType* rhs); - - /** * @brief Query the depth of the layer * * 0 is bottom most layer, higher number is on top diff --git a/dali/public-api/actors/light-actor.cpp b/dali/public-api/actors/light-actor.cpp index 8906744..b29314a 100644 --- a/dali/public-api/actors/light-actor.cpp +++ b/dali/public-api/actors/light-actor.cpp @@ -56,13 +56,6 @@ LightActor& LightActor::operator=(const LightActor& rhs) return *this; } -LightActor& LightActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void LightActor::SetLight(Light light) { GetImplementation(*this).SetLight(light); diff --git a/dali/public-api/actors/light-actor.h b/dali/public-api/actors/light-actor.h index f54f115..902ace7 100644 --- a/dali/public-api/actors/light-actor.h +++ b/dali/public-api/actors/light-actor.h @@ -98,16 +98,6 @@ public: LightActor& operator=(const LightActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - LightActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the light properties for the actor. * * @param[in] light The light properties diff --git a/dali/public-api/actors/mesh-actor.cpp b/dali/public-api/actors/mesh-actor.cpp index e17b182..c73ac89 100644 --- a/dali/public-api/actors/mesh-actor.cpp +++ b/dali/public-api/actors/mesh-actor.cpp @@ -69,13 +69,6 @@ MeshActor& MeshActor::operator=(const MeshActor& rhs) return *this; } -MeshActor& MeshActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void MeshActor::SetMaterial( Actor actor, const std::string& actorName, diff --git a/dali/public-api/actors/mesh-actor.h b/dali/public-api/actors/mesh-actor.h index a4b1221..d9aecf1 100644 --- a/dali/public-api/actors/mesh-actor.h +++ b/dali/public-api/actors/mesh-actor.h @@ -106,16 +106,6 @@ public: MeshActor& operator=(const MeshActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - MeshActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set a custom material on the given actor or one of it's children. * * @pre the mesh is loaded diff --git a/dali/public-api/actors/renderable-actor.cpp b/dali/public-api/actors/renderable-actor.cpp index 0f72467..6c007c6 100644 --- a/dali/public-api/actors/renderable-actor.cpp +++ b/dali/public-api/actors/renderable-actor.cpp @@ -51,13 +51,6 @@ RenderableActor& RenderableActor::operator=(const RenderableActor& rhs) return *this; } -RenderableActor& RenderableActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void RenderableActor::SetSortModifier(float modifier) { GetImplementation(*this).SetSortModifier(modifier); diff --git a/dali/public-api/actors/renderable-actor.h b/dali/public-api/actors/renderable-actor.h index e2166dd..b6acf3f 100644 --- a/dali/public-api/actors/renderable-actor.h +++ b/dali/public-api/actors/renderable-actor.h @@ -93,16 +93,6 @@ public: RenderableActor& operator=(const RenderableActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - RenderableActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Allows modification of an actors position in the depth sort algorithm. * * The offset can be altered for each coplanar actor hence allowing an order of painting. diff --git a/dali/public-api/actors/text-actor.cpp b/dali/public-api/actors/text-actor.cpp index 6ba09ed..f87df0d 100644 --- a/dali/public-api/actors/text-actor.cpp +++ b/dali/public-api/actors/text-actor.cpp @@ -76,13 +76,6 @@ TextActor& TextActor::operator=(const TextActor& rhs) return *this; } -TextActor& TextActor::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - string TextActor::GetText() const { return GetImplementation(*this).GetText(); diff --git a/dali/public-api/actors/text-actor.h b/dali/public-api/actors/text-actor.h index fed6820..15d46c1 100644 --- a/dali/public-api/actors/text-actor.h +++ b/dali/public-api/actors/text-actor.h @@ -148,16 +148,6 @@ public: TextActor& operator=(const TextActor& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - TextActor& operator=(BaseHandle::NullType* rhs); - - /** * @brief Get the text label displayed by the actor. * * @pre The text actor has been initialized. diff --git a/dali/public-api/animation/active-constraint.cpp b/dali/public-api/animation/active-constraint.cpp index c31784b..7fb244f 100644 --- a/dali/public-api/animation/active-constraint.cpp +++ b/dali/public-api/animation/active-constraint.cpp @@ -53,13 +53,6 @@ ActiveConstraint& ActiveConstraint::operator=(const ActiveConstraint& rhs) return *this; } -ActiveConstraint& ActiveConstraint::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Handle ActiveConstraint::GetTargetObject() { return GetImplementation(*this).GetTargetObject(); diff --git a/dali/public-api/animation/active-constraint.h b/dali/public-api/animation/active-constraint.h index 6d2424a..fe043f9 100644 --- a/dali/public-api/animation/active-constraint.h +++ b/dali/public-api/animation/active-constraint.h @@ -78,16 +78,6 @@ public: ActiveConstraint& operator=(const ActiveConstraint& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - ActiveConstraint& operator=(BaseHandle::NullType* rhs); - - /** * @brief Retrieve the object which this constraint is targeting. * * @return The target object. diff --git a/dali/public-api/animation/animation.cpp b/dali/public-api/animation/animation.cpp index 40f609e..8be9bb2 100644 --- a/dali/public-api/animation/animation.cpp +++ b/dali/public-api/animation/animation.cpp @@ -73,13 +73,6 @@ Animation& Animation::operator=(const Animation& rhs) return *this; } -Animation& Animation::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void Animation::SetDuration(float durationSeconds) { GetImplementation(*this).SetDuration(durationSeconds); diff --git a/dali/public-api/animation/animation.h b/dali/public-api/animation/animation.h index 77e49bb..2d97db6 100644 --- a/dali/public-api/animation/animation.h +++ b/dali/public-api/animation/animation.h @@ -189,16 +189,6 @@ public: Animation& operator=(const Animation& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Animation& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the duration of an animation. * * @pre durationSeconds must be greater than zero. diff --git a/dali/public-api/animation/constraint.cpp b/dali/public-api/animation/constraint.cpp index 673c68b..faf703a 100644 --- a/dali/public-api/animation/constraint.cpp +++ b/dali/public-api/animation/constraint.cpp @@ -53,13 +53,6 @@ Constraint& Constraint::operator=(const Constraint& rhs) return *this; } -Constraint& Constraint::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void Constraint::SetApplyTime( TimePeriod timePeriod ) { GetImplementation(*this).SetApplyTime( timePeriod ); diff --git a/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h index 1c79587..e7bb48a 100644 --- a/dali/public-api/animation/constraint.h +++ b/dali/public-api/animation/constraint.h @@ -538,16 +538,6 @@ public: Constraint& operator=(const Constraint& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Constraint& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the time taken for the constraint to be fully applied. * * The default is zero, meaning that the constraint is applied immediately. diff --git a/dali/public-api/animation/key-frames.cpp b/dali/public-api/animation/key-frames.cpp index 1edf54e..c44de91 100644 --- a/dali/public-api/animation/key-frames.cpp +++ b/dali/public-api/animation/key-frames.cpp @@ -57,13 +57,6 @@ KeyFrames& KeyFrames::operator=(const KeyFrames& rhs) return *this; } -KeyFrames& KeyFrames::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Property::Type KeyFrames::GetType() const { return GetImplementation(*this).GetType(); diff --git a/dali/public-api/animation/key-frames.h b/dali/public-api/animation/key-frames.h index 50ae761..2978ab7 100644 --- a/dali/public-api/animation/key-frames.h +++ b/dali/public-api/animation/key-frames.h @@ -91,16 +91,6 @@ public: KeyFrames& operator=(const KeyFrames& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - KeyFrames& operator=(BaseHandle::NullType* rhs); - - /** * @brief Gets the type of the key frame. * * If no key frames have been added, this returns Property::NONE. diff --git a/dali/public-api/common/light.cpp b/dali/public-api/common/light.cpp index 98b9643..298a389 100644 --- a/dali/public-api/common/light.cpp +++ b/dali/public-api/common/light.cpp @@ -56,13 +56,6 @@ Light& Light::operator=(const Light& rhs) return *this; } -Light& Light::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void Light::SetName(const std::string& name) { GetImplementation(*this).SetName(name); diff --git a/dali/public-api/common/light.h b/dali/public-api/common/light.h index debad5a..b69c493 100644 --- a/dali/public-api/common/light.h +++ b/dali/public-api/common/light.h @@ -105,16 +105,6 @@ public: Light& operator=(const Light& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Light& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the light's name. * * @param[in] name The light's name diff --git a/dali/public-api/common/stage.cpp b/dali/public-api/common/stage.cpp index 8be0a89..dac376b 100644 --- a/dali/public-api/common/stage.cpp +++ b/dali/public-api/common/stage.cpp @@ -68,13 +68,6 @@ Stage& Stage::operator=(const Stage& rhs) return *this; } -Stage& Stage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Stage::Stage(Internal::Stage* internal) : BaseHandle(internal) { diff --git a/dali/public-api/common/stage.h b/dali/public-api/common/stage.h index de8add0..9ef998e 100644 --- a/dali/public-api/common/stage.h +++ b/dali/public-api/common/stage.h @@ -109,16 +109,6 @@ public: */ Stage& operator=(const Stage& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Stage& operator=(BaseHandle::NullType* rhs); - // Containment /** diff --git a/dali/public-api/dynamics/dynamics-body-config.cpp b/dali/public-api/dynamics/dynamics-body-config.cpp index 2c124aa..dbfbc1f 100644 --- a/dali/public-api/dynamics/dynamics-body-config.cpp +++ b/dali/public-api/dynamics/dynamics-body-config.cpp @@ -59,13 +59,6 @@ DynamicsBodyConfig& DynamicsBodyConfig::operator=(const DynamicsBodyConfig& rhs) return *this; } -DynamicsBodyConfig& DynamicsBodyConfig::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void DynamicsBodyConfig::SetType( const DynamicsBodyConfig::BodyType type ) { #ifdef DYNAMICS_SUPPORT diff --git a/dali/public-api/dynamics/dynamics-body-config.h b/dali/public-api/dynamics/dynamics-body-config.h index 5312742..9f86c67 100644 --- a/dali/public-api/dynamics/dynamics-body-config.h +++ b/dali/public-api/dynamics/dynamics-body-config.h @@ -110,16 +110,6 @@ public: */ DynamicsBodyConfig& operator=(const DynamicsBodyConfig& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsBodyConfig& operator=(BaseHandle::NullType* rhs); - public: /** * @brief Set the type of DynamicsBody. diff --git a/dali/public-api/dynamics/dynamics-body.cpp b/dali/public-api/dynamics/dynamics-body.cpp index 0751691..bfabd9a 100644 --- a/dali/public-api/dynamics/dynamics-body.cpp +++ b/dali/public-api/dynamics/dynamics-body.cpp @@ -50,13 +50,6 @@ DynamicsBody& DynamicsBody::operator=(const DynamicsBody& rhs) return *this; } -DynamicsBody& DynamicsBody::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - DynamicsBody::DynamicsBody(Internal::DynamicsBody* internal) #ifdef DYNAMICS_SUPPORT : BaseHandle(internal) diff --git a/dali/public-api/dynamics/dynamics-body.h b/dali/public-api/dynamics/dynamics-body.h index 485e967..b61aa5b 100644 --- a/dali/public-api/dynamics/dynamics-body.h +++ b/dali/public-api/dynamics/dynamics-body.h @@ -74,16 +74,6 @@ public: */ DynamicsBody& operator=(const DynamicsBody& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsBody& operator=(BaseHandle::NullType* rhs); - public: // Not intended for application developers /** diff --git a/dali/public-api/dynamics/dynamics-collision.cpp b/dali/public-api/dynamics/dynamics-collision.cpp index 209909d..804ac37 100644 --- a/dali/public-api/dynamics/dynamics-collision.cpp +++ b/dali/public-api/dynamics/dynamics-collision.cpp @@ -49,13 +49,6 @@ DynamicsCollision& DynamicsCollision::operator=(const DynamicsCollision& rhs) return *this; } -DynamicsCollision& DynamicsCollision::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Actor DynamicsCollision::GetActorA() { #ifdef DYNAMICS_SUPPORT diff --git a/dali/public-api/dynamics/dynamics-collision.h b/dali/public-api/dynamics/dynamics-collision.h index e83c465..06d9ec8 100644 --- a/dali/public-api/dynamics/dynamics-collision.h +++ b/dali/public-api/dynamics/dynamics-collision.h @@ -69,16 +69,6 @@ public: */ DynamicsCollision& operator=(const DynamicsCollision& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsCollision& operator=(BaseHandle::NullType* rhs); - public: /** * @brief Get the first actor in the collision. diff --git a/dali/public-api/dynamics/dynamics-joint.cpp b/dali/public-api/dynamics/dynamics-joint.cpp index c286edb..d4528d8 100644 --- a/dali/public-api/dynamics/dynamics-joint.cpp +++ b/dali/public-api/dynamics/dynamics-joint.cpp @@ -47,13 +47,6 @@ DynamicsJoint& DynamicsJoint::operator=(const DynamicsJoint& rhs) return *this; } -DynamicsJoint& DynamicsJoint::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void DynamicsJoint::SetLinearLimit( const int axisIndex, const float lowerLimit, const float upperLimit ) { #ifdef DYNAMICS_SUPPORT diff --git a/dali/public-api/dynamics/dynamics-joint.h b/dali/public-api/dynamics/dynamics-joint.h index 63d271a..0de19b7 100644 --- a/dali/public-api/dynamics/dynamics-joint.h +++ b/dali/public-api/dynamics/dynamics-joint.h @@ -85,16 +85,6 @@ public: */ DynamicsJoint& operator=(const DynamicsJoint& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsJoint& operator=(BaseHandle::NullType* rhs); - public: /** * @brief Set the limit for one or more linear/translation axis. diff --git a/dali/public-api/dynamics/dynamics-shape.cpp b/dali/public-api/dynamics/dynamics-shape.cpp index 5d1e6b3..6415a80 100644 --- a/dali/public-api/dynamics/dynamics-shape.cpp +++ b/dali/public-api/dynamics/dynamics-shape.cpp @@ -120,13 +120,6 @@ DynamicsShape& DynamicsShape::operator=(const DynamicsShape& rhs) return *this; } -DynamicsShape& DynamicsShape::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - DynamicsShape::DynamicsShape(Internal::DynamicsShape* internal) #ifdef DYNAMICS_SUPPORT : BaseHandle(internal) diff --git a/dali/public-api/dynamics/dynamics-shape.h b/dali/public-api/dynamics/dynamics-shape.h index b080446..d0d45fc 100644 --- a/dali/public-api/dynamics/dynamics-shape.h +++ b/dali/public-api/dynamics/dynamics-shape.h @@ -137,16 +137,6 @@ public: */ DynamicsShape& operator=(const DynamicsShape& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsShape& operator=(BaseHandle::NullType* rhs); - public: /** * @brief Get the type of shape. diff --git a/dali/public-api/dynamics/dynamics-world-config.cpp b/dali/public-api/dynamics/dynamics-world-config.cpp index dcbd40b..3eecda8 100644 --- a/dali/public-api/dynamics/dynamics-world-config.cpp +++ b/dali/public-api/dynamics/dynamics-world-config.cpp @@ -56,13 +56,6 @@ DynamicsWorldConfig& DynamicsWorldConfig::operator=(const DynamicsWorldConfig& r return *this; } -DynamicsWorldConfig& DynamicsWorldConfig::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void DynamicsWorldConfig::SetType( const DynamicsWorldConfig::WorldType type ) { #ifdef DYNAMICS_SUPPORT diff --git a/dali/public-api/dynamics/dynamics-world-config.h b/dali/public-api/dynamics/dynamics-world-config.h index 03e64f2..feed619 100644 --- a/dali/public-api/dynamics/dynamics-world-config.h +++ b/dali/public-api/dynamics/dynamics-world-config.h @@ -87,16 +87,6 @@ public: */ DynamicsWorldConfig& operator=(const DynamicsWorldConfig& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsWorldConfig& operator=(BaseHandle::NullType* rhs); - public: /** * @brief Set the type of Dynamics world required for the application. diff --git a/dali/public-api/dynamics/dynamics-world.cpp b/dali/public-api/dynamics/dynamics-world.cpp index 6ad994a..23d3ac3 100644 --- a/dali/public-api/dynamics/dynamics-world.cpp +++ b/dali/public-api/dynamics/dynamics-world.cpp @@ -56,13 +56,6 @@ DynamicsWorld& DynamicsWorld::operator=(const DynamicsWorld& rhs) return *this; } -DynamicsWorld& DynamicsWorld::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void DynamicsWorld::SetGravity(const Vector3& gravity ) { #ifdef DYNAMICS_SUPPORT diff --git a/dali/public-api/dynamics/dynamics-world.h b/dali/public-api/dynamics/dynamics-world.h index 183ae55..6b41886 100644 --- a/dali/public-api/dynamics/dynamics-world.h +++ b/dali/public-api/dynamics/dynamics-world.h @@ -132,16 +132,6 @@ public: */ DynamicsWorld& operator=(const DynamicsWorld& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - DynamicsWorld& operator=(BaseHandle::NullType* rhs); - // Methods that modify the simulation public: diff --git a/dali/public-api/events/gesture-detector.cpp b/dali/public-api/events/gesture-detector.cpp index ac97177..d97eda4 100644 --- a/dali/public-api/events/gesture-detector.cpp +++ b/dali/public-api/events/gesture-detector.cpp @@ -53,13 +53,6 @@ GestureDetector& GestureDetector::operator=(const GestureDetector& rhs) return *this; } -GestureDetector& GestureDetector::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void GestureDetector::Attach(Actor actor) { GetImplementation(*this).Attach(GetImplementation(actor)); diff --git a/dali/public-api/events/gesture-detector.h b/dali/public-api/events/gesture-detector.h index 7da2730..789b55f 100644 --- a/dali/public-api/events/gesture-detector.h +++ b/dali/public-api/events/gesture-detector.h @@ -86,16 +86,6 @@ public: // Creation & Destruction */ GestureDetector& operator=(const GestureDetector& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - GestureDetector& operator=(BaseHandle::NullType* rhs); - public: // Actor related /** diff --git a/dali/public-api/events/long-press-gesture-detector.cpp b/dali/public-api/events/long-press-gesture-detector.cpp index b11f12e..c826416 100644 --- a/dali/public-api/events/long-press-gesture-detector.cpp +++ b/dali/public-api/events/long-press-gesture-detector.cpp @@ -76,13 +76,6 @@ LongPressGestureDetector& LongPressGestureDetector::operator=(const LongPressGes return *this; } -LongPressGestureDetector& LongPressGestureDetector::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void LongPressGestureDetector::SetTouchesRequired(unsigned int touches) { GetImplementation(*this).SetTouchesRequired(touches); diff --git a/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h index c94de17..bca062d 100644 --- a/dali/public-api/events/long-press-gesture-detector.h +++ b/dali/public-api/events/long-press-gesture-detector.h @@ -128,16 +128,6 @@ public: // Creation & Destruction */ LongPressGestureDetector& operator=(const LongPressGestureDetector& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - LongPressGestureDetector& operator=(BaseHandle::NullType* rhs); - public: // Setters /** diff --git a/dali/public-api/events/pan-gesture-detector.cpp b/dali/public-api/events/pan-gesture-detector.cpp index 81541b6..dffbb99 100644 --- a/dali/public-api/events/pan-gesture-detector.cpp +++ b/dali/public-api/events/pan-gesture-detector.cpp @@ -70,13 +70,6 @@ PanGestureDetector& PanGestureDetector::operator=(const PanGestureDetector& rhs) return *this; } -PanGestureDetector& PanGestureDetector::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void PanGestureDetector::SetMinimumTouchesRequired(unsigned int minimum) { GetImplementation(*this).SetMinimumTouchesRequired(minimum); diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h index 44c33f8..c99444c 100644 --- a/dali/public-api/events/pan-gesture-detector.h +++ b/dali/public-api/events/pan-gesture-detector.h @@ -135,16 +135,6 @@ public: // Creation & Destruction */ PanGestureDetector& operator=(const PanGestureDetector& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - PanGestureDetector& operator=(BaseHandle::NullType* rhs); - public: // Setters /** diff --git a/dali/public-api/events/pinch-gesture-detector.cpp b/dali/public-api/events/pinch-gesture-detector.cpp index cd3e9a0..7f49654 100644 --- a/dali/public-api/events/pinch-gesture-detector.cpp +++ b/dali/public-api/events/pinch-gesture-detector.cpp @@ -62,13 +62,6 @@ PinchGestureDetector& PinchGestureDetector::operator=(const PinchGestureDetector return *this; } -PinchGestureDetector& PinchGestureDetector::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - PinchGestureDetector::DetectedSignalV2& PinchGestureDetector::DetectedSignal() { return GetImplementation(*this).DetectedSignal(); diff --git a/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h index c554289..e9974e1 100644 --- a/dali/public-api/events/pinch-gesture-detector.h +++ b/dali/public-api/events/pinch-gesture-detector.h @@ -108,16 +108,6 @@ public: // Creation & Destruction */ PinchGestureDetector& operator=(const PinchGestureDetector& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - PinchGestureDetector& operator=(BaseHandle::NullType* rhs); - public: // Signals /** diff --git a/dali/public-api/events/tap-gesture-detector.cpp b/dali/public-api/events/tap-gesture-detector.cpp index 862e02a..b76e91f 100644 --- a/dali/public-api/events/tap-gesture-detector.cpp +++ b/dali/public-api/events/tap-gesture-detector.cpp @@ -69,13 +69,6 @@ TapGestureDetector& TapGestureDetector::operator=(const TapGestureDetector& rhs) return *this; } -TapGestureDetector& TapGestureDetector::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void TapGestureDetector::SetTapsRequired(unsigned int taps) { GetImplementation(*this).SetTapsRequired(taps); diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h index c1bd351..da01f40 100644 --- a/dali/public-api/events/tap-gesture-detector.h +++ b/dali/public-api/events/tap-gesture-detector.h @@ -120,16 +120,6 @@ public: // Creation & Destruction */ TapGestureDetector& operator=(const TapGestureDetector& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - TapGestureDetector& operator=(BaseHandle::NullType* rhs); - public: // Setters /** diff --git a/dali/public-api/geometry/animatable-mesh.cpp b/dali/public-api/geometry/animatable-mesh.cpp index 4923abf..1f678f4 100644 --- a/dali/public-api/geometry/animatable-mesh.cpp +++ b/dali/public-api/geometry/animatable-mesh.cpp @@ -65,13 +65,6 @@ AnimatableMesh& AnimatableMesh::operator=(const AnimatableMesh& rhs) return *this; } -AnimatableMesh& AnimatableMesh::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - unsigned int AnimatableMesh::GetNumberOfVertices() const { return GetImplementation(*this).GetNumberOfVertices(); diff --git a/dali/public-api/geometry/animatable-mesh.h b/dali/public-api/geometry/animatable-mesh.h index 6c3394a..733891e 100644 --- a/dali/public-api/geometry/animatable-mesh.h +++ b/dali/public-api/geometry/animatable-mesh.h @@ -123,16 +123,6 @@ public: AnimatableMesh& operator=(const AnimatableMesh& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - AnimatableMesh& operator=(BaseHandle::NullType* rhs); - - /** * @brief Get the number of vertices with which this mesh was created. * * @return number of vertices in this mesh diff --git a/dali/public-api/geometry/cloth.cpp b/dali/public-api/geometry/cloth.cpp index e9dc505..32af119 100644 --- a/dali/public-api/geometry/cloth.cpp +++ b/dali/public-api/geometry/cloth.cpp @@ -49,13 +49,6 @@ Cloth& Cloth::operator=(const Cloth& rhs) return *this; } -Cloth& Cloth::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Cloth Cloth::New( const float width, const float height, const int xSteps, const int ySteps, const Rect& textureCoordinates ) { MeshData meshData( MeshFactory::NewPlane(width, height, xSteps, ySteps, textureCoordinates) ); diff --git a/dali/public-api/geometry/cloth.h b/dali/public-api/geometry/cloth.h index 80009b1..4c7b4ee 100644 --- a/dali/public-api/geometry/cloth.h +++ b/dali/public-api/geometry/cloth.h @@ -88,16 +88,6 @@ public: Cloth& operator=(const Cloth& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Cloth& operator=(BaseHandle::NullType* rhs); - - /** * @brief Downcast an Object handle to a Cloth handle. * * If handle points to a Cloth object the downcast produces valid diff --git a/dali/public-api/geometry/mesh.cpp b/dali/public-api/geometry/mesh.cpp index 523a4c6..dbfdc0e 100644 --- a/dali/public-api/geometry/mesh.cpp +++ b/dali/public-api/geometry/mesh.cpp @@ -52,13 +52,6 @@ Mesh& Mesh::operator=(const Mesh& rhs) return *this; } -Mesh& Mesh::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Mesh Mesh::New( const MeshData& meshData ) { // Convert material handle to intrusive pointer diff --git a/dali/public-api/geometry/mesh.h b/dali/public-api/geometry/mesh.h index c14f9c3..5657968 100644 --- a/dali/public-api/geometry/mesh.h +++ b/dali/public-api/geometry/mesh.h @@ -79,16 +79,6 @@ public: Mesh& operator=(const Mesh& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Mesh& operator=(BaseHandle::NullType* rhs); - - /** * @brief Create an initialized plane aligned on the XY axis. * * @param[in] width The width of the plane diff --git a/dali/public-api/images/bitmap-image.cpp b/dali/public-api/images/bitmap-image.cpp index 37d7355..603394a 100644 --- a/dali/public-api/images/bitmap-image.cpp +++ b/dali/public-api/images/bitmap-image.cpp @@ -55,14 +55,6 @@ BitmapImage& BitmapImage::operator=(const BitmapImage& rhs) return *this; } -BitmapImage& BitmapImage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - - const BitmapImage BitmapImage::WHITE() { Internal::BitmapImage* internal = new Internal::BitmapImage(1,1,Pixel::RGBA8888, Immediate, Never); diff --git a/dali/public-api/images/bitmap-image.h b/dali/public-api/images/bitmap-image.h index 331afe6..2995448 100644 --- a/dali/public-api/images/bitmap-image.h +++ b/dali/public-api/images/bitmap-image.h @@ -206,16 +206,6 @@ public: BitmapImage& operator=(const BitmapImage& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - BitmapImage& operator=(BaseHandle::NullType* rhs); - - /** * @brief White pixel as image data. * * Can be used to create solid color actors. diff --git a/dali/public-api/images/encoded-buffer-image.cpp b/dali/public-api/images/encoded-buffer-image.cpp index a3479c7..32932b1 100644 --- a/dali/public-api/images/encoded-buffer-image.cpp +++ b/dali/public-api/images/encoded-buffer-image.cpp @@ -70,11 +70,4 @@ EncodedBufferImage& EncodedBufferImage::operator=(const EncodedBufferImage& rhs) return *this; } -EncodedBufferImage& EncodedBufferImage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - } // namespace Dali diff --git a/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h index e1f8301..9afe0a9 100644 --- a/dali/public-api/images/encoded-buffer-image.h +++ b/dali/public-api/images/encoded-buffer-image.h @@ -138,16 +138,6 @@ public: */ EncodedBufferImage& operator=(const EncodedBufferImage& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - EncodedBufferImage& operator=(BaseHandle::NullType* rhs); - public: // Not intended for application developers explicit DALI_INTERNAL EncodedBufferImage(Internal::EncodedBufferImage*); diff --git a/dali/public-api/images/frame-buffer-image.cpp b/dali/public-api/images/frame-buffer-image.cpp index fe5f9c3..6d2ea36 100644 --- a/dali/public-api/images/frame-buffer-image.cpp +++ b/dali/public-api/images/frame-buffer-image.cpp @@ -51,13 +51,6 @@ FrameBufferImage& FrameBufferImage::operator=(const FrameBufferImage& rhs) return *this; } -FrameBufferImage& FrameBufferImage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - FrameBufferImage FrameBufferImage::New(unsigned int width, unsigned int height, Pixel::Format pixelformat) { Dali::Vector2 stageSize = Stage::GetCurrent().GetSize(); diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h index 0aad737..bcba5c8 100644 --- a/dali/public-api/images/frame-buffer-image.h +++ b/dali/public-api/images/frame-buffer-image.h @@ -137,16 +137,6 @@ public: */ FrameBufferImage& operator=(const FrameBufferImage& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - FrameBufferImage& operator=(BaseHandle::NullType* rhs); - public: // Not intended for application developers explicit DALI_INTERNAL FrameBufferImage(Internal::FrameBufferImage*); diff --git a/dali/public-api/images/glyph-image.cpp b/dali/public-api/images/glyph-image.cpp index 3ae6cc7..b319581 100644 --- a/dali/public-api/images/glyph-image.cpp +++ b/dali/public-api/images/glyph-image.cpp @@ -54,13 +54,6 @@ GlyphImage& GlyphImage::operator=(const GlyphImage& rhs) return *this; } -GlyphImage& GlyphImage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - GlyphImage GlyphImage::New( const Character& character ) { // Retrieves the font family name for the given character. diff --git a/dali/public-api/images/glyph-image.h b/dali/public-api/images/glyph-image.h index df2d33d..a158c7d 100644 --- a/dali/public-api/images/glyph-image.h +++ b/dali/public-api/images/glyph-image.h @@ -111,16 +111,6 @@ public: */ GlyphImage& operator=(const GlyphImage& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - GlyphImage& operator=(BaseHandle::NullType* rhs); - public: // Not intended for application developers explicit DALI_INTERNAL GlyphImage( Internal::Image* ); diff --git a/dali/public-api/images/image.cpp b/dali/public-api/images/image.cpp index 6d9fe6b..f7aa347 100644 --- a/dali/public-api/images/image.cpp +++ b/dali/public-api/images/image.cpp @@ -61,13 +61,6 @@ Image& Image::operator=(const Image& rhs) return *this; } -Image& Image::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Image Image::New(const std::string& filename) { Internal::ImagePtr internal = Internal::Image::New( filename, diff --git a/dali/public-api/images/image.h b/dali/public-api/images/image.h index 91cd805..5eb086e 100644 --- a/dali/public-api/images/image.h +++ b/dali/public-api/images/image.h @@ -173,16 +173,6 @@ public: Image& operator=(const Image& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Image& operator=(BaseHandle::NullType* rhs); - - /** * @brief Create an initialised image object. * * @param [in] filename The filename of the image file to use. diff --git a/dali/public-api/images/nine-patch-image.cpp b/dali/public-api/images/nine-patch-image.cpp index 229602f..5d87920 100644 --- a/dali/public-api/images/nine-patch-image.cpp +++ b/dali/public-api/images/nine-patch-image.cpp @@ -51,13 +51,6 @@ NinePatchImage& NinePatchImage::operator=(const NinePatchImage& rhs) return *this; } -NinePatchImage& NinePatchImage::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - NinePatchImage NinePatchImage::New( const std::string& filename ) { ImageAttributes defaultAttrs; diff --git a/dali/public-api/images/nine-patch-image.h b/dali/public-api/images/nine-patch-image.h index dc953b7..d15c6dd 100644 --- a/dali/public-api/images/nine-patch-image.h +++ b/dali/public-api/images/nine-patch-image.h @@ -103,16 +103,6 @@ public: NinePatchImage& operator=(const NinePatchImage& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - NinePatchImage& operator=(BaseHandle::NullType* rhs); - - /** * Get the stretch borders * @return The border in pixels from the left, top, right, and bottom of the image respectively. */ diff --git a/dali/public-api/modeling/entity.cpp b/dali/public-api/modeling/entity.cpp index 3448da2..ae8c178 100644 --- a/dali/public-api/modeling/entity.cpp +++ b/dali/public-api/modeling/entity.cpp @@ -58,13 +58,6 @@ Entity& Entity::operator=(const Entity& rhs) return *this; } -Entity& Entity::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Entity Entity::Find(const std::string& name) const { Internal::Entity* entity = GetImplementation(*this).Find(name); diff --git a/dali/public-api/modeling/entity.h b/dali/public-api/modeling/entity.h index 498b6e6..dbc12b2 100644 --- a/dali/public-api/modeling/entity.h +++ b/dali/public-api/modeling/entity.h @@ -111,16 +111,6 @@ public: Entity& operator=(const Entity& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Entity& operator=(BaseHandle::NullType* rhs); - - /** * @brief Find an entity by name. * * The search includes this entity and it's children. diff --git a/dali/public-api/modeling/material.cpp b/dali/public-api/modeling/material.cpp index ff69902..805d576 100644 --- a/dali/public-api/modeling/material.cpp +++ b/dali/public-api/modeling/material.cpp @@ -73,13 +73,6 @@ Material& Material::operator=(const Material& rhs) return *this; } -Material& Material::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void Material::SetName(const std::string& name) { GetImplementation(*this).SetName(name); diff --git a/dali/public-api/modeling/material.h b/dali/public-api/modeling/material.h index c2db488..e7f6d4d 100644 --- a/dali/public-api/modeling/material.h +++ b/dali/public-api/modeling/material.h @@ -117,16 +117,6 @@ public: Material& operator=(const Material& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Material& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the material's name. * * @param[in] name The material's name diff --git a/dali/public-api/modeling/model-data.cpp b/dali/public-api/modeling/model-data.cpp index b333bc4..62c13e7 100644 --- a/dali/public-api/modeling/model-data.cpp +++ b/dali/public-api/modeling/model-data.cpp @@ -62,13 +62,6 @@ ModelData& ModelData::operator=(const ModelData& rhs) return *this; } -ModelData& ModelData::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - const std::string& ModelData::GetName() const { return GetImplementation(*this).GetName(); diff --git a/dali/public-api/modeling/model-data.h b/dali/public-api/modeling/model-data.h index 8a89833..a45dc71 100644 --- a/dali/public-api/modeling/model-data.h +++ b/dali/public-api/modeling/model-data.h @@ -96,16 +96,6 @@ public: ModelData& operator=(const ModelData& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - ModelData& operator=(BaseHandle::NullType* rhs); - - /** * @brief Returns the name of the model. * * @return The model name diff --git a/dali/public-api/modeling/model.cpp b/dali/public-api/modeling/model.cpp index 5e639a7..eeea2d9 100644 --- a/dali/public-api/modeling/model.cpp +++ b/dali/public-api/modeling/model.cpp @@ -64,13 +64,6 @@ Model& Model::operator=(const Model& rhs) return *this; } -Model& Model::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - LoadingState Model::GetLoadingState() { return GetImplementation(*this).GetLoadingState(); diff --git a/dali/public-api/modeling/model.h b/dali/public-api/modeling/model.h index 43de898..0a69e64 100644 --- a/dali/public-api/modeling/model.h +++ b/dali/public-api/modeling/model.h @@ -110,16 +110,6 @@ public: Model& operator=(const Model& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Model& operator=(BaseHandle::NullType* rhs); - - /** * @brief Query whether the model data has loaded. * * The asynchronous loading begins when the Model object is created. diff --git a/dali/public-api/object/base-handle.cpp b/dali/public-api/object/base-handle.cpp index 02900cc..45473a3 100644 --- a/dali/public-api/object/base-handle.cpp +++ b/dali/public-api/object/base-handle.cpp @@ -57,13 +57,6 @@ BaseHandle& BaseHandle::operator=(const BaseHandle& rhs) return *this; } -BaseHandle& BaseHandle::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - bool BaseHandle::DoAction(const std::string& command, const std::vector& attributes) { return GetImplementation(*this).DoAction( command, attributes ); diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h index 8a300fe..77bd59e 100644 --- a/dali/public-api/object/base-handle.h +++ b/dali/public-api/object/base-handle.h @@ -56,14 +56,6 @@ class DALI_IMPORT_API BaseHandle public: /** - * @brief Used for null pointer assignment below - */ - class NullType - { - NullType() { } - }; - - /** * @brief This constructor is used by Dali New() methods. * * @param [in] handle A pointer to a newly allocated Dali resource @@ -109,16 +101,6 @@ public: BaseHandle& operator=(const BaseHandle& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - BaseHandle& operator=(NullType* rhs); - - /** * @brief Connects a void() functor to a specified signal. * * @pre The signal must be available in this object. diff --git a/dali/public-api/object/constrainable.cpp b/dali/public-api/object/constrainable.cpp index 1fecc76..eb3a291 100644 --- a/dali/public-api/object/constrainable.cpp +++ b/dali/public-api/object/constrainable.cpp @@ -63,13 +63,6 @@ Constrainable& Constrainable::operator=(const Constrainable& rhs) return *this; } -Constrainable& Constrainable::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - ActiveConstraint Constrainable::ApplyConstraint( Constraint constraint ) { return GetImplementation(*this).ApplyConstraint( GetImplementation( constraint ) ); diff --git a/dali/public-api/object/constrainable.h b/dali/public-api/object/constrainable.h index 2e33f2d..b09019d 100644 --- a/dali/public-api/object/constrainable.h +++ b/dali/public-api/object/constrainable.h @@ -94,16 +94,6 @@ public: Constrainable& operator=(const Constrainable& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Constrainable& operator=(BaseHandle::NullType* rhs); - - /** * @brief Constrain one of the properties of an Actor. * * @note The constraint will be copied by the Actor. This means that modifying the apply-time etc. diff --git a/dali/public-api/object/handle.cpp b/dali/public-api/object/handle.cpp index 4a97de4..d81b062 100644 --- a/dali/public-api/object/handle.cpp +++ b/dali/public-api/object/handle.cpp @@ -55,13 +55,6 @@ Handle& Handle::operator=(const Handle& rhs) return *this; } -Handle& Handle::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - Handle Handle::DownCast( BaseHandle handle ) { return Handle( dynamic_cast(handle.GetObjectPtr()) ); diff --git a/dali/public-api/object/handle.h b/dali/public-api/object/handle.h index a0b9e32..090f7c5 100644 --- a/dali/public-api/object/handle.h +++ b/dali/public-api/object/handle.h @@ -107,16 +107,6 @@ public: Handle& operator=(const Handle& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Handle& operator=(BaseHandle::NullType* rhs); - - /** * @brief Downcast to a handle. * * If not the returned handle is left uninitialized. diff --git a/dali/public-api/object/object-registry.cpp b/dali/public-api/object/object-registry.cpp index 4d1f8b2..4dd9f4a 100644 --- a/dali/public-api/object/object-registry.cpp +++ b/dali/public-api/object/object-registry.cpp @@ -46,13 +46,6 @@ ObjectRegistry& ObjectRegistry::operator=(const ObjectRegistry& rhs) return *this; } -ObjectRegistry& ObjectRegistry::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - ObjectRegistry::ObjectCreatedSignalV2& ObjectRegistry::ObjectCreatedSignal() { return GetImplementation(*this).ObjectCreatedSignal(); diff --git a/dali/public-api/object/object-registry.h b/dali/public-api/object/object-registry.h index 38abcda..507db99 100644 --- a/dali/public-api/object/object-registry.h +++ b/dali/public-api/object/object-registry.h @@ -99,16 +99,6 @@ public: */ ObjectRegistry& operator=(const ObjectRegistry& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - ObjectRegistry& operator=(BaseHandle::NullType* rhs); - public: // Signals /** diff --git a/dali/public-api/object/property-conditions.cpp b/dali/public-api/object/property-conditions.cpp index 3acb940..23e94fd 100644 --- a/dali/public-api/object/property-conditions.cpp +++ b/dali/public-api/object/property-conditions.cpp @@ -47,13 +47,6 @@ PropertyCondition& PropertyCondition::operator=(const PropertyCondition& rhs) return *this; } -PropertyCondition& PropertyCondition::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - PropertyCondition::ArgumentContainer PropertyCondition::GetArguments() { return GetImplementation(*this).arguments; diff --git a/dali/public-api/object/property-conditions.h b/dali/public-api/object/property-conditions.h index 711a82e..b0a0ae9 100644 --- a/dali/public-api/object/property-conditions.h +++ b/dali/public-api/object/property-conditions.h @@ -72,16 +72,6 @@ public: */ PropertyCondition& operator=(const PropertyCondition& rhs); - /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - PropertyCondition& operator=(BaseHandle::NullType* rhs); - public: /** diff --git a/dali/public-api/object/property-notification.cpp b/dali/public-api/object/property-notification.cpp index 92bff11..ec1e687 100644 --- a/dali/public-api/object/property-notification.cpp +++ b/dali/public-api/object/property-notification.cpp @@ -59,13 +59,6 @@ PropertyNotification& PropertyNotification::operator=(const PropertyNotification return *this; } -PropertyNotification& PropertyNotification::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - PropertyCondition PropertyNotification::GetCondition() { return GetImplementation(*this).GetCondition(); diff --git a/dali/public-api/object/property-notification.h b/dali/public-api/object/property-notification.h index ef14b7f..e4151ae 100644 --- a/dali/public-api/object/property-notification.h +++ b/dali/public-api/object/property-notification.h @@ -96,16 +96,6 @@ public: PropertyNotification& operator=(const PropertyNotification& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - PropertyNotification& operator=(BaseHandle::NullType* rhs); - - /** * @brief Get the condition of this notification * * @return The condition is returned diff --git a/dali/public-api/object/type-info.cpp b/dali/public-api/object/type-info.cpp index e15c2d9..091c3c3 100644 --- a/dali/public-api/object/type-info.cpp +++ b/dali/public-api/object/type-info.cpp @@ -45,13 +45,6 @@ TypeInfo& TypeInfo::operator=(const TypeInfo& rhs) return *this; } -TypeInfo& TypeInfo::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - const std::string& TypeInfo::GetName() const { return GetImplementation(*this).GetName(); diff --git a/dali/public-api/object/type-info.h b/dali/public-api/object/type-info.h index 603153a..cf46eb3 100644 --- a/dali/public-api/object/type-info.h +++ b/dali/public-api/object/type-info.h @@ -108,16 +108,6 @@ public: TypeInfo& operator=(const TypeInfo& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - TypeInfo& operator=(BaseHandle::NullType* rhs); - - /** * @brief Retrieve the type name for this type. * * @return string name diff --git a/dali/public-api/object/type-registry.cpp b/dali/public-api/object/type-registry.cpp index f739b88..c679dd0 100644 --- a/dali/public-api/object/type-registry.cpp +++ b/dali/public-api/object/type-registry.cpp @@ -47,13 +47,6 @@ TypeRegistry& TypeRegistry::operator=(const TypeRegistry& rhs) return *this; } -TypeRegistry& TypeRegistry::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - TypeRegistry TypeRegistry::Get() { return TypeRegistry(Internal::TypeRegistry::Get()); diff --git a/dali/public-api/object/type-registry.h b/dali/public-api/object/type-registry.h index e38db99..8c25a20 100644 --- a/dali/public-api/object/type-registry.h +++ b/dali/public-api/object/type-registry.h @@ -126,16 +126,6 @@ public: TypeRegistry& operator=(const TypeRegistry& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - TypeRegistry& operator=(BaseHandle::NullType* rhs); - - /** * @brief Get TypeInfo for a registered type. * * @param [in] uniqueTypeName A unique type name diff --git a/dali/public-api/render-tasks/render-task-list.cpp b/dali/public-api/render-tasks/render-task-list.cpp index 4b7175e..ea0f4f9 100644 --- a/dali/public-api/render-tasks/render-task-list.cpp +++ b/dali/public-api/render-tasks/render-task-list.cpp @@ -48,13 +48,6 @@ RenderTaskList& RenderTaskList::operator=(const RenderTaskList& rhs) return *this; } -RenderTaskList& RenderTaskList::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - RenderTask RenderTaskList::CreateTask() { return GetImplementation(*this).CreateTask(); diff --git a/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h index 35b77d8..3ab8d3d 100644 --- a/dali/public-api/render-tasks/render-task-list.h +++ b/dali/public-api/render-tasks/render-task-list.h @@ -82,16 +82,6 @@ public: RenderTaskList& operator=(const RenderTaskList& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - RenderTaskList& operator=(BaseHandle::NullType* rhs); - - /** * @brief Create a new RenderTask. * * This will be appended to the list of render-tasks. diff --git a/dali/public-api/render-tasks/render-task.cpp b/dali/public-api/render-tasks/render-task.cpp index 9002fe1..971dc10 100644 --- a/dali/public-api/render-tasks/render-task.cpp +++ b/dali/public-api/render-tasks/render-task.cpp @@ -74,13 +74,6 @@ RenderTask& RenderTask::operator=(const RenderTask& rhs) return *this; } -RenderTask& RenderTask::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - void RenderTask::SetSourceActor( Actor actor ) { // NULL handle is allowed diff --git a/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h index cdc989d..a31290e 100644 --- a/dali/public-api/render-tasks/render-task.h +++ b/dali/public-api/render-tasks/render-task.h @@ -170,16 +170,6 @@ public: RenderTask& operator=(const RenderTask& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - RenderTask& operator=(BaseHandle::NullType* rhs); - - /** * @brief Set the actors to be rendered. * @param[in] actor This actor and its children will be rendered. * If actor is an empty handle, then nothing will be rendered. diff --git a/dali/public-api/shader-effects/shader-effect.cpp b/dali/public-api/shader-effects/shader-effect.cpp index 4337c9f..eafbf20 100644 --- a/dali/public-api/shader-effects/shader-effect.cpp +++ b/dali/public-api/shader-effects/shader-effect.cpp @@ -60,13 +60,6 @@ ShaderEffect& ShaderEffect::operator=(const ShaderEffect& rhs) return *this; } -ShaderEffect& ShaderEffect::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - ShaderEffect ShaderEffect::New( const std::string& vertexShader, const std::string& fragmentShader, GeometryType type, GeometryHints hints) { Internal::ShaderEffectPtr internal = Internal::ShaderEffect::New( vertexShader, fragmentShader, type, hints ); diff --git a/dali/public-api/shader-effects/shader-effect.h b/dali/public-api/shader-effects/shader-effect.h index f61f47d..ca8b854 100644 --- a/dali/public-api/shader-effects/shader-effect.h +++ b/dali/public-api/shader-effects/shader-effect.h @@ -330,16 +330,6 @@ public: ShaderEffect& operator=(const ShaderEffect& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - ShaderEffect& operator=(BaseHandle::NullType* rhs); - - /** * @brief Sets image for using as effect texture. * * This image texture will be bound to the "sEffect" sampler diff --git a/dali/public-api/text/font.cpp b/dali/public-api/text/font.cpp index fe38d86..5ccb899 100644 --- a/dali/public-api/text/font.cpp +++ b/dali/public-api/text/font.cpp @@ -126,13 +126,6 @@ Font& Font::operator=(const Font& rhs) return *this; } -Font& Font::operator=(BaseHandle::NullType* rhs) -{ - DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle"); - Reset(); - return *this; -} - PixelSize Font::GetLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, const CapsHeight& capsHeight) { return Internal::Font::GetLineHeightFromCapsHeight(fontFamily,fontStyle,capsHeight); diff --git a/dali/public-api/text/font.h b/dali/public-api/text/font.h index 8861eda..2f6dc81 100644 --- a/dali/public-api/text/font.h +++ b/dali/public-api/text/font.h @@ -189,16 +189,6 @@ public: Font& operator=(const Font& rhs); /** - * @brief This method is defined to allow assignment of the NULL value, - * and will throw an exception if passed any other value. - * - * Assigning to NULL is an alias for Reset(). - * @param [in] rhs A NULL pointer - * @return A reference to this handle - */ - Font& operator=(BaseHandle::NullType* rhs); - - /** * @brief Convert a PixelSize from CapsHeight to it's equivalent LineHeight. * * @param [in] fontFamily The family's name of the font requested -- 2.7.4