Making DALi public API typesafe using guaranteed types; uint8_t, uint32_t

[platform/core/uifw/dali-core.git] / dali / public-api / events / touch-event.h

diff --git a/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h
index 92b6988..f4adbf8 100644 (file)
--- a/dali/public-api/events/touch-event.h
+++ b/dali/public-api/events/touch-event.h
@@ -2,7 +2,7 @@
 #define __DALI_TOUCH_EVENT_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -38,31 +38,31 @@ namespace Dali
  * touched or the points where a touch has stopped.
  * @SINCE_1_0.0
  */
-struct DALI_IMPORT_API TouchEvent
+struct DALI_CORE_API TouchEvent
 {
   // Construction & Destruction
 
   /**
    * @DEPRECATED_1_1.37
-   * @brief Default constructor
+   * @brief Default constructor.
    * @SINCE_1_0.0
    */
-  TouchEvent();
+  TouchEvent() DALI_DEPRECATED_API;
 
   /**
    * @DEPRECATED_1_1.37
-   * @brief Constructor
+   * @brief Constructor.
    * @SINCE_1_0.0
    * @param[in] time The time the event occurred
    */
-  TouchEvent(unsigned long time);
+  TouchEvent(unsigned long time) DALI_DEPRECATED_API;
 
   /**
    * @DEPRECATED_1_1.37
-   * @brief Destructor
+   * @brief Destructor.
    * @SINCE_1_0.0
    */
-  ~TouchEvent();
+  ~TouchEvent() DALI_DEPRECATED_API;
 
   // Data
 
@@ -88,9 +88,9 @@ struct DALI_IMPORT_API TouchEvent
    * @brief Returns the total number of points in this TouchEvent.
    *
    * @SINCE_1_0.0
-   * @return Total number of Points.
+   * @return Total number of Points
    */
-  unsigned int GetPointCount() const;
+  uint32_t GetPointCount() const DALI_DEPRECATED_API;
 
   /**
    * @DEPRECATED_1_1.37
@@ -99,12 +99,12 @@ struct DALI_IMPORT_API TouchEvent
    * The first point in the set is always the primary
    * touch point (i.e. the first point touched in a multi-touch event).
    * @SINCE_1_0.0
-   * @param[in] point The index of the required Point.
+   * @param[in] point The index of the required Point
    * @return Point requested
    * @note "point" should be less than the value returned by GetPointCount().
    *       If out of range, then program asserts.
    */
-  const TouchPoint& GetPoint(unsigned int point) const;
+  const TouchPoint& GetPoint( uint32_t point ) const DALI_DEPRECATED_API;
 };
 
 /**