diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp index bb9636a60f..a57c88c9d7 100644 --- a/Userland/Libraries/LibGfx/Bitmap.cpp +++ b/Userland/Libraries/LibGfx/Bitmap.cpp @@ -511,7 +511,7 @@ Optional Bitmap::allocate_backing_store(BitmapFormat format, const if (purgeable == Purgeable::Yes) map_flags |= MAP_NORESERVE; #ifdef __serenity__ - void* data = mmap_with_name(nullptr, data_size_in_bytes, PROT_READ | PROT_WRITE, map_flags, 0, 0, String::format("GraphicsBitmap [%dx%d]", size.width(), size.height()).characters()); + void* data = mmap_with_name(nullptr, data_size_in_bytes, PROT_READ | PROT_WRITE, map_flags, 0, 0, String::formatted("GraphicsBitmap [{}]", size).characters()); #else void* data = mmap(nullptr, data_size_in_bytes, PROT_READ | PROT_WRITE, map_flags, 0, 0); #endif diff --git a/Userland/Libraries/LibGfx/Color.cpp b/Userland/Libraries/LibGfx/Color.cpp index 482e0bc0ad..7e2ff4b36f 100644 --- a/Userland/Libraries/LibGfx/Color.cpp +++ b/Userland/Libraries/LibGfx/Color.cpp @@ -40,12 +40,12 @@ namespace Gfx { String Color::to_string() const { - return String::format("#%02x%02x%02x%02x", red(), green(), blue(), alpha()); + return String::formatted("#{:02x}{:02x}{:02x}{:02x}", red(), green(), blue(), alpha()); } String Color::to_string_without_alpha() const { - return String::format("#%02x%02x%02x", red(), green(), blue()); + return String::formatted("#{:02x}{:02x}{:02x}", red(), green(), blue()); } static Optional parse_rgb_color(const StringView& string) diff --git a/Userland/Libraries/LibGfx/Emoji.cpp b/Userland/Libraries/LibGfx/Emoji.cpp index 5965f452fb..33645a0d72 100644 --- a/Userland/Libraries/LibGfx/Emoji.cpp +++ b/Userland/Libraries/LibGfx/Emoji.cpp @@ -39,9 +39,7 @@ const Bitmap* Emoji::emoji_for_code_point(u32 code_point) if (it != s_emojis.end()) return (*it).value.ptr(); - String path = String::format("/res/emoji/U+%X.png", code_point); - - auto bitmap = Bitmap::load_from_file(path); + auto bitmap = Bitmap::load_from_file(String::formatted("/res/emoji/U+{:X}.png", code_point)); if (!bitmap) { s_emojis.set(code_point, nullptr); return nullptr; diff --git a/Userland/Libraries/LibGfx/Rect.cpp b/Userland/Libraries/LibGfx/Rect.cpp index ff135e6afd..a32c720649 100644 --- a/Userland/Libraries/LibGfx/Rect.cpp +++ b/Userland/Libraries/LibGfx/Rect.cpp @@ -154,7 +154,7 @@ void Rect::set_size_around(const Size& new_size, const Point& fixed_poi template<> String IntRect::to_string() const { - return String::format("[%d,%d %dx%d]", x(), y(), width(), height()); + return String::formatted("[{},{} {}x{}]", x(), y(), width(), height()); } template<>