[dali_2.3.42] Merge branch 'devel/master'

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / event-thread-callback.cpp

diff --git a/dali/devel-api/adaptor-framework/event-thread-callback.cpp b/dali/devel-api/adaptor-framework/event-thread-callback.cpp
index 6a5d199..f34158b 100644 (file)
--- a/dali/devel-api/adaptor-framework/event-thread-callback.cpp
+++ b/dali/devel-api/adaptor-framework/event-thread-callback.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.
@@ -18,43 +18,33 @@
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 
 namespace Dali
 {
-
 struct EventThreadCallback::Impl
 {
   TriggerEventInterface* eventTrigger;
 };
 
-EventThreadCallback::EventThreadCallback( CallbackBase* callback )
-: mImpl( new Impl() )
+EventThreadCallback::EventThreadCallback(CallbackBase* callback)
+: mImpl(new Impl())
 {
-  mImpl->eventTrigger = NULL;
-  if ( Adaptor::IsAvailable() )
-  {
-    Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation( Adaptor::Get() );
-    mImpl->eventTrigger = adaptorImpl.GetTriggerEventFactoryInterface().CreateTriggerEvent( callback, TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER );
-  }
+  mImpl->eventTrigger = TriggerEventFactory::CreateTriggerEvent(callback, TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER);
 }
 
 EventThreadCallback::~EventThreadCallback()
 {
-  if ( Adaptor::IsAvailable() )
-  {
-    Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation( Adaptor::Get() );
-    adaptorImpl.GetTriggerEventFactoryInterface().DestroyTriggerEvent( mImpl->eventTrigger );
-  }
+  TriggerEventFactory::DestroyTriggerEvent(mImpl->eventTrigger);
   delete mImpl;
 }
 
 void EventThreadCallback::Trigger()
 {
-  if( mImpl->eventTrigger )
+  if(mImpl->eventTrigger)
   {
     mImpl->eventTrigger->Trigger();
   }
 }
 
-}
+} // namespace Dali