From 0cb97d2327cef87961e8c5203085294b6a4adfcb Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Mon, 16 Oct 2023 20:19:10 +0900 Subject: [PATCH] Fix minor coverity issues 1. Remove std::string copy 2. Remove Property::Array copy Change-Id: I9b45c0ff87588a6f79d8ae4a109909c7c016dbdf Signed-off-by: Eunki Hong --- dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp | 3 +-- dali-toolkit/internal/controls/control/control-data-impl.cpp | 2 +- dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp | 10 +++++----- .../internal/controls/scrollable/item-view/item-view-impl.cpp | 3 +-- dali-toolkit/internal/controls/tooltip/tooltip.cpp | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp index b124d22..d85f8fd 100644 --- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp @@ -176,8 +176,7 @@ Property::Value ToggleButton::GetProperty(BaseObject* object, Property::Index pr { case Toolkit::ToggleButton::Property::STATE_VISUALS: { - Property::Array array = toggleButtonImpl.GetToggleStates(); - value = Property::Value(array); + value = toggleButtonImpl.GetToggleStates(); break; } case Toolkit::ToggleButton::Property::TOOLTIPS: diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 548a4c9..a837b77 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -2116,7 +2116,7 @@ Dali::Property Control::Impl::GetVisualProperty(Dali::Property::Index index, Dal if(visual) { Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual); - return visualImpl.GetPropertyObject(visualPropertyKey); + return visualImpl.GetPropertyObject(std::move(visualPropertyKey)); } Handle handle; diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp index c25e3d0..8bcc978 100644 --- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp @@ -396,10 +396,10 @@ void SetVertexBufferData(MeshInfo& meshInfo, std::string path, std::vector= 0) { Dali::Vector bufferData; - LoadDataFromAccessor(accessorIdx, bufferData, path, accessorArray, bufferViewArray, bufferArray); + LoadDataFromAccessor(accessorIdx, bufferData, std::move(path), accessorArray, bufferViewArray, bufferArray); SetMeshInfoAndCanonize(meshInfo, bufferData); - VertexBuffer vertexBuffer = CreateVertexBuffer(bufferData, map, type); + VertexBuffer vertexBuffer = CreateVertexBuffer(bufferData, std::move(map), type); meshInfo.geometry.AddVertexBuffer(vertexBuffer); } } @@ -410,9 +410,9 @@ void SetAttributeBufferData(MeshInfo& meshInfo, std::string path, std::vector= 0) { Dali::Vector bufferData; - LoadDataFromAccessor(accessorIdx, bufferData, path, accessorArray, bufferViewArray, bufferArray); + LoadDataFromAccessor(accessorIdx, bufferData, std::move(path), accessorArray, bufferViewArray, bufferArray); - VertexBuffer vertexBuffer = CreateVertexBuffer(bufferData, map, type); + VertexBuffer vertexBuffer = CreateVertexBuffer(bufferData, std::move(map), type); meshInfo.geometry.AddVertexBuffer(vertexBuffer); } } @@ -420,7 +420,7 @@ void SetAttributeBufferData(MeshInfo& meshInfo, std::string path, std::vector& accessorArray, std::vector& bufferViewArray, std::vector& bufferArray, int32_t indexIdx) { Dali::Vector indexBufferData; - LoadDataFromAccessor(indexIdx, indexBufferData, path, accessorArray, bufferViewArray, bufferArray); + LoadDataFromAccessor(indexIdx, indexBufferData, std::move(path), accessorArray, bufferViewArray, bufferArray); meshInfo.geometry.SetIndexBuffer(&indexBufferData[0], indexBufferData.Size()); } diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index 6d6e211..fbf63f6 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -1920,8 +1920,7 @@ Property::Value ItemView::GetProperty(BaseObject* object, Property::Index index) case Toolkit::ItemView::Property::LAYOUT: { - Property::Array layouts = itemViewImpl.GetLayoutArray(); - value = layouts; + value = itemViewImpl.GetLayoutArray(); break; } } diff --git a/dali-toolkit/internal/controls/tooltip/tooltip.cpp b/dali-toolkit/internal/controls/tooltip/tooltip.cpp index e8274d1..1b4c749 100644 --- a/dali-toolkit/internal/controls/tooltip/tooltip.cpp +++ b/dali-toolkit/internal/controls/tooltip/tooltip.cpp @@ -148,12 +148,12 @@ void Tooltip::CreatePropertyMap(Property::Map& map) const if(!mContentTextVisual.Empty()) { Property::Map content = mContentTextVisual; // Need this copy as there's no Value constructor which takes in a 'const Property::Map&'. - map.Insert(Toolkit::Tooltip::Property::CONTENT, content); + map.Insert(Toolkit::Tooltip::Property::CONTENT, std::move(content)); } else if(!mContentArray.Empty()) { Property::Array content = mContentArray; // Need this copy as there's no Value constructor which takes in a 'const Property::Array&'. - map.Insert(Toolkit::Tooltip::Property::CONTENT, content); + map.Insert(Toolkit::Tooltip::Property::CONTENT, std::move(content)); } map.Insert(Toolkit::Tooltip::Property::LAYOUT, mLayout); -- 2.7.4