[dali_1.9.25] Merge branch 'devel/master'

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

diff --git a/dali/integration-api/events/multi-point-event-integ.cpp b/dali/integration-api/events/multi-point-event-integ.cpp
index 780a04f..b0f2d6f 100644 (file)
--- a/dali/integration-api/events/multi-point-event-integ.cpp
+++ b/dali/integration-api/events/multi-point-event-integ.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ MultiPointEvent::MultiPointEvent( Type eventType )
 {
 }
 
-MultiPointEvent::MultiPointEvent( Type eventType, unsigned long time )
+MultiPointEvent::MultiPointEvent( Type eventType, uint32_t time )
 : Event( eventType ),
   time( time )
 {
@@ -48,21 +48,21 @@ void MultiPointEvent::AddPoint( const Point& point )
   points.push_back(point);
 }
 
-Point& MultiPointEvent::GetPoint( unsigned int point )
+Point& MultiPointEvent::GetPoint( uint32_t point )
 {
   DALI_ASSERT_ALWAYS(point < points.size() && "MultiPointEvent: Point index out of bounds");
   return points[point];
 }
 
-const Point& MultiPointEvent::GetPoint( unsigned int point ) const
+const Point& MultiPointEvent::GetPoint( uint32_t point ) const
 {
   DALI_ASSERT_ALWAYS(point < points.size() && "MultiPointEvent: Point index out of bounds");
   return points[point];
 }
 
-unsigned int MultiPointEvent::GetPointCount() const
+uint32_t MultiPointEvent::GetPointCount() const
 {
-  return points.size();
+  return static_cast<uint32_t>( points.size() ); // not going to overflow in practice
 }
 
 } // namespace Integration