Merge branch 'devel/master' into tizen

Change-Id: I2d8a0ed4b0483be6184c6f738eddbcebf5f50936

diff --git a/dali/internal/system/linux/system-factory-ecore.cpp b/dali/internal/system/linux/system-factory-ecore.cpp
index 7221abe..8a4b40b 100644 (file)
--- a/dali/internal/system/linux/system-factory-ecore.cpp
+++ b/dali/internal/system/linux/system-factory-ecore.cpp
@@ -35,32 +35,41 @@ namespace Adaptor
 {
 std::unique_ptr<CallbackManager> SystemFactoryEcore::CreateCallbackManager()
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory != nullptr && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::GLIB)
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::GLIB)
   {
     return Utils::MakeUnique<GlibCallbackManager>();
   }
-  return Utils::MakeUnique<EcoreCallbackManager>();
+  else
+  {
+    return Utils::MakeUnique<EcoreCallbackManager>();
+  }
 }
 
 std::unique_ptr<FileDescriptorMonitor> SystemFactoryEcore::CreateFileDescriptorMonitor(int fileDescriptor, CallbackBase* callback, int eventBitmask)
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory != nullptr && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::GLIB)
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::GLIB)
   {
     return Utils::MakeUnique<FileDescriptorMonitorGlib>(fileDescriptor, callback, eventBitmask);
   }
-  return Utils::MakeUnique<FileDescriptorMonitorEcore>(fileDescriptor, callback, eventBitmask);
+  else
+  {
+    return Utils::MakeUnique<FileDescriptorMonitorEcore>(fileDescriptor, callback, eventBitmask);
+  }
 }
 
 TimerPtr SystemFactoryEcore::CreateTimer(uint32_t milliSec)
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory != nullptr && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::GLIB)
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::GLIB)
   {
     return TimerGlib::New(milliSec);
   }
-  return TimerEcore::New(milliSec);
+  else
+  {
+    return TimerEcore::New(milliSec);
+  }
 }
 
 std::unique_ptr<SystemFactory> GetSystemFactory()

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
index f7fc6c8..3c10c38 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
@@ -66,8 +66,8 @@ void Initialize()
 
 void Shutdown()
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::DEFAULT)
   {
     ecore_wl2_shutdown();
   }
@@ -75,8 +75,8 @@ void Shutdown()
 
 void GetScreenSize(int32_t& width, int32_t& height)
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::DEFAULT)
   {
     if(gScreenWidth == 0 || gScreenHeight == 0)
     {
@@ -98,8 +98,8 @@ void GetScreenSize(int32_t& width, int32_t& height)
 
 void UpdateScreenSize()
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::DEFAULT)
   {
     Ecore_Wl2_Display* display = ecore_wl2_display_connect(NULL);
     if(display)
@@ -113,8 +113,8 @@ void UpdateScreenSize()
 
 bool SetKeyboardRepeatInfo(float rate, float delay)
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::DEFAULT)
   {
     Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(ecore_wl2_connected_display_get(NULL));
     return ecore_wl2_input_keyboard_repeat_set(input, static_cast<double>(rate), static_cast<double>(delay));
@@ -124,8 +124,8 @@ bool SetKeyboardRepeatInfo(float rate, float delay)
 
 bool GetKeyboardRepeatInfo(float& rate, float& delay)
 {
-  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
-  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
+  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
+  if(backend == FrameworkBackend::DEFAULT)
   {
     Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(ecore_wl2_connected_display_get(NULL));
     double           rateVal, delayVal;