Use modern construct 'using' instead of typedef.

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

diff --git a/dali/integration-api/events/multi-point-event-integ.h b/dali/integration-api/events/multi-point-event-integ.h
index 364c541..14007a8 100644 (file)
--- a/dali/integration-api/events/multi-point-event-integ.h
+++ b/dali/integration-api/events/multi-point-event-integ.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_MULTI_POINT_EVENT_H__
-#define __DALI_INTEGRATION_MULTI_POINT_EVENT_H__
+#ifndef DALI_INTEGRATION_MULTI_POINT_EVENT_H
+#define DALI_INTEGRATION_MULTI_POINT_EVENT_H
 
 /*
- * Copyright (c) 2018 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.
@@ -28,10 +28,9 @@ namespace Dali
 
 namespace Integration
 {
-
-typedef std::vector< Point > PointContainer; ///< Container of points
-typedef PointContainer::iterator PointContainerIterator; ///< Iterator for Dali::Integration::PointContainer
-typedef PointContainer::const_iterator PointContainerConstIterator; ///< Const iterator for Dali::Integration::PointContainer
+using PointContainer              = std::vector<Point>;             ///< Container of points
+using PointContainerIterator      = PointContainer::iterator;       ///< Iterator for Dali::Integration::PointContainer
+using PointContainerConstIterator = PointContainer::const_iterator; ///< Const iterator for Dali::Integration::PointContainer
 
 /**
  * An instance of this structure should be used by the adaptor to send a multi-point event to Dali core.
@@ -59,7 +58,7 @@ protected:
    * Constructor
    * @param[in]  time  The time the event occurred.
    */
-  MultiPointEvent(Type eventType, unsigned long time);
+  MultiPointEvent(Type eventType, uint32_t time);
 
 public:
 
@@ -73,7 +72,7 @@ public:
   /**
    * @brief The time
    */
-  unsigned long time;
+  uint32_t time;
 
   // Convenience Methods
 
@@ -87,23 +86,23 @@ public:
    * @brief Retrieves the Point at position point.
    * @return The Point at position point.
    */
-  Point& GetPoint( unsigned int point );
+  Point& GetPoint( uint32_t point );
 
   /**
    * @brief Retrieves a const ref of the Point at position point.
    * @return The const ref of the Point at position point.
    */
-  const Point& GetPoint( unsigned int point ) const;
+  const Point& GetPoint( uint32_t point ) const;
 
   /**
    * @brief The total number of Points in this TouchEvent.
    * @return The point count.
    */
-  unsigned int GetPointCount() const;
+  uint32_t GetPointCount() const;
 };
 
 } // namespace Integration
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_MULTI_POINT_EVENT_H__
+#endif // DALI_INTEGRATION_MULTI_POINT_EVENT_H