X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Ffocus-manager%2Fkeyinput-focus-manager.cpp;h=91b79e88f73155c7c1caa3f634b31fcd8adbc900;hp=f427283b07346ee7712b525adaaf41996dbb1159;hb=7e315a440bad7033d19fefa8f9952d625ee6f076;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836

diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
index f427283..91b79e8 100644
--- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
+++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
@@ -16,13 +16,12 @@
  */
 
 // CLASS HEADER
-
 #include "keyinput-focus-manager.h"
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/singleton-service.h>
 
 // INTERNAL INCLUDES
-
 #include <dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h>
 
 namespace Dali
@@ -47,19 +46,22 @@ KeyInputFocusManager KeyInputFocusManager::Get()
   KeyInputFocusManager manager;
 
   // Check whether the focus manager is already created
-  Dali::Adaptor& adaptor = Dali::Adaptor::Get();
-  Dali::BaseHandle handle = adaptor.GetSingleton(typeid(KeyInputFocusManager));
-  if(handle)
-  {
-    // If so, downcast the handle of singleton to focus manager
-    manager = KeyInputFocusManager(dynamic_cast<Internal::KeyInputFocusManager*>(handle.GetObjectPtr()));
-  }
-
-  if(!manager)
+  SingletonService singletonService( SingletonService::Get() );
+  if ( singletonService )
   {
-    // If not, create the focus manager and register it as a singleton
-    manager = KeyInputFocusManager(new Internal::KeyInputFocusManager());
-    adaptor.RegisterSingleton(typeid(manager), manager);
+    Dali::BaseHandle handle = singletonService.GetSingleton(typeid(KeyInputFocusManager));
+    if(handle)
+    {
+      // If so, downcast the handle of singleton to focus manager
+      manager = KeyInputFocusManager(dynamic_cast<Internal::KeyInputFocusManager*>(handle.GetObjectPtr()));
+    }
+
+    if(!manager)
+    {
+      // If not, create the focus manager and register it as a singleton
+      manager = KeyInputFocusManager(new Internal::KeyInputFocusManager());
+      singletonService.Register(typeid(manager), manager);
+    }
   }
 
   return manager;
@@ -90,12 +92,12 @@ bool KeyInputFocusManager::IsKeyboardListener(Control control)
   return GetImpl(*this).IsKeyboardListener(control);
 }
 
-KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal()
+KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal()
 {
   return GetImpl(*this).KeyInputFocusChangedSignal();
 }
 
-KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal()
+KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal()
 {
   return GetImpl(*this).UnhandledKeyEventSignal();
 }