Use modern construct 'using' instead of typedef.

[platform/core/uifw/dali-core.git] / dali / internal / update / gestures / pan-gesture-profiling.h

diff --git a/dali/internal/update/gestures/pan-gesture-profiling.h b/dali/internal/update/gestures/pan-gesture-profiling.h
index 0ab89b1..5f7e513 100644 (file)
--- a/dali/internal/update/gestures/pan-gesture-profiling.h
+++ b/dali/internal/update/gestures/pan-gesture-profiling.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
-#define __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
+#ifndef DALI_INTERNAL_PAN_GESTURE_PROFILING_H
+#define DALI_INTERNAL_PAN_GESTURE_PROFILING_H
 
 /*
- * 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.
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/events/gesture-enumerations.h>
 
 namespace Dali
 {
@@ -32,7 +33,7 @@ struct PanGestureProfiling
 {
   struct Position
   {
-    Position( unsigned int time, Vector2 position, Vector2 displacement, Vector2 velocity, int state )
+    Position( unsigned int time, Vector2 position, Vector2 displacement, Vector2 velocity, GestureState state )
     : time( time ), position( position ), displacement( displacement ), velocity( velocity ), state( state )
     {
     }
@@ -41,10 +42,10 @@ struct PanGestureProfiling
     Vector2 position;
     Vector2 displacement;
     Vector2 velocity;
-    int state;
+    GestureState state;
   };
 
-  typedef std::vector< PanGestureProfiling::Position > PanPositionContainer;
+  using PanPositionContainer = std::vector<PanGestureProfiling::Position>;
 
   void PrintData() const;
 
@@ -62,4 +63,4 @@ struct PanGestureProfiling
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
+#endif // DALI_INTERNAL_PAN_GESTURE_PROFILING_H