Merge "Add test case for Window" into tizen

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / accessibility-manager-impl-x.cpp

diff --git a/adaptors/x11/accessibility-manager-impl-x.cpp b/adaptors/x11/accessibility-manager-impl-x.cpp
index f6d6175..f5741f8 100644 (file)
--- a/adaptors/x11/accessibility-manager-impl-x.cpp
+++ b/adaptors/x11/accessibility-manager-impl-x.cpp
@@ -23,12 +23,14 @@
 #include <Ecore_X.h>
 #include <Elementary.h>
 
-#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/debug.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/gesture-requests.h>
+
+// INTERNAL INCLUDES
 #include "system-settings.h"
 
+#define MSG_DOMAIN_CONTROL_ACCESS (int)ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL
+
 namespace Dali
 {
 
@@ -55,9 +57,9 @@ bool AccessibilityManager::HandleActionNextEvent(bool allowEndFeedback)
    */
   if( !mIndicatorFocused )
   {
-    if( !mActionNextSignalV2.Empty() )
+    if( !mActionNextSignal.Empty() )
     {
-      mActionNextSignalV2.Emit( handle );
+      mActionNextSignal.Emit( handle );
     }
   }
 
@@ -90,9 +92,9 @@ bool AccessibilityManager::HandleActionPreviousEvent(bool allowEndFeedback)
    */
  if ( !mIndicatorFocused )
   {
-    if( !mActionPreviousSignalV2.Empty() )
+    if( !mActionPreviousSignal.Empty() )
     {
-      mActionPreviousSignalV2.Emit( handle );
+      mActionPreviousSignal.Emit( handle );
     }
   }
 
@@ -125,9 +127,9 @@ bool AccessibilityManager::HandleActionActivateEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionActivateSignalV2.Empty() )
+    if( !mActionActivateSignal.Empty() )
     {
-      mActionActivateSignalV2.Emit( handle );
+      mActionActivateSignal.Emit( handle );
     }
   }
 
@@ -231,9 +233,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y,
      */
     if( !mIndicatorFocused )
     {
-      if ( !mActionReadSignalV2.Empty() )
+      if ( !mActionReadSignal.Empty() )
       {
-        mActionReadSignalV2.Emit( handle );
+        mActionReadSignal.Emit( handle );
       }
     }
   }
@@ -245,9 +247,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y,
      */
     if( !mIndicatorFocused )
     {
-      if ( !mActionOverSignalV2.Empty() )
+      if ( !mActionOverSignal.Empty() )
       {
-        mActionOverSignalV2.Emit( handle );
+        mActionOverSignal.Emit( handle );
       }
     }
   }
@@ -275,9 +277,9 @@ bool AccessibilityManager::HandleActionReadNextEvent(bool allowEndFeedback)
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionReadNextSignalV2.Empty() )
+    if( !mActionReadNextSignal.Empty() )
     {
-      mActionReadNextSignalV2.Emit( handle );
+      mActionReadNextSignal.Emit( handle );
     }
   }
 
@@ -310,9 +312,9 @@ bool AccessibilityManager::HandleActionReadPreviousEvent(bool allowEndFeedback)
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionReadPreviousSignalV2.Empty() )
+    if( !mActionReadPreviousSignal.Empty() )
     {
-      mActionReadPreviousSignalV2.Emit( handle );
+      mActionReadPreviousSignal.Emit( handle );
     }
   }
 
@@ -345,9 +347,9 @@ bool AccessibilityManager::HandleActionUpEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionUpSignalV2.Empty() )
+    if( !mActionUpSignal.Empty() )
     {
-      mActionUpSignalV2.Emit( handle );
+      mActionUpSignal.Emit( handle );
     }
   }
 
@@ -380,9 +382,9 @@ bool AccessibilityManager::HandleActionDownEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionDownSignalV2.Empty() )
+    if( !mActionDownSignal.Empty() )
     {
-      mActionDownSignalV2.Emit( handle );
+      mActionDownSignal.Emit( handle );
     }
   }