Fix minor coveriy issues

Resolve some minor coverity issues that might be meanful

1. Add check logic of Raise/Lower API when children was empty.
2. std::string move for some codes.

Change-Id: If8050ee21e840f6684545d4fca0a3cf430500f6d
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/event/actors/actor-parent-impl.cpp b/dali/internal/event/actors/actor-parent-impl.cpp
index 781b1b7..7073f62 100644 (file)
--- a/dali/internal/event/actors/actor-parent-impl.cpp
+++ b/dali/internal/event/actors/actor-parent-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.
@@ -231,7 +231,7 @@ void ActorParentImpl::SetSiblingOrderOfChild(
   Actor&   child,
   uint32_t order)
 {
-  if(mChildren)
+  if(mChildren && !mChildren->empty())
   {
     uint32_t currentOrder = GetSiblingOrderOfChild(child);
     if(order != currentOrder)
@@ -262,7 +262,7 @@ void ActorParentImpl::SetSiblingOrderOfChild(
 uint32_t ActorParentImpl::GetSiblingOrderOfChild(const Actor& child) const
 {
   uint32_t order = 0;
-  if(mChildren)
+  if(mChildren && !mChildren->empty())
   {
     for(std::size_t i = 0; i < mChildren->size(); ++i)
     {
@@ -279,16 +279,16 @@ uint32_t ActorParentImpl::GetSiblingOrderOfChild(const Actor& child) const
 void ActorParentImpl::RaiseChild(Actor& child)
 {
   bool changed = false;
-  if(mChildren && mChildren->back() != &child) // If not already at end
+  if(mChildren && !mChildren->empty() && mChildren->back() != &child) // If not already at end
   {
-    for(std::size_t i = 0; i < mChildren->size(); ++i)
+    for(std::size_t i = 0; i + 1 < mChildren->size(); ++i)
     {
       if((*mChildren)[i] == &child)
       {
         // Swap with next
-        ActorPtr next       = (*mChildren)[i + 1];
+        ActorPtr next       = std::move((*mChildren)[i + 1]);
         (*mChildren)[i + 1] = &child;
-        (*mChildren)[i]     = next;
+        (*mChildren)[i]     = std::move(next);
         changed             = true;
         break;
       }
@@ -303,16 +303,16 @@ void ActorParentImpl::RaiseChild(Actor& child)
 void ActorParentImpl::LowerChild(Actor& child)
 {
   bool changed = false;
-  if(mChildren && mChildren->front() != &child) // If not already at beginning
+  if(mChildren && !mChildren->empty() && mChildren->front() != &child) // If not already at beginning
   {
     for(std::size_t i = 1; i < mChildren->size(); ++i)
     {
       if((*mChildren)[i] == &child)
       {
         // Swap with previous
-        ActorPtr previous   = (*mChildren)[i - 1];
+        ActorPtr previous   = std::move((*mChildren)[i - 1]);
         (*mChildren)[i - 1] = &child;
-        (*mChildren)[i]     = previous;
+        (*mChildren)[i]     = std::move(previous);
         changed             = true;
         break;
       }
@@ -327,7 +327,7 @@ void ActorParentImpl::LowerChild(Actor& child)
 void ActorParentImpl::RaiseChildToTop(Actor& child)
 {
   bool changed = false;
-  if(mChildren && mChildren->back() != &child) // If not already at end
+  if(mChildren && !mChildren->empty() && mChildren->back() != &child) // If not already at end
   {
     auto iter = std::find(mChildren->begin(), mChildren->end(), &child);
     if(iter != mChildren->end())
@@ -346,7 +346,7 @@ void ActorParentImpl::RaiseChildToTop(Actor& child)
 void ActorParentImpl::LowerChildToBottom(Actor& child)
 {
   bool changed = false;
-  if(mChildren && mChildren->front() != &child) // If not already at bottom,
+  if(mChildren && !mChildren->empty() && mChildren->front() != &child) // If not already at bottom,
   {
     ActorPtr childPtr(&child); // ensure actor remains referenced.
 
@@ -367,7 +367,7 @@ void ActorParentImpl::LowerChildToBottom(Actor& child)
 void ActorParentImpl::RaiseChildAbove(Actor& child, Actor& target)
 {
   bool raised = false;
-  if(mChildren && mChildren->back() != &child && target.GetParent() == child.GetParent()) // If not already at top
+  if(mChildren && !mChildren->empty() && mChildren->back() != &child && target.GetParent() == child.GetParent()) // If not already at top
   {
     ActorPtr childPtr(&child); // ensure actor actor remains referenced.
 
@@ -395,7 +395,7 @@ void ActorParentImpl::LowerChildBelow(Actor& child, Actor& target)
   bool lowered = false;
 
   // If not already at bottom
-  if(mChildren && mChildren->front() != &child && target.GetParent() == child.GetParent())
+  if(mChildren && !mChildren->empty() && mChildren->front() != &child && target.GetParent() == child.GetParent())
   {
     ActorPtr childPtr(&child); // ensure actor actor remains referenced.
 

diff --git a/dali/internal/event/common/type-registry-impl.cpp b/dali/internal/event/common/type-registry-impl.cpp
index 73fc652..add6520 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.cpp
+++ b/dali/internal/event/common/type-registry-impl.cpp
@@ -97,7 +97,7 @@ std::string TypeRegistry::Register(const std::type_info&          theTypeInfo,
 {
   std::string uniqueTypeName = DemangleClassName(theTypeInfo.name());
 
-  return Register(uniqueTypeName, baseTypeInfo, createInstance, callCreateOnInit);
+  return Register(std::move(uniqueTypeName), baseTypeInfo, createInstance, callCreateOnInit);
 }
 
 std::string TypeRegistry::Register(const std::type_info&          theTypeInfo,
@@ -109,7 +109,7 @@ std::string TypeRegistry::Register(const std::type_info&          theTypeInfo,
 {
   std::string uniqueTypeName = DemangleClassName(theTypeInfo.name());
 
-  return Register(uniqueTypeName, baseTypeInfo, createInstance, callCreateOnInit, defaultProperties, defaultPropertyCount);
+  return Register(std::move(uniqueTypeName), baseTypeInfo, createInstance, callCreateOnInit, defaultProperties, defaultPropertyCount);
 }
 
 std::string TypeRegistry::Register(std::string                    uniqueTypeName,