mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'recordtype' into 'master'

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

See merge request OpenMW/openmw!1290
This commit is contained in:
Evil Eye 2021-10-13 17:04:32 +00:00
commit ec6451e93a
46 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/opencs/model/tools/topicinfocheck.cpp
View File

@ -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;
}

4
apps/openmw/mwworld/containerstore.cpp
View File

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

4
apps/openmw/mwworld/livecellref.hpp
View File

@ -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.

4
apps/openmw/mwworld/ptr.hpp
View File

@ -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";
}

10
apps/openmw/mwworld/store.cpp
View File

@ -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";
throw std::runtime_error(msg);
std::stringstream 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";
throw std::runtime_error(msg);
std::stringstream msg;
msg << T::getRecordType() << " '" << id << "' not found";
throw std::runtime_error(msg.str());
}
return ptr;
}

2
components/esm/loadacti.hpp
View File

@ -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;

2
components/esm/loadalch.hpp
View File

@ -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
{

2
components/esm/loadappa.hpp
View File

@ -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
{

2
components/esm/loadarmo.hpp
View File

@ -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
{

2
components/esm/loadbody.hpp
View File

@ -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
{

2
components/esm/loadbook.hpp
View File

@ -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
{

2
components/esm/loadbsgn.hpp
View File

@ -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;

2
components/esm/loadcell.hpp
View File

@ -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
{

2
components/esm/loadclas.hpp
View File

@ -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
{

2
components/esm/loadclot.hpp
View File

@ -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
{

2
components/esm/loadcont.hpp
View File

@ -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
{

2
components/esm/loadcrea.hpp
View File

@ -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

2
components/esm/loaddial.hpp
View File

@ -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
{

2
components/esm/loaddoor.hpp
View File

@ -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;

2
components/esm/loadench.hpp
View File

@ -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
{

2
components/esm/loadfact.hpp
View File

@ -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;

2
components/esm/loadglob.hpp
View File

@ -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;

2
components/esm/loadgmst.hpp
View File

@ -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;

2
components/esm/loadinfo.hpp
View File

@ -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
{

2
components/esm/loadingr.hpp
View File

@ -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
{

2
components/esm/loadland.hpp
View File

@ -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();

4
components/esm/loadlevlist.hpp
View File

@ -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
{

2
components/esm/loadligh.hpp
View File

@ -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
{

2
components/esm/loadlock.hpp
View File

@ -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
{

2
components/esm/loadltex.hpp
View File

@ -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;

2
components/esm/loadmgef.hpp
View File

@ -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;

2
components/esm/loadmisc.hpp
View File

@ -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
{

2
components/esm/loadnpc.hpp
View File

@ -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

2
components/esm/loadpgrd.hpp
View File

@ -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
{

2
components/esm/loadprob.hpp
View File

@ -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
{

2
components/esm/loadrace.hpp
View File

@ -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
{

2
components/esm/loadregn.hpp
View File

@ -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)

2
components/esm/loadrepa.hpp
View File

@ -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
{

2
components/esm/loadscpt.hpp
View File

@ -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
{

2
components/esm/loadskil.hpp
View File

@ -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;

2
components/esm/loadsndg.hpp
View File

@ -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
{

2
components/esm/loadsoun.hpp
View File

@ -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;

2
components/esm/loadspel.hpp
View File

@ -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
{

2
components/esm/loadsscr.hpp
View File

@ -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;

2
components/esm/loadstat.hpp
View File

@ -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;

2
components/esm/loadweap.hpp
View File

@ -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
{