Avoid copying std::string in MWWorld::Ptr::getTypeDescription()

apps/opencs/model/tools/topicinfocheck.cpp

@@ -395,12 +395,12 @@ bool CSMTools::TopicInfoCheckStage::verifyId(const std::string& name, const CSMW
 
     if (index == -1)
     {
-        messages.add(id, T::getRecordType() + " '" + name + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, std::string(T::getRecordType()) + " '" + name + "' does not exist", "", CSMDoc::Message::Severity_Error);
         return false;
     }
     else if (collection.getRecord(index).isDeleted())
     {
-        messages.add(id, "Deleted " + T::getRecordType() + " record '" + name + "' is being referenced", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "Deleted " + std::string(T::getRecordType()) + " record '" + name + "' is being referenced", "", CSMDoc::Message::Severity_Error);
         return false;
     }
 

apps/openmw/mwworld/containerstore.cpp

@@ -728,8 +728,8 @@ int MWWorld::ContainerStore::getType (const ConstPtr& ptr)
     if (ptr.getType()==ESM::Weapon::sRecordId)
         return Type_Weapon;
 
-    throw std::runtime_error (
+    throw std::runtime_error("Object '" + ptr.getCellRef().getRefId() + "' of type " +
-        "Object '" + ptr.getCellRef().getRefId() + "' of type " + ptr.getTypeDescription() + " can not be placed into a container");
+                             std::string(ptr.getTypeDescription()) + " can not be placed into a container");
 }
 
 MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)

apps/openmw/mwworld/livecellref.hpp

@@ -41,7 +41,7 @@ namespace MWWorld
         virtual void save (ESM::ObjectState& state) const = 0;
         ///< Save LiveCellRef state into \a state.
 
-        virtual std::string getTypeDescription() const { return ""; }
+        virtual std::string_view getTypeDescription() const = 0;
 
         protected:
 
@@ -95,7 +95,7 @@ namespace MWWorld
         void save (ESM::ObjectState& state) const override;
         ///< Save LiveCellRef state into \a state.
 
-        std::string getTypeDescription() const override { return X::getRecordType(); }
+        std::string_view getTypeDescription() const override { return X::getRecordType(); }
 
         static bool checkState (const ESM::ObjectState& state);
         ///< Check if state is valid and report errors.

apps/openmw/mwworld/ptr.hpp

@@ -37,7 +37,7 @@ namespace MWWorld
 
             unsigned int getType() const;
 
-            std::string getTypeDescription() const
+            std::string_view getTypeDescription() const
             {
                 return mRef ? mRef->getTypeDescription() : "nullptr";
             }
@@ -118,7 +118,7 @@ namespace MWWorld
 
         unsigned int getType() const;
 
-        std::string getTypeDescription() const
+        std::string_view getTypeDescription() const
         {
             return mRef ? mRef->getTypeDescription() : "nullptr";
         }

apps/openmw/mwworld/store.cpp

@@ -64,8 +64,9 @@ namespace MWWorld
         const T *ptr = search(index);
         if (ptr == nullptr)
         {
-            const std::string msg = T::getRecordType() + " with index " + std::to_string(index) + " not found";
+            std::stringstream msg;
-            throw std::runtime_error(msg);
+            msg << T::getRecordType() << " with index " << index << " not found";
+            throw std::runtime_error(msg.str());
         }
         return ptr;
     }
@@ -145,8 +146,9 @@ namespace MWWorld
         const T *ptr = search(id);
         if (ptr == nullptr)
         {
-            const std::string msg = T::getRecordType() + " '" + id + "' not found";
+            std::stringstream msg;
-            throw std::runtime_error(msg);
+            msg << T::getRecordType() << " '" << id << "' not found";
+            throw std::runtime_error(msg.str());
         }
         return ptr;
     }

components/esm/loadacti.hpp

@@ -13,7 +13,7 @@ struct Activator
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Activator"; }
+    static std::string_view getRecordType() { return "Activator"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mScript, mModel;

components/esm/loadalch.hpp

@@ -20,7 +20,7 @@ struct Potion
     static unsigned int sRecordId;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Potion"; }
+    static std::string_view getRecordType() { return "Potion"; }
 
     struct ALDTstruct
     {

components/esm/loadappa.hpp

@@ -17,7 +17,7 @@ struct Apparatus
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Apparatus"; }
+    static std::string_view getRecordType() { return "Apparatus"; }
 
     enum AppaType
     {

components/esm/loadarmo.hpp

@@ -67,7 +67,7 @@ struct Armor
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Armor"; }
+    static std::string_view getRecordType() { return "Armor"; }
 
     enum Type
     {

components/esm/loadbody.hpp

@@ -13,7 +13,7 @@ struct BodyPart
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "BodyPart"; }
+    static std::string_view getRecordType() { return "BodyPart"; }
 
     enum MeshPart
     {

components/esm/loadbook.hpp

@@ -16,7 +16,7 @@ struct Book
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Book"; }
+    static std::string_view getRecordType() { return "Book"; }
 
     struct BKDTstruct
     {

components/esm/loadbsgn.hpp

@@ -15,7 +15,7 @@ struct BirthSign
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "BirthSign"; }
+    static std::string_view getRecordType() { return "BirthSign"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mDescription, mTexture;

components/esm/loadcell.hpp

@@ -65,7 +65,7 @@ struct Cell
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Cell"; }
+    static std::string_view getRecordType() { return "Cell"; }
 
   enum Flags
     {

components/esm/loadclas.hpp

@@ -19,7 +19,7 @@ struct Class
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Class"; }
+    static std::string_view getRecordType() { return "Class"; }
 
     enum AutoCalc
     {

components/esm/loadclot.hpp

@@ -19,7 +19,7 @@ struct Clothing
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Clothing"; }
+    static std::string_view getRecordType() { return "Clothing"; }
 
     enum Type
     {

components/esm/loadcont.hpp

@@ -37,7 +37,7 @@ struct Container
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Container"; }
+    static std::string_view getRecordType() { return "Container"; }
 
     enum Flags
     {

components/esm/loadcrea.hpp

@@ -23,7 +23,7 @@ struct Creature
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Creature"; }
+    static std::string_view getRecordType() { return "Creature"; }
 
     // Default is 0x48?
     enum Flags

components/esm/loaddial.hpp

@@ -22,7 +22,7 @@ struct Dialogue
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Dialogue"; }
+    static std::string_view getRecordType() { return "Dialogue"; }
 
     enum Type
     {

components/esm/loaddoor.hpp

@@ -13,7 +13,7 @@ struct Door
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Door"; }
+    static std::string_view getRecordType() { return "Door"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;

components/esm/loadench.hpp

@@ -19,7 +19,7 @@ struct Enchantment
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Enchantment"; }
+    static std::string_view getRecordType() { return "Enchantment"; }
 
     enum Type
     {

components/esm/loadfact.hpp

@@ -32,7 +32,7 @@ struct Faction
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Faction"; }
+    static std::string_view getRecordType() { return "Faction"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName;

components/esm/loadglob.hpp

@@ -19,7 +19,7 @@ struct Global
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Global"; }
+    static std::string_view getRecordType() { return "Global"; }
 
     unsigned int mRecordFlags;
     std::string mId;

components/esm/loadgmst.hpp

@@ -20,7 +20,7 @@ struct GameSetting
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "GameSetting"; }
+    static std::string_view getRecordType() { return "GameSetting"; }
 
     unsigned int mRecordFlags;
     std::string mId;

components/esm/loadinfo.hpp

@@ -22,7 +22,7 @@ struct DialInfo
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "DialInfo"; }
+    static std::string_view getRecordType() { return "DialInfo"; }
 
     enum Gender
     {

components/esm/loadingr.hpp

@@ -17,7 +17,7 @@ struct Ingredient
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Ingredient"; }
+    static std::string_view getRecordType() { return "Ingredient"; }
 
     struct IRDTstruct
     {

components/esm/loadland.hpp

@@ -21,7 +21,7 @@ struct Land
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Land"; }
+    static std::string_view getRecordType() { return "Land"; }
 
     Land();
     ~Land();

components/esm/loadlevlist.hpp

@@ -48,7 +48,7 @@ struct CreatureLevList: LevelledListBase
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "CreatureLevList"; }
+    static std::string_view getRecordType() { return "CreatureLevList"; }
 
     enum Flags
     {
@@ -68,7 +68,7 @@ struct ItemLevList: LevelledListBase
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "ItemLevList"; }
+    static std::string_view getRecordType() { return "ItemLevList"; }
 
     enum Flags
     {

components/esm/loadligh.hpp

@@ -18,7 +18,7 @@ struct Light
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Light"; }
+    static std::string_view getRecordType() { return "Light"; }
 
     enum Flags
     {

components/esm/loadlock.hpp

@@ -13,7 +13,7 @@ struct Lockpick
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Lockpick"; }
+    static std::string_view getRecordType() { return "Lockpick"; }
 
     struct Data
     {

components/esm/loadltex.hpp

@@ -20,7 +20,7 @@ struct LandTexture
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "LandTexture"; }
+    static std::string_view getRecordType() { return "LandTexture"; }
 
     // mId is merely a user friendly name for the texture in the editor.
     std::string mId, mTexture;

components/esm/loadmgef.hpp

@@ -14,7 +14,7 @@ struct MagicEffect
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "MagicEffect"; }
+    static std::string_view getRecordType() { return "MagicEffect"; }
 
     unsigned int mRecordFlags;
     std::string mId;

components/esm/loadmisc.hpp

@@ -18,7 +18,7 @@ struct Miscellaneous
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Miscellaneous"; }
+    static std::string_view getRecordType() { return "Miscellaneous"; }
 
     struct MCDTstruct
     {

components/esm/loadnpc.hpp

@@ -24,7 +24,7 @@ struct NPC
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "NPC"; }
+    static std::string_view getRecordType() { return "NPC"; }
 
   // Services
   enum Services

components/esm/loadpgrd.hpp

@@ -17,7 +17,7 @@ struct Pathgrid
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Pathgrid"; }
+    static std::string_view getRecordType() { return "Pathgrid"; }
 
     struct DATAstruct
     {

components/esm/loadprob.hpp

@@ -13,7 +13,7 @@ struct Probe
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Probe"; }
+    static std::string_view getRecordType() { return "Probe"; }
 
     struct Data
     {

components/esm/loadrace.hpp

@@ -19,7 +19,7 @@ struct Race
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Race"; }
+    static std::string_view getRecordType() { return "Race"; }
 
     struct SkillBonus
     {

components/esm/loadregn.hpp

@@ -20,7 +20,7 @@ struct Region
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Region"; }
+    static std::string_view getRecordType() { return "Region"; }
 
 #pragma pack(push)
 #pragma pack(1)

components/esm/loadrepa.hpp

@@ -13,7 +13,7 @@ struct Repair
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Repair"; }
+    static std::string_view getRecordType() { return "Repair"; }
 
     struct Data
     {

components/esm/loadscpt.hpp

@@ -21,7 +21,7 @@ class Script
 public:
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Script"; }
+    static std::string_view getRecordType() { return "Script"; }
 
     struct SCHDstruct
     {

components/esm/loadskil.hpp

@@ -20,7 +20,7 @@ struct Skill
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Skill"; }
+    static std::string_view getRecordType() { return "Skill"; }
 
     unsigned int mRecordFlags;
     std::string mId;

components/esm/loadsndg.hpp

@@ -17,7 +17,7 @@ struct SoundGenerator
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "SoundGenerator"; }
+    static std::string_view getRecordType() { return "SoundGenerator"; }
 
     enum Type
     {

components/esm/loadsoun.hpp

@@ -18,7 +18,7 @@ struct Sound
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Sound"; }
+    static std::string_view getRecordType() { return "Sound"; }
 
     SOUNstruct mData;
     unsigned int mRecordFlags;

components/esm/loadspel.hpp

@@ -15,7 +15,7 @@ struct Spell
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Spell"; }
+    static std::string_view getRecordType() { return "Spell"; }
 
     enum SpellType
     {

components/esm/loadsscr.hpp

@@ -21,7 +21,7 @@ struct StartScript
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "StartScript"; }
+    static std::string_view getRecordType() { return "StartScript"; }
 
     std::string mData;
     unsigned int mRecordFlags;

components/esm/loadstat.hpp

@@ -24,7 +24,7 @@ struct Static
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Static"; }
+    static std::string_view getRecordType() { return "Static"; }
 
     unsigned int mRecordFlags;
     std::string mId, mModel;

components/esm/loadweap.hpp

@@ -19,7 +19,7 @@ struct Weapon
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Weapon"; }
+    static std::string_view getRecordType() { return "Weapon"; }
 
     enum Type
     {