Merge "Clean up the code to build successfully on macOS" into devel/master

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

diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.h b/dali/internal/update/gestures/scene-graph-pan-gesture.h
index c2a2d69..8386102 100644 (file)
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.h
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.h
@@ -77,19 +77,12 @@ public:
      */
     struct Info
     {
-      Info()
-      {
-      }
+      Info() = default;
 
       /**
        * Copy constructor
        */
-      Info( const Info& rhs )
-      : velocity( rhs.velocity ),
-        displacement( rhs.displacement ),
-        position( rhs.position )
-      {
-      }
+      Info(const Info& rhs) = default;
 
       /**
        * Assignment operator
@@ -180,9 +173,9 @@ public:
     volatile bool read;
   };
 
-  typedef std::vector<PanInfo> PanInfoHistory;
-  typedef PanInfoHistory::iterator PanInfoHistoryIter;
-  typedef PanInfoHistory::const_iterator PanInfoHistoryConstIter;
+  using PanInfoHistory          = std::vector<PanInfo>;
+  using PanInfoHistoryIter      = PanInfoHistory::iterator;
+  using PanInfoHistoryConstIter = PanInfoHistory::const_iterator;
 
 private:
   static const unsigned int PAN_GESTURE_HISTORY = 30u;
@@ -197,7 +190,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~PanGesture();
+  ~PanGesture() override;
 
   /**
    * Adds a PanGesture to the internal circular-buffer waiting to be handled by UpdateProperties.
@@ -410,11 +403,13 @@ private:
 
   // Struct to keep pairs of local and screen data together.
   // TODO: This can encapsulate some functionality also.
-  typedef struct
+  using RelativeVectors = struct
+
   {
     Vector2 local;
+
     Vector2 screen;
-  } RelativeVectors;
+  };
 
   /**
    * Houses new code to process input events and generate an output point.