From a8c16071dc8977aabf258578bbfd912f91c51701 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 4 Sep 2021 18:04:43 +0200
Subject: [PATCH] Fix -Wreturn-local-addr warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp: In member function ‘const string& CSMWorld::ActorAdapter::ActorData::getPart(ESM::PartReferenceType) const’:
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp:142:20: error: returning reference to temporary [-Werror=return-local-addr]
  142 |             return "";
      |                    ^~
---
 apps/opencs/model/world/actoradapter.cpp | 7 +++++--
 apps/opencs/model/world/actoradapter.hpp | 4 +++-
 apps/opencs/view/render/actor.cpp        | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 86a621970c..7882dd4535 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -9,6 +9,9 @@
 
 #include "data.hpp"
 
+#include <string>
+#include <string_view>
+
 namespace CSMWorld
 {
     const std::string& ActorAdapter::RaceData::getId() const
@@ -121,7 +124,7 @@ namespace CSMWorld
         return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf);
     }
 
-    const std::string& ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
+    std::string_view ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
     {
         auto it = mParts.find(index);
         if (it == mParts.end())
@@ -139,7 +142,7 @@ namespace CSMWorld
                 return mRaceData->getMalePart(index);
             }
 
-            return "";
+            return {};
         }
 
         const std::string& partName = it->second.first;
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index df3eeff64e..826e3b9179 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -4,6 +4,8 @@
 #include <array>
 #include <map>
 #include <unordered_set>
+#include <string>
+#include <string_view>
 
 #include <QObject>
 #include <QModelIndex>
@@ -93,7 +95,7 @@ namespace CSMWorld
             /// Returns the skeleton the actor should use for attaching parts to
             std::string getSkeleton() const;
             /// Retrieves the associated actor part
-            const std::string& getPart(ESM::PartReferenceType index) const;
+            std::string_view getPart(ESM::PartReferenceType index) const;
             /// Checks if the actor has a data dependency
             bool hasDependency(const std::string& id) const;
 
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index d6077a65a5..10f7330d1c 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -96,7 +96,7 @@ namespace CSVRender
         for (int i = 0; i < ESM::PRT_Count; ++i)
         {
             auto type = (ESM::PartReferenceType) i;
-            std::string partId = mActorData->getPart(type);
+            const std::string partId(mActorData->getPart(type));
             attachBodyPart(type, getBodyPartMesh(partId));
         }
     }