From 6e08f860f8e684a49e1b9e8359f9fbc19f8022d4 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sat, 20 May 2023 01:40:19 +0200 Subject: [PATCH] open: Prefer LibFileSystem over DeprecatedFile --- Userland/Utilities/CMakeLists.txt | 2 +- Userland/Utilities/open.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index b87da69550..1cb5576243 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -118,7 +118,7 @@ target_link_libraries(md PRIVATE LibMarkdown) target_link_libraries(mv PRIVATE LibFileSystem) target_link_libraries(network-settings PRIVATE LibCore LibMain) target_link_libraries(notify PRIVATE LibGfx LibGUI) -target_link_libraries(open PRIVATE LibDesktop) +target_link_libraries(open PRIVATE LibDesktop LibFileSystem) target_link_libraries(passwd PRIVATE LibCrypt) target_link_libraries(paste PRIVATE LibGUI) target_link_libraries(pledge PRIVATE LibFileSystem) diff --git a/Userland/Utilities/open.cpp b/Userland/Utilities/open.cpp index ef2ba4f614..11cedb6c71 100644 --- a/Userland/Utilities/open.cpp +++ b/Userland/Utilities/open.cpp @@ -8,9 +8,9 @@ #include #include #include -#include #include #include +#include #include ErrorOr serenity_main(Main::Arguments arguments) @@ -25,8 +25,8 @@ ErrorOr serenity_main(Main::Arguments arguments) bool all_ok = true; for (auto& url_or_path : urls_or_paths) { - auto path = Core::DeprecatedFile::real_path_for(url_or_path); - auto url = URL::create_with_url_or_path(path.is_null() ? url_or_path : path.view()); + auto path = FileSystem::real_path(url_or_path); + auto url = URL::create_with_url_or_path(path.is_error() ? url_or_path : path.value()); if (!Desktop::Launcher::open(url)) { warnln("Failed to open '{}'", url);