X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Frelayout-controller.cpp;h=fa9e70edacfc3449d85a4fab828513905601e7c5;hb=97b1d370bbe662d6f2b813252b281e77926aa037;hp=8dce13a5ad25203f23fd89afec4cf87c730e6767;hpb=4870ce3c93eb1c86cf19f216195e003f3b578d27;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/base/dali-toolkit/internal/controls/relayout-controller.cpp b/base/dali-toolkit/internal/controls/relayout-controller.cpp
index 8dce13a..fa9e70e 100644
--- a/base/dali-toolkit/internal/controls/relayout-controller.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-controller.cpp
@@ -21,9 +21,9 @@
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES
-
 #include <stack>
 #include <sstream>
+#include <dali/public-api/adaptor-framework/singleton-service.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
@@ -67,24 +67,27 @@ void RelayoutController::Request()
     RelayoutController controller;
 
     // Check whether the RelayoutController is already created
-    Dali::Adaptor& adaptor = Dali::Adaptor::Get();
-    Dali::BaseHandle handle = adaptor.GetSingleton(typeid(RelayoutController));
-
-    if(handle)
-    {
-      // If so, downcast the handle of singleton to RelayoutController
-      controller = RelayoutController(dynamic_cast<Internal::RelayoutControllerImpl*>(handle.GetObjectPtr()));
-    }
-
-    if(!controller)
+    SingletonService singletonService( SingletonService::Get() );
+    if ( singletonService )
     {
-      // If not, create the RelayoutController and register it as a singleton
-      controller = RelayoutController( new Internal::RelayoutControllerImpl(gRelayoutRequestPending) );
-      adaptor.RegisterSingleton( typeid(controller), controller );
+      Dali::BaseHandle handle = singletonService.GetSingleton(typeid(RelayoutController));
+
+      if(handle)
+      {
+        // If so, downcast the handle of singleton to RelayoutController
+        controller = RelayoutController(dynamic_cast<Internal::RelayoutControllerImpl*>(handle.GetObjectPtr()));
+      }
+
+      if(!controller)
+      {
+        // If not, create the RelayoutController and register it as a singleton
+        controller = RelayoutController( new Internal::RelayoutControllerImpl(gRelayoutRequestPending) );
+        singletonService.Register( typeid(controller), controller );
+      }
+
+      GetImpl(controller).Request();
+      gRelayoutRequestPending = true;
     }
-
-    GetImpl(controller).Request();
-    gRelayoutRequestPending = true;
   }
 }