[AT-SPI] Squashed implementation

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / accessibility-manager / accessibility-manager.cpp

diff --git a/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
index 92f2572..b7f6892 100644 (file)
--- a/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
+++ b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -19,18 +19,16 @@
 #include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 
 // EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
 #include <dali/devel-api/common/singleton-service.h>
+#include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 AccessibilityManager::AccessibilityManager()
 {
 }
@@ -44,8 +42,8 @@ AccessibilityManager AccessibilityManager::Get()
   AccessibilityManager manager;
 
   // Check whether the accessibility manager is already created
-  SingletonService singletonService( SingletonService::Get() );
-  if ( singletonService )
+  SingletonService singletonService(SingletonService::Get());
+  if(singletonService)
   {
     Dali::BaseHandle handle = singletonService.GetSingleton(typeid(AccessibilityManager));
     if(handle)
@@ -58,17 +56,16 @@ AccessibilityManager AccessibilityManager::Get()
     {
       // If not, create the accessibility manager and register it as a singleton
       Internal::AccessibilityManager* internalManager = new Internal::AccessibilityManager();
-      manager = AccessibilityManager( internalManager );
-      internalManager->Initialise();
-      singletonService.Register( typeid(manager), manager );
+      manager                                         = AccessibilityManager(internalManager);
+      singletonService.Register(typeid(manager), manager);
     }
   }
 
   return manager;
 }
 
-AccessibilityManager::AccessibilityManager(Internal::AccessibilityManager *impl)
-  : BaseHandle(impl)
+AccessibilityManager::AccessibilityManager(Internal::AccessibilityManager* impl)
+: BaseHandle(impl)
 {
 }
 
@@ -322,13 +319,6 @@ AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::Actio
   return GetImpl(*this).ActionZoomSignal();
 }
 
-AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadIndicatorInformationSignal()
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ActionReadIndicatorInformationSignal is deprecated and will be removed from next release.\n" );
-
-  return GetImpl(*this).ActionReadIndicatorInformationSignal();
-}
-
 AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPauseResumeSignal()
 {
   return GetImpl(*this).ActionReadPauseResumeSignal();