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

PixelPaint: Remove try_ prefix from fallible ProjectLoader methods

Browse source
This commit is contained in:
Linus Groh 2023-01-28 20:12:17 +00:00 • committed by Jelle Raaijmakers
parent 86f28ceace
commit 65fa7db2b5
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -1097,7 +1097,7 @@ void MainWidget::set_actions_enabled(bool enabled)
void MainWidget::open_image(FileSystemAccessClient::File file) void MainWidget::open_image(FileSystemAccessClient::File file)
{ {
auto try_load = m_loader.try_load_from_file(file.release_stream()); auto try_load = m_loader.load_from_file(file.release_stream());
if (try_load.is_error()) { if (try_load.is_error()) {
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Unable to open file: {}, {}", file.filename(), try_load.error())); GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Unable to open file: {}, {}", file.filename(), try_load.error()));
return; return;

2
Userland/Applications/PixelPaint/ProjectLoader.cpp
View file

@ -15,7 +15,7 @@
namespace PixelPaint { namespace PixelPaint {
ErrorOr<void> ProjectLoader::try_load_from_file(NonnullOwnPtr<Core::Stream::File> file) ErrorOr<void> ProjectLoader::load_from_file(NonnullOwnPtr<Core::Stream::File> file)
{ {
auto contents = TRY(file->read_until_eof()); auto contents = TRY(file->read_until_eof());

2
Userland/Applications/PixelPaint/ProjectLoader.h
View file

@ -18,7 +18,7 @@ public:
ProjectLoader() = default; ProjectLoader() = default;
~ProjectLoader() = default; ~ProjectLoader() = default;
ErrorOr<void> try_load_from_file(NonnullOwnPtr<Core::Stream::File>); ErrorOr<void> load_from_file(NonnullOwnPtr<Core::Stream::File>);
bool is_raw_image() const { return m_is_raw_image; } bool is_raw_image() const { return m_is_raw_image; }
bool has_image() const { return !m_image.is_null(); } bool has_image() const { return !m_image.is_null(); }