Make warning message instead of Assert when getting Child Property

[platform/core/uifw/dali-core.git] / dali / integration-api / events / touch-event-integ.cpp

diff --git a/dali/integration-api/events/touch-event-integ.cpp b/dali/integration-api/events/touch-event-integ.cpp
index 438530f..ac44731 100644 (file)
--- a/dali/integration-api/events/touch-event-integ.cpp
+++ b/dali/integration-api/events/touch-event-integ.cpp
@@ -18,9 +18,6 @@
 // CLASS HEADER
 #include <dali/integration-api/events/touch-event-integ.h>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 namespace Dali
 {
 
@@ -28,14 +25,12 @@ namespace Integration
 {
 
 TouchEvent::TouchEvent()
-: Event(Touch),
-  time(0)
+: MultiPointEvent( Touch )
 {
 }
 
-TouchEvent::TouchEvent(unsigned long time)
-: Event(Touch),
-  time(time)
+TouchEvent::TouchEvent( unsigned long time )
+: MultiPointEvent( Touch, time )
 {
 }
 
@@ -43,28 +38,6 @@ TouchEvent::~TouchEvent()
 {
 }
 
-void TouchEvent::AddPoint(const TouchPoint& point)
-{
-  points.push_back(point);
-}
-
-TouchPoint& TouchEvent::GetPoint(unsigned int point)
-{
-  DALI_ASSERT_ALWAYS(point < points.size() && "TouchEvent: Point index out of bounds");
-  return points[point];
-}
-
-const TouchPoint& TouchEvent::GetPoint(unsigned int point) const
-{
-  DALI_ASSERT_ALWAYS(point < points.size() && "TouchEvent: Point index out of bounds");
-  return points[point];
-}
-
-unsigned int TouchEvent::GetPointCount() const
-{
-  return points.size();
-}
-
 } // namespace Integration
 
 } // namespace Dali