Fix svace issue

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / control-impl.cpp

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 2bd33ca..fbf364a 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -168,10 +168,10 @@ void Control::ClearBackground()
   RelayoutRequest();
 }
 
-void Control::SetResourceReady(bool relayoutRequest)
+void Control::SetResourceReady()
 {
   Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
-  controlDataImpl.ResourceReady(relayoutRequest);
+  controlDataImpl.ResourceReady();
 }
 
 Toolkit::DevelControl::ControlAccessible* Control::GetAccessibleObject()
@@ -448,7 +448,7 @@ void Control::Initialize()
   Self().GetTypeInfo(type);
   if(type)
   {
-    auto typeName = type.GetName();
+    const auto& typeName = type.GetName();
     DevelControl::AppendAccessibilityAttribute(Toolkit::Control::DownCast(Self()), "class", typeName);
   }
 }
@@ -507,12 +507,15 @@ void Control::EmitKeyInputFocusSignal(bool focusGained)
 
   if(Accessibility::IsUp())
   {
-    auto self = GetAccessibleObject();
-    self->EmitFocused(focusGained);
-    auto parent = self->GetParent();
-    if(parent && !self->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS])
+    auto accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
     {
-      parent->EmitActiveDescendantChanged(self);
+      accessible->EmitFocused(focusGained);
+      auto parent = accessible->GetParent();
+      if(parent && !accessible->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS])
+      {
+        parent->EmitActiveDescendantChanged(accessible);
+      }
     }
   }
 
@@ -594,7 +597,11 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper
     }
     case Actor::Property::VISIBLE:
     {
-      GetAccessibleObject()->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      auto* accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
+      {
+        accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      }
       break;
     }
     case DevelActor::Property::USER_INTERACTION_ENABLED: