From 3e6e75bb5e956160bcc4aab6f98da1dcf9d142b4 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sun, 9 Jul 2023 11:37:02 -0400 Subject: [PATCH] FileManager: Return a StringView from PropertiesWindow::get_description --- .../FileManager/PropertiesWindow.cpp | 2 +- .../FileManager/PropertiesWindow.h | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 7ee23df3f7..693769cb77 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -98,7 +98,7 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) m_old_mode = st.st_mode; auto* type = general_tab->find_descendant_of_type_named("type"); - type->set_text(TRY(String::from_deprecated_string(get_description(m_mode)))); + type->set_text(TRY(String::from_utf8(get_description(m_mode)))); if (S_ISLNK(m_mode)) { auto link_destination_or_error = FileSystem::read_link(m_path); diff --git a/Userland/Applications/FileManager/PropertiesWindow.h b/Userland/Applications/FileManager/PropertiesWindow.h index 579c5e42f7..9206fd16d8 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.h +++ b/Userland/Applications/FileManager/PropertiesWindow.h @@ -56,26 +56,26 @@ private: Queue m_work_queue; }; - static DeprecatedString const get_description(mode_t const mode) + static StringView const get_description(mode_t const mode) { if (S_ISREG(mode)) - return "File"; + return "File"sv; if (S_ISDIR(mode)) - return "Directory"; + return "Directory"sv; if (S_ISLNK(mode)) - return "Symbolic link"; + return "Symbolic link"sv; if (S_ISCHR(mode)) - return "Character device"; + return "Character device"sv; if (S_ISBLK(mode)) - return "Block device"; + return "Block device"sv; if (S_ISFIFO(mode)) - return "FIFO (named pipe)"; + return "FIFO (named pipe)"sv; if (S_ISSOCK(mode)) - return "Socket"; + return "Socket"sv; if (mode & S_IXUSR) - return "Executable"; + return "Executable"sv; - return "Unknown"; + return "Unknown"sv; } static ErrorOr> make_button(String, GUI::Widget& parent);