Revert "[Tizen] Add Integration API to Create public event type"

This reverts commit 4ffe40a1c9ec1384e9cbf156ed8cfca09f1f6198.

diff --git a/automated-tests/src/dali/utc-Dali-TouchEvent.cpp b/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
index 8d5b5a0..dbd663b 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
@@ -114,48 +114,3 @@ int UtcDaliTouchEventMoveAssignmentP(void)
 
   END_TEST;
 }
-
-int UtcDaliTouchEventCopyConstructorWithPointP(void)
-{
-  Dali::Integration::Point point;
-
-  Vector2 touchPoint( 10.0, 20.0 );
-  point.SetDeviceId( 1 );
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( touchPoint.x, touchPoint.y ) );
-
-  TouchEvent touchEvent = Integration::NewTouchEvent(123u, point);
-  DALI_TEST_CHECK( touchEvent );
-
-  const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
-
-  TouchEvent touchEvent2( touchEvent );
-  DALI_TEST_CHECK( touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( touchEvent, touchEvent2, TEST_LOCATION );
-  DALI_TEST_EQUALS( refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliTouchEventMoveConstructorWithPointP(void)
-{
-  Dali::Integration::Point point;
-
-  Vector2 touchPoint( 10.0, 20.0 );
-  point.SetDeviceId( 1 );
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( touchPoint.x, touchPoint.y ) );
-
-  TouchEvent touchEvent = Integration::NewTouchEvent(123u, point);
-  DALI_TEST_CHECK( touchEvent );
-
-  const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
-
-  TouchEvent touchEvent2( std::move(touchEvent) );
-  DALI_TEST_CHECK( !touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-
-  END_TEST;
-}

diff --git a/dali/integration-api/events/touch-integ.cpp b/dali/integration-api/events/touch-integ.cpp
index a5e4e3e..978e9ed 100644 (file)
--- a/dali/integration-api/events/touch-integ.cpp
+++ b/dali/integration-api/events/touch-integ.cpp
@@ -22,16 +22,11 @@ namespace Dali
 namespace Integration
 {
 
-Dali::TouchEvent NewTouchEvent(uint32_t timeStamp, const TouchPoint& point)
+Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point)
 {
-  return NewTouchEvent( timeStamp, Integration::Point( point ) );
-}
-
-Dali::TouchEvent NewTouchEvent( uint32_t timeStamp, const Dali::Integration::Point& point )
-{
-  Internal::TouchEventPtr touchEventImpl( new Internal::TouchEvent( timeStamp ) );
-  touchEventImpl->AddPoint( point );
-  Dali::TouchEvent handle( touchEventImpl.Get() );
+  Internal::TouchEventPtr touchEventImpl( new Internal::TouchEvent(timestamp) );
+  touchEventImpl->AddPoint(Integration::Point(point));
+  Dali::TouchEvent handle(touchEventImpl.Get());
   return handle;
 }
 

diff --git a/dali/integration-api/events/touch-integ.h b/dali/integration-api/events/touch-integ.h
index ae96fe9..3f48898 100644 (file)
--- a/dali/integration-api/events/touch-integ.h
+++ b/dali/integration-api/events/touch-integ.h
@@ -21,7 +21,6 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/devel-api/events/touch-point.h>
-#include <dali/integration-api/events/point.h>
 
 namespace Dali
 {
@@ -32,20 +31,11 @@ namespace Integration
 /**
  * Create a new touch data handle from timestamp and touch point.
  *
- * @param[in] timeStamp The time stamp of the touch event.
+ * @param[in] timestamp The timestamp of the touch event.
  * @param[in] point The point on screen where the touch occurred.
  * @return A new touch data handle.
  */
-DALI_CORE_API Dali::TouchEvent NewTouchEvent(uint32_t timeStamp, const TouchPoint& point);
-
-/**
- * Create a new touch data handle from timestamp and point.
- *
- * @param[in] timeStamp The time stamp of the touch event.
- * @param[in] point The point on screen where the touch occurred.
- * @return A new touch data handle.
- */
-DALI_CORE_API Dali::TouchEvent NewTouchEvent( uint32_t timeStamp, const Dali::Integration::Point& point );
+DALI_CORE_API Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point);
 
 } // namespace Integration