Purge underscored header file barriers

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-touch-utils.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
index ebae313..3a623cb 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h
@@ -1,8 +1,8 @@
-#ifndef _TEST_TOUCH_UTILS_H_
-#define _TEST_TOUCH_UTILS_H_
+#ifndef TEST_TOUCH_UTILS_H
+#define TEST_TOUCH_UTILS_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.
@@ -62,10 +62,13 @@ struct TouchEventDataFunctor
   }
 
   // Generate a touch-event
-  Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, Vector2 screenPosition ) const
+  Integration::TouchEvent GenerateSingleTouch( PointState::Type state, const Vector2& screenPosition ) const
   {
     Integration::TouchEvent touchEvent;
-    touchEvent.points.push_back( TouchPoint ( 0, state, screenPosition.x, screenPosition.y ) );
+    Integration::Point point;
+    point.SetState( state );
+    point.SetScreenPosition( screenPosition );
+    touchEvent.points.push_back( point );
     return touchEvent;
   }
 
@@ -75,4 +78,4 @@ struct TouchEventDataFunctor
 
 } // namespace Dali
 
-#endif //  _TEST_TOUCH_UTILS_H_
+#endif // TEST_TOUCH_UTILS_H