diff --git a/src/studio/modlib/include/studio/itemmaker.hpp b/src/studio/modlib/include/studio/itemmaker.hpp index ff0c542e..7e52533c 100644 --- a/src/studio/modlib/include/studio/itemmaker.hpp +++ b/src/studio/modlib/include/studio/itemmaker.hpp @@ -18,9 +18,9 @@ class ItemMaker { const ox::String name; const ox::String parentDir; const ox::String fileExt; - constexpr explicit ItemMaker(ox::String pName, ox::String pParentDir, ox::CRStringView pFileExt) noexcept: - name(std::move(pName)), - parentDir(std::move(pParentDir)), + constexpr explicit ItemMaker(ox::StringView pName, ox::StringView pParentDir, ox::CRStringView pFileExt) noexcept: + name(pName), + parentDir(pParentDir), fileExt(pFileExt) { } virtual ~ItemMaker() noexcept = default; @@ -38,26 +38,26 @@ class ItemMakerT: public ItemMaker { ox::StringView pParentDir, ox::StringView fileExt, ox::ClawFormat pFmt = ox::ClawFormat::Metal) noexcept: - ItemMaker(ox::String(pDisplayName), ox::String(pParentDir), fileExt), + ItemMaker(pDisplayName, pParentDir, fileExt), fmt(pFmt) { } constexpr ItemMakerT( - ox::String pDisplayName, - ox::String pParentDir, - ox::CRStringView fileExt, + ox::StringView pDisplayName, + ox::StringView pParentDir, + ox::StringView fileExt, T pItem, ox::ClawFormat pFmt) noexcept: - ItemMaker(std::move(pDisplayName), std::move(pParentDir), fileExt), + ItemMaker(pDisplayName, pParentDir, fileExt), item(pItem), fmt(pFmt) { } constexpr ItemMakerT( - ox::String pDisplayName, - ox::String pParentDir, - ox::CRStringView fileExt, + ox::StringView pDisplayName, + ox::StringView pParentDir, + ox::StringView fileExt, T &&pItem, ox::ClawFormat pFmt) noexcept: - ItemMaker(std::move(pDisplayName), std::move(pParentDir), fileExt), + ItemMaker(pDisplayName, pParentDir, fileExt), item(std::move(pItem)), fmt(pFmt) { }