X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Flifecycle-controller-impl.cpp;h=954a5f2ca8cf7270b77d71ba032726b93fc94899;hb=dc7687ed7492068f18778cc318076e072c9ed985;hp=ba435379a95d6fcd3662a95fffd2637b73ae5c9e;hpb=7e50795816a2b49e231aa6f80bc7d120ab24bdab;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/common/lifecycle-controller-impl.cpp b/adaptors/common/lifecycle-controller-impl.cpp
index ba43537..954a5f2 100644
--- a/adaptors/common/lifecycle-controller-impl.cpp
+++ b/adaptors/common/lifecycle-controller-impl.cpp
@@ -18,8 +18,10 @@
 // CLASS HEADER
 #include "lifecycle-controller-impl.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
 
@@ -32,30 +34,6 @@ namespace Internal
 namespace Adaptor
 {
 
-namespace
-{
-
-BaseHandle Create()
-{
-  BaseHandle handle( LifecycleController::Get() );
-
-  if ( !handle && Adaptor::IsAvailable() )
-  {
-    Dali::SingletonService service( SingletonService::Get() );
-    if ( service )
-    {
-      Dali::LifecycleController lifecycleController = Dali::LifecycleController( new LifecycleController() );
-      service.Register( typeid( lifecycleController ), lifecycleController );
-      handle = lifecycleController;
-    }
-  }
-
-  return handle;
-}
-TypeRegistration LIFECYCLE_CONTROLLER_TYPE( typeid(Dali::LifecycleController), typeid(Dali::BaseHandle), Create, true /* Create Instance At Startup */ );
-
-} // unnamed namespace
-
 Dali::LifecycleController LifecycleController::Get()
 {
   Dali::LifecycleController lifecycleController;
@@ -88,7 +66,7 @@ LifecycleController::~LifecycleController()
 {
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::InitSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::InitSignal()
 {
   return mInitSignal;
 }
@@ -101,7 +79,7 @@ void LifecycleController::EmitInitSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::TerminateSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::TerminateSignal()
 {
   return mTerminateSignal;
 }
@@ -114,7 +92,7 @@ void LifecycleController::EmitTerminateSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::PauseSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::PauseSignal()
 {
   return mPauseSignal;
 }
@@ -127,7 +105,7 @@ void LifecycleController::EmitPauseSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResumeSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResumeSignal()
 {
   return mResumeSignal;
 }
@@ -140,7 +118,7 @@ void LifecycleController::EmitResumeSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResetSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResetSignal()
 {
   return mResetSignal;
 }
@@ -153,7 +131,7 @@ void LifecycleController::EmitResetSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResizeSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResizeSignal()
 {
   return mResizeSignal;
 }
@@ -166,7 +144,7 @@ void LifecycleController::EmitResizeSignal()
   }
 }
 
-Dali::LifecycleController::LifecycleSignalV2& LifecycleController::LanguageChangedSignal()
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::LanguageChangedSignal()
 {
   return mLanguageChangedSignal;
 }