RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 14:27:35 +00:00
Code Issues Activity Actions

Everywhere: Add sv suffix to strings relying on StringView(char const*)

Browse source 
Each of these strings would previously rely on StringView's char const*
constructor overload, which would call __builtin_strlen on the string.
Since we now have operator ""sv, we can replace these with much simpler
versions. This opens the door to being able to remove
StringView(char const*).

No functional changes.
This commit is contained in:
sin-ack 2022-07-11 17:32:29 +00:00 • committed by Andreas Kling
parent e5f09ea170
commit 3f3f45580a
762 changed files with 8315 additions and 8316 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Games/MasterWord/WordGame.cpp
View file

@ -21,9 +21,9 @@
WordGame::WordGame()
{
read_words();
m_num_letters = Config::read_i32("MasterWord", "", "word_length", 5);
m_max_guesses = Config::read_i32("MasterWord", "", "max_guesses", 6);
m_check_guesses = Config::read_bool("MasterWord", "", "check_guesses_in_dictionary", false);
m_num_letters = Config::read_i32("MasterWord"sv, ""sv, "word_length"sv, 5);
m_max_guesses = Config::read_i32("MasterWord"sv, ""sv, "max_guesses"sv, 6);
m_check_guesses = Config::read_bool("MasterWord"sv, ""sv, "check_guesses_in_dictionary"sv, false);
reset();
pick_font();
}
@ -36,7 +36,7 @@ void WordGame::reset()
if (maybe_word.has_value())
m_current_word = maybe_word.value();
else {
GUI::MessageBox::show(window(), String::formatted("Could not get a random {} letter word. Defaulting to 5.", m_num_letters), "MasterWord");
GUI::MessageBox::show(window(), String::formatted("Could not get a random {} letter word. Defaulting to 5.", m_num_letters), "MasterWord"sv);
if (m_num_letters != 5) {
m_num_letters = 5;
reset();
@ -90,10 +90,10 @@ void WordGame::keydown_event(GUI::KeyEvent& event)
auto won = m_current_guess == m_current_word;
m_current_guess = {};
if (won) {
GUI::MessageBox::show(window(), "You win!", "MasterWord");
GUI::MessageBox::show(window(), "You win!"sv, "MasterWord"sv);
reset();
} else if (m_guesses.size() == m_max_guesses) {
GUI::MessageBox::show(window(), String::formatted("You lose!\nThe word was {}", m_current_word), "MasterWord");
GUI::MessageBox::show(window(), String::formatted("You lose!\nThe word was {}", m_current_word), "MasterWord"sv);
reset();
}
} else {
@ -161,7 +161,7 @@ void WordGame::read_words()
m_words.clear();
auto response = Core::File::open("/res/words.txt", Core::OpenMode::ReadOnly);
if (response.is_error()) {
GUI::MessageBox::show(nullptr, "Could not read /res/words.txt.\nPlease ensure this file exists and restart MasterWord.", "MasterWord");
GUI::MessageBox::show(nullptr, "Could not read /res/words.txt.\nPlease ensure this file exists and restart MasterWord."sv, "MasterWord"sv);
exit(0);
}
auto words_file = response.value();