X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Faccessibility-manager%2Faccessibility-manager-impl.h;h=d51d7532c2111243da0d1ea3a5e286b8c35a858b;hb=b514a4671789bee2f03b0177393b9a21f62ac2c3;hp=1603a02a6d3eaa2518560327a7173a1606997c85;hpb=0af6166d13835feea397eb1ba52044182a506ab3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 1603a02..d51d753 100644
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
-#define __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
+#define DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -23,8 +23,8 @@
 #include <dali/devel-api/common/map-wrapper.h>
 #include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
 #include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-event.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
@@ -220,17 +220,6 @@ public:
    */
   Toolkit::AccessibilityManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
 
-  /**
-   * Connects a callback function with the object's signals.
-   * @param[in] object The object providing the signal.
-   * @param[in] tracker Used to disconnect the signal.
-   * @param[in] signalName The signal to connect to.
-   * @param[in] functor A newly allocated FunctorDelegate.
-   * @return True if the signal was connected.
-   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
-   */
-  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
-
 public:  // Signals
 
   /**
@@ -497,11 +486,6 @@ private:
   void DoActivate(Actor actor);
 
   /**
-   * Create the default indicator actor to highlight the focused actor.
-   */
-  void CreateDefaultFocusIndicatorActor();
-
-  /**
    * Set whether the actor is focusable or not. A focusable property will be registered for
    * the actor if not yet.
    * @param actor The actor to be focused
@@ -514,7 +498,7 @@ private:
    * @param[in]  panEvent  The pan event to be handled.
    * @return whether the gesture is handled successfully or not.
    */
-  virtual bool HandlePanGesture(const Integration::PanGestureEvent& panEvent);
+  virtual bool HandlePanGesture(const AccessibilityGestureEvent& panEvent);
 
   /**
    * Change the accessibility status when Accessibility feature(screen-reader) turned on or off.
@@ -651,14 +635,14 @@ private:
 
   /**
    * Perform the accessibility action to move the focus to the first item on the top
-   * and read from the top item continously (by three fingers single tap).
+   * and read from the top item continuously (by three fingers single tap).
    * @return whether the accessibility action is performed or not.
    */
   virtual bool AccessibilityActionReadFromTop();
 
   /**
    * Perform the accessibility action to move the focus to and read from the next item
-   * continously (by three fingers double tap).
+   * continuously (by three fingers double tap).
    * @return whether the accessibility action is performed or not.
    */
   virtual bool AccessibilityActionReadFromNext();
@@ -670,12 +654,6 @@ private:
   virtual bool AccessibilityActionZoom();
 
   /**
-   * Perform the accessibility action to read the information in the indicator (by two fingers triple tap).
-   * @return whether the accessibility action is performed or not.
-   */
-  virtual bool AccessibilityActionReadIndicatorInformation();
-
-  /**
    * Perform the accessibility action to pause/resume the current read out (by two fingers single tap).
    * @return whether the accessibility action is performed or not.
    */
@@ -787,4 +765,4 @@ inline const Internal::AccessibilityManager& GetImpl(const Dali::Toolkit::Access
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
+#endif // DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H