Use existing callback ID for recurring callbacks

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / accessibility-adaptor.h

diff --git a/dali/devel-api/adaptor-framework/accessibility-adaptor.h b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
index 7b81b56..f6f963c 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility-adaptor.h
+++ b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_ACCESSIBILITY_ADAPTOR_H__
+#ifndef DALI_ACCESSIBILITY_ADAPTOR_H
+#define DALI_ACCESSIBILITY_ADAPTOR_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -18,34 +18,32 @@
  *
  */
 
-
 // EXTERNAL INCLUDES
-#include <dali/public-api/events/touch-event.h>
+#include <dali/devel-api/events/touch-point.h>
+#include <dali/public-api/dali-adaptor-common.h>
 #include <dali/public-api/object/base-handle.h>
 
 namespace Dali
 {
-
 namespace Internal DALI_INTERNAL
 {
 namespace Adaptor
 {
 class AccessibilityAdaptor;
 }
-}
+} // namespace DALI_INTERNAL
 
 class AccessibilityActionHandler;
 class AccessibilityGestureHandler;
-class TouchPoint;
+struct TouchPoint;
 
 /**
- * @brief The AccessibilityAdaptor provides communication to the indicator and the accessibility manager interface (implemented in toolkit).
+ * @brief The AccessibilityAdaptor provides communication to the accessibility manager interface (implemented in toolkit).
  *
  */
-class DALI_IMPORT_API AccessibilityAdaptor : public BaseHandle
+class DALI_ADAPTOR_API AccessibilityAdaptor : public BaseHandle
 {
 public:
-
   /**
    * @brief Create an uninitialized handle.
    *
@@ -187,16 +185,6 @@ public:
   bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
 
   /**
-   * @brief Handle the accessibility action to move for the current focused actor
-   * (by 1 finger tap & hold and move).
-   *
-   * @param[in]  point      The touch point information.
-   * @param[in]  timeStamp  The time the touch occurred.
-   * @return Whether the action is performed successfully or not.
-   */
-  bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
-
-  /**
    * @brief Handle the accessibility action to navigate back (by two fingers circle draw).
    * @return Whether the action is performed successfully or not.
    */
@@ -303,14 +291,6 @@ public:
   bool HandleActionZoomEvent();
 
   /**
-   * @brief Handle the accessibility action to read the information in the indicator
-   * (by two fingers triple tap).
-   *
-   * @return Whether the action is performed successfully or not.
-   */
-  bool HandleActionReadIndicatorInformationEvent();
-
-  /**
    * @brief Handle the accessibility action to pause/resume the current speech
    * (by two fingers single tap).
    *
@@ -327,22 +307,21 @@ public:
   bool HandleActionStartStopEvent();
 
 public: // Not intended for application developers
-
   /**
    * @brief Creates a handle using the Adaptor::Internal implementation.
    *
    * @param[in] adaptor The AccessibilityAdaptor implementation.
    */
-  DALI_INTERNAL AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdaptor& adaptor );
+  DALI_INTERNAL AccessibilityAdaptor(Internal::Adaptor::AccessibilityAdaptor& adaptor);
 
   /**
    * @brief This constructor is used by AccessibilityAdaptor::Get().
    *
    * @param[in] adaptor A pointer to the accessibility adaptor.
    */
-  explicit DALI_INTERNAL AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdaptor* adaptor );
+  explicit DALI_INTERNAL AccessibilityAdaptor(Internal::Adaptor::AccessibilityAdaptor* adaptor);
 };
 
 } // namespace Dali
 
-#endif // __DALI_ACCESSIBILITY_ADAPTOR_H__
+#endif // DALI_ACCESSIBILITY_ADAPTOR_H