RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 05:17:34 +00:00
Code Issues Activity Actions

GamesSettings+LibCards: Get rid of DeprecatedString

Browse source
This commit is contained in:
kleines Filmröllchen 2023-06-26 20:49:32 +02:00 • committed by Linus Groh
parent afaea38be2
commit bd13cc0732
5 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCards/CardGame.cpp
View file

@ -121,7 +121,7 @@ void CardGame::config_string_did_change(StringView domain, StringView group, Str
return;
}
if (key == "CardBackImage") {
CardPainter::the().set_background_image_path(value);
CardPainter::the().set_background_image_path(String::from_utf8(value).release_value_but_fixme_should_propagate_errors());
update();
return;
}

6
Userland/Libraries/LibCards/CardPainter.cpp
View file

@ -21,7 +21,7 @@ CardPainter& CardPainter::the()
CardPainter::CardPainter()
{
m_background_image_path = Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv, "/res/graphics/cards/backs/buggie-deck.png"sv);
m_background_image_path = MUST(String::from_deprecated_string(Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv, "/res/graphics/cards/backs/buggie-deck.png"sv)));
}
static constexpr Gfx::CharacterBitmap s_diamond {
@ -143,12 +143,12 @@ NonnullRefPtr<Gfx::Bitmap> CardPainter::card_back_inverted()
return *m_card_back_inverted;
}
void CardPainter::set_background_image_path(DeprecatedString path)
void CardPainter::set_background_image_path(StringView path)
{
if (m_background_image_path == path)
return;
m_background_image_path = path;
m_background_image_path = MUST(String::from_utf8(path));
if (!m_card_back.is_null())
paint_card_back(*m_card_back);
if (!m_card_back_inverted.is_null())

5
Userland/Libraries/LibCards/CardPainter.h
View file

@ -7,6 +7,7 @@
#pragma once
#include <AK/Array.h>
#include <AK/String.h>
#include <LibCards/Card.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Color.h>
@ -23,7 +24,7 @@ public:
NonnullRefPtr<Gfx::Bitmap> card_back_inverted();
NonnullRefPtr<Gfx::Bitmap> card_front_highlighted(Suit, Rank);
void set_background_image_path(DeprecatedString path);
void set_background_image_path(StringView path);
void set_background_color(Color);
private:
@ -40,7 +41,7 @@ private:
RefPtr<Gfx::Bitmap> m_card_back;
RefPtr<Gfx::Bitmap> m_card_back_inverted;
DeprecatedString m_background_image_path;
String m_background_image_path;
Color m_background_color;
};