Merge "Removed TouchEvent from dali-core" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / accessibility-manager / accessibility-manager-impl.h

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 4a3d9fd..76b34b3 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
 
 /*
- * Copyright (c) 2019 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.
@@ -407,14 +407,6 @@ public:  // Signals
   }
 
   /**
-   * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadIndicatorInformationSignal
-   */
-  AccessibilityActionSignalType& ActionReadIndicatorInformationSignal()
-  {
-    return mActionReadIndicatorInformationSignal;
-  }
-
-  /**
    * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadPauseResumeSignal
    */
   AccessibilityActionSignalType& ActionReadPauseResumeSignal()
@@ -514,10 +506,10 @@ private:
 
   /**
    * Perform the accessibility action associated with a scroll event.
-   * @param touchEvent The touch point (and time) of the event.
+   * @param touchData The touch point (and time) of the event.
    * @return whether the focus is cleared or not.
    */
-  virtual bool AccessibilityActionScroll( Dali::TouchEvent& touchEvent );
+  virtual bool AccessibilityActionScroll( Dali::TouchData& touchData );
 
   /**
    * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up).
@@ -667,10 +659,10 @@ private:
 
   /**
    * Perform the accessibility action to mouse move (by one finger tap & hold and move).
-   * @param touchEvent touch event structure
+   * @param touchData touch point and time of the event
    * @return whether the accessibility action is performed or not.
    */
-  virtual bool AccessibilityActionTouch(const TouchEvent& touchEvent);
+  virtual bool AccessibilityActionTouch(const TouchData& touchData);
 
   /**
    * This function is connected to the TtsPlayer StateChangeSignal.
@@ -717,7 +709,6 @@ private:
   AccessibilityActionSignalType       mActionReadFromTopSignal;
   AccessibilityActionSignalType       mActionReadFromNextSignal;
   AccessibilityActionSignalType       mActionZoomSignal;
-  AccessibilityActionSignalType       mActionReadIndicatorInformationSignal;
   AccessibilityActionSignalType       mActionReadPauseResumeSignal;
   AccessibilityActionSignalType       mActionStartStopSignal;
   AccessibilityActionScrollSignalType mActionScrollSignal;