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

PixelPaint: Remove unused methods to access files directly

Browse source 
After transitioning to FileSystemAccessServer, some of the methods
in `MainWidget` and `ProjectLoader` for opening files directly with
a filename as opposed to with a file descriptor are unused. This
commit removes them.
This commit is contained in:
Mustafa Quraish 2021-09-11 13:59:00 -04:00 • committed by Andreas Kling
parent f337580191
commit 1e1e5bb5f7
4 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -719,18 +719,6 @@ void MainWidget::open_image_fd(int fd, String const& path)
m_layer_list_widget->set_image(&image); m_layer_list_widget->set_image(&image);
} }
void MainWidget::open_image_file(String const& path)
{
auto try_load = m_loader.try_load_from_path(path);
if (try_load.is_error()) {
GUI::MessageBox::show_error(window(), String::formatted("Unable to open file: {}", path));
return;
}
auto& image = *m_loader.release_image();
create_new_editor(image);
m_layer_list_widget->set_image(&image);
}
void MainWidget::create_default_image() void MainWidget::create_default_image()
{ {
auto image = Image::try_create_with_size({ 480, 360 }); auto image = Image::try_create_with_size({ 480, 360 });

1
Userland/Applications/PixelPaint/MainWidget.h
View file

@ -34,7 +34,6 @@ public:
void initialize_menubar(GUI::Window&); void initialize_menubar(GUI::Window&);
void open_image_fd(int fd, String const& path); void open_image_fd(int fd, String const& path);
void open_image_file(String const& path);
void create_default_image(); void create_default_image();
private: private:

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

@ -63,13 +63,5 @@ Result<void, String> ProjectLoader::try_load_from_fd_and_close(int fd, StringVie
m_image = image; m_image = image;
return {}; return {};
} }
Result<void, String> ProjectLoader::try_load_from_path(StringView path)
{
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error())
return String::formatted("Unable to open file because: {}", file_or_error.release_error());
return try_load_from_fd_and_close(file_or_error.release_value()->leak_fd(), path);
}
} }

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

@ -19,7 +19,6 @@ public:
~ProjectLoader() = default; ~ProjectLoader() = default;
Result<void, String> try_load_from_fd_and_close(int fd, StringView path); Result<void, String> try_load_from_fd_and_close(int fd, StringView path);
Result<void, String> try_load_from_path(StringView path);
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(); }