mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Refactor to use string_view more properly

Browse Source
This commit is contained in:
skdltmxn
2021-01-07 01:22:22 +09:00
parent 017f7ef9e4
commit c093a50f3f
60 changed files with 197 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/object/ObjectFactory.cpp
View File

@@ -43,7 +43,7 @@
struct IFileDataRetriever
{
virtual ~IFileDataRetriever() = default;
virtual std::vector<uint8_t> GetData(const std::string_view& path) const abstract;
virtual std::vector<uint8_t> GetData(std::string_view path) const abstract;
};
class FileSystemDataRetriever : public IFileDataRetriever
@@ -52,14 +52,14 @@ private:
std::string _basePath;
public:
FileSystemDataRetriever(const std::string_view& basePath)
FileSystemDataRetriever(std::string_view basePath)
: _basePath(basePath)
{
}
std::vector<uint8_t> GetData(const std::string_view& path) const override
std::vector<uint8_t> GetData(std::string_view path) const override
{
auto absolutePath = Path::Combine(_basePath, path.data());
auto absolutePath = Path::Combine(_basePath, std::string(path).data());
return File::ReadAllBytes(absolutePath);
}
};
@@ -75,7 +75,7 @@ public:
{
}
std::vector<uint8_t> GetData(const std::string_view& path) const override
std::vector<uint8_t> GetData(std::string_view path) const override
{
return _zipArchive.GetFileData(path);
}
@@ -128,7 +128,7 @@ public:
return _loadImages;
}
std::vector<uint8_t> GetData(const std::string_view& path) override
std::vector<uint8_t> GetData(std::string_view path) override
{
if (_fileDataRetriever != nullptr)
{
@@ -351,7 +351,7 @@ namespace ObjectFactory
return ObjectType::None;
}
std::unique_ptr<Object> CreateObjectFromZipFile(IObjectRepository& objectRepository, const std::string_view& path)
std::unique_ptr<Object> CreateObjectFromZipFile(IObjectRepository& objectRepository, std::string_view path)
{
try
{
@@ -372,7 +372,7 @@ namespace ObjectFactory
}
catch (const std::exception& e)
{
Console::Error::WriteLine("Unable to open or read '%s': %s", path.data(), e.what());
Console::Error::WriteLine("Unable to open or read '%s': %s", std::string(path).c_str(), e.what());
}
return nullptr;
}