mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Move to_utf8 from const std::string& to std::string_view

Browse Source
This commit is contained in:
jvoisin 2022-05-21 21:44:47 +02:00
parent 23eccebe9e
commit 9ce26ef4b6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/to_utf8/to_utf8.cpp
View File

@ -348,7 +348,7 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
return mImpl.getLegacyEnc(input, BufferAllocationPolicy::UseGrowFactor, mBuffer); return mImpl.getLegacyEnc(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
} }
ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName) ToUTF8::FromType ToUTF8::calculateEncoding(std::string_view encodingName)
{ {
if (encodingName == "win1250") if (encodingName == "win1250")
return ToUTF8::WINDOWS_1250; return ToUTF8::WINDOWS_1250;
@ -357,10 +357,10 @@ ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
else if (encodingName == "win1252") else if (encodingName == "win1252")
return ToUTF8::WINDOWS_1252; return ToUTF8::WINDOWS_1252;
else else
throw std::runtime_error(std::string("Unknown encoding '") + encodingName + std::string("', see openmw --help for available options.")); throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
} }
std::string ToUTF8::encodingUsingMessage(const std::string& encodingName) std::string ToUTF8::encodingUsingMessage(std::string_view encodingName)
{ {
if (encodingName == "win1250") if (encodingName == "win1250")
return "Using Central and Eastern European font encoding."; return "Using Central and Eastern European font encoding.";
@ -369,5 +369,5 @@ std::string ToUTF8::encodingUsingMessage(const std::string& encodingName)
else if (encodingName == "win1252") else if (encodingName == "win1252")
return "Using default (English) font encoding."; return "Using default (English) font encoding.";
else else
throw std::runtime_error(std::string("Unknown encoding '") + encodingName + std::string("', see openmw --help for available options.")); throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
} }

4
components/to_utf8/to_utf8.hpp
View File

@ -24,8 +24,8 @@ namespace ToUTF8
UseGrowFactor, UseGrowFactor,
}; };
FromType calculateEncoding(const std::string& encodingName); FromType calculateEncoding(std::string_view encodingName);
std::string encodingUsingMessage(const std::string& encodingName); std::string encodingUsingMessage(std::string_view encodingName);
class StatelessUtf8Encoder class StatelessUtf8Encoder
{ {