ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12386 from lioncash/setting 

Common/SettingsHandler: Minor convenience changes
This commit is contained in:
Tilka 2023-12-12 00:02:21 +00:00 committed by GitHub
parent f04d834e8f 88a973131c
commit 6699acf10c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/SettingsHandler.cpp
View File

@ -81,7 +81,7 @@ void SettingsHandler::Decrypt()
// (see the comment in WriteLine), lines can be separated by CRLFLF.
// To handle this, we remove every CR and treat LF as the line ending.
// (We ignore empty lines.)
decoded.erase(std::remove(decoded.begin(), decoded.end(), '\x0d'), decoded.end());
std::erase(decoded, '\x0d');
}
void SettingsHandler::Reset()
@ -92,12 +92,12 @@ void SettingsHandler::Reset()
m_buffer = {};
}
void SettingsHandler::AddSetting(const std::string& key, const std::string& value)
void SettingsHandler::AddSetting(std::string_view key, std::string_view value)
{
WriteLine(key + '=' + value + "\r\n");
WriteLine(fmt::format("{}={}\r\n", key, value));
}
void SettingsHandler::WriteLine(const std::string& str)
void SettingsHandler::WriteLine(std::string_view str)
{
const u32 old_position = m_position;
const u32 old_key = m_key;

4
Source/Core/Common/SettingsHandler.h
View File

@ -27,7 +27,7 @@ public:
SettingsHandler();
explicit SettingsHandler(Buffer&& buffer);
void AddSetting(const std::string& key, const std::string& value);
void AddSetting(std::string_view key, std::string_view value);
const Buffer& GetBytes() const;
void SetBytes(Buffer&& buffer);
@ -38,7 +38,7 @@ public:
static std::string GenerateSerialNumber();
private:
void WriteLine(const std::string& str);
void WriteLine(std::string_view str);
void WriteByte(u8 b);
std::array<u8, SETTINGS_SIZE> m_buffer;