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

HexEditor: Create a function to initialize a HexDocumentFile

Browse source 
This function is made from what composed `set_file()` (which now calls
the new function). It allows to create a `HexDocumentFile` without
calling the hackish `set_file(move(m_file))`.
This commit is contained in:
Lucas CHOLLET 2023-01-14 22:42:05 -05:00 • committed by Andrew Kaster
parent 689b3c2c26
commit 3f932081ae
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/HexEditor/HexDocument.cpp
View file

@ -72,8 +72,7 @@ ErrorOr<void> HexDocumentMemory::write_to_file(Core::Stream::File& file)
ErrorOr<NonnullOwnPtr<HexDocumentFile>> HexDocumentFile::create(NonnullOwnPtr<Core::Stream::File> file) ErrorOr<NonnullOwnPtr<HexDocumentFile>> HexDocumentFile::create(NonnullOwnPtr<Core::Stream::File> file)
{ {
auto document = TRY(adopt_nonnull_own_or_enomem(new HexDocumentFile(move(file)))); auto document = TRY(adopt_nonnull_own_or_enomem(new HexDocumentFile(move(file))));
// FIXME: Remove this hackery TRY(document->initialize_internal_state());
TRY(document->set_file(move(document->m_file)));
return document; return document;
} }
@ -153,7 +152,12 @@ void HexDocumentFile::clear_changes()
ErrorOr<void> HexDocumentFile::set_file(NonnullOwnPtr<Core::Stream::File> file) ErrorOr<void> HexDocumentFile::set_file(NonnullOwnPtr<Core::Stream::File> file)
{ {
m_file = move(file); m_file = move(file);
TRY(initialize_internal_state());
return {};
}
ErrorOr<void> HexDocumentFile::initialize_internal_state()
{
if (auto result = m_file->seek(0, SeekMode::FromEndPosition); result.is_error()) if (auto result = m_file->seek(0, SeekMode::FromEndPosition); result.is_error())
m_file_size = 0; m_file_size = 0;
else else

2
Userland/Applications/HexEditor/HexDocument.h
View file

@ -76,6 +76,8 @@ public:
private: private:
explicit HexDocumentFile(NonnullOwnPtr<Core::Stream::File> file); explicit HexDocumentFile(NonnullOwnPtr<Core::Stream::File> file);
ErrorOr<void> initialize_internal_state();
void ensure_position_in_buffer(size_t position); void ensure_position_in_buffer(size_t position);
NonnullOwnPtr<Core::Stream::File> m_file; NonnullOwnPtr<Core::Stream::File> m_file;