mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 11:27:35 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -118,14 +118,14 @@ bool ViewWidget::is_previous_available() const
|
|||
|
||||
// FIXME: Convert to `String` & use LibFileSystemAccessClient + `Core::System::unveil(nullptr, nullptr)`
|
||||
// - Converting to String is not super-trivial due to the LexicalPath usage, while we can do a bunch of
|
||||
// String::from_deprecated_string() and String.to_deprecated_string(), it is quite ugly to read and
|
||||
// String::from_byte_string() and String.to_byte_string(), it is quite ugly to read and
|
||||
// probably not the best approach.
|
||||
//
|
||||
// - If we go full-unveil (`Core::System::unveil(nullptr, nullptr)`) this functionality does not work,
|
||||
// we can not access the list of contents of a directory through LibFileSystemAccessClient at the moment.
|
||||
Vector<DeprecatedString> ViewWidget::load_files_from_directory(DeprecatedString const& path) const
|
||||
Vector<ByteString> ViewWidget::load_files_from_directory(ByteString const& path) const
|
||||
{
|
||||
Vector<DeprecatedString> files_in_directory;
|
||||
Vector<ByteString> files_in_directory;
|
||||
|
||||
auto current_dir = LexicalPath(path).parent().string();
|
||||
// FIXME: Propagate errors
|
||||
|
@ -141,8 +141,8 @@ Vector<DeprecatedString> ViewWidget::load_files_from_directory(DeprecatedString
|
|||
void ViewWidget::set_path(String const& path)
|
||||
{
|
||||
m_path = path;
|
||||
m_files_in_same_dir = load_files_from_directory(path.to_deprecated_string());
|
||||
m_current_index = m_files_in_same_dir.find_first_index(path.to_deprecated_string());
|
||||
m_files_in_same_dir = load_files_from_directory(path.to_byte_string());
|
||||
m_current_index = m_files_in_same_dir.find_first_index(path.to_byte_string());
|
||||
}
|
||||
|
||||
void ViewWidget::navigate(Directions direction)
|
||||
|
|
|
@ -138,7 +138,7 @@ private:
|
|||
|
||||
void set_image(Image const* image);
|
||||
void animate();
|
||||
Vector<DeprecatedString> load_files_from_directory(DeprecatedString const& path) const;
|
||||
Vector<ByteString> load_files_from_directory(ByteString const& path) const;
|
||||
ErrorOr<void> try_open_file(String const&, Core::File&);
|
||||
|
||||
String m_path;
|
||||
|
@ -162,7 +162,7 @@ private:
|
|||
|
||||
int m_toolbar_height { 28 };
|
||||
bool m_scaled_for_first_image { false };
|
||||
Vector<DeprecatedString> m_files_in_same_dir;
|
||||
Vector<ByteString> m_files_in_same_dir;
|
||||
Optional<size_t> m_current_index;
|
||||
Gfx::Painter::ScalingMode m_scaling_mode { Gfx::Painter::ScalingMode::NearestNeighbor };
|
||||
};
|
||||
|
|
|
@ -82,7 +82,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
return;
|
||||
}
|
||||
|
||||
window->set_title(DeprecatedString::formatted("{} {} {}% - Image Viewer", widget.path(), widget.image()->size().to_deprecated_string(), (int)(scale * 100)));
|
||||
window->set_title(ByteString::formatted("{} {} {}% - Image Viewer", widget.path(), widget.image()->size().to_byte_string(), (int)(scale * 100)));
|
||||
|
||||
if (!widget.scaled_for_first_image()) {
|
||||
widget.set_scaled_for_first_image(true);
|
||||
|
@ -140,7 +140,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
return;
|
||||
|
||||
auto msgbox_result = GUI::MessageBox::show(window,
|
||||
DeprecatedString::formatted("Are you sure you want to delete {}?", path),
|
||||
ByteString::formatted("Are you sure you want to delete {}?", path),
|
||||
"Confirm Deletion"sv,
|
||||
GUI::MessageBox::Type::Warning,
|
||||
GUI::MessageBox::InputType::OKCancel);
|
||||
|
@ -151,7 +151,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
auto unlinked_or_error = Core::System::unlink(widget.path());
|
||||
if (unlinked_or_error.is_error()) {
|
||||
GUI::MessageBox::show(window,
|
||||
DeprecatedString::formatted("unlink({}) failed: {}", path, unlinked_or_error.error()),
|
||||
ByteString::formatted("unlink({}) failed: {}", path, unlinked_or_error.error()),
|
||||
"Delete Failed"sv,
|
||||
GUI::MessageBox::Type::Error);
|
||||
|
||||
|
@ -188,7 +188,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
[&](auto&) {
|
||||
if (!GUI::Desktop::the().set_wallpaper(widget.image()->bitmap(GUI::Desktop::the().rect().size()).release_value_but_fixme_should_propagate_errors(), widget.path())) {
|
||||
GUI::MessageBox::show(window,
|
||||
DeprecatedString::formatted("set_wallpaper({}) failed", widget.path()),
|
||||
ByteString::formatted("set_wallpaper({}) failed", widget.path()),
|
||||
"Could not set wallpaper"sv,
|
||||
GUI::MessageBox::Type::Error);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue