From 0b29c5e41d47db8a1c5652e35837f64477fd2fab Mon Sep 17 00:00:00 2001 From: asynts Date: Tue, 6 Oct 2020 14:28:58 +0200 Subject: [PATCH] PixelPaint: Use new format functions. --- Applications/PixelPaint/ToolboxWidget.cpp | 2 +- Applications/PixelPaint/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/PixelPaint/ToolboxWidget.cpp b/Applications/PixelPaint/ToolboxWidget.cpp index 1a74ff0d933..a57c2c3938b 100644 --- a/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Applications/PixelPaint/ToolboxWidget.cpp @@ -121,7 +121,7 @@ void ToolboxWidget::setup_tools() button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); button.set_preferred_size(0, 32); button.set_checkable(true); - button.set_icon(Gfx::Bitmap::load_from_file(String::format("/res/icons/pixelpaint/%s.png", icon_name.to_string().characters()))); + button.set_icon(Gfx::Bitmap::load_from_file(String::formatted("/res/icons/pixelpaint/{}.png", icon_name))); return button; }; diff --git a/Applications/PixelPaint/main.cpp b/Applications/PixelPaint/main.cpp index cfdf35605c6..d4d30f80cd7 100644 --- a/Applications/PixelPaint/main.cpp +++ b/Applications/PixelPaint/main.cpp @@ -117,7 +117,7 @@ int main(int argc, char** argv) auto bitmap = Gfx::Bitmap::load_from_file(open_path.value()); if (!bitmap) { - GUI::MessageBox::show(window, String::format("Failed to load '%s'", open_path.value().characters()), "Open failed", GUI::MessageBox::Type::Error); + GUI::MessageBox::show(window, String::formatted("Failed to load '{}'", open_path.value()), "Open failed", GUI::MessageBox::Type::Error); return; } })); @@ -158,7 +158,7 @@ int main(int argc, char** argv) if (dialog->exec() == GUI::Dialog::ExecOK) { auto layer = PixelPaint::Layer::create_with_size(*image_editor.image(), dialog->layer_size(), dialog->layer_name()); if (!layer) { - GUI::MessageBox::show_error(window, String::format("Unable to create layer with size %s", dialog->size().to_string().characters())); + GUI::MessageBox::show_error(window, String::formatted("Unable to create layer with size {}", dialog->size().to_string())); return; } image_editor.image()->add_layer(layer.release_nonnull());