Просмотр исходного кода

aconv: Remove usage of ancient `Core::DeprecatedFile`

That'll teach me for merging without waiting for CI :^)
Jelle Raaijmakers 2 лет назад
Родитель
Сommit
56da2c5db6
2 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      Userland/Utilities/CMakeLists.txt
  2. 3 3
      Userland/Utilities/aconv.cpp

+ 1 - 1
Userland/Utilities/CMakeLists.txt

@@ -72,7 +72,7 @@ install(CODE "file(CREATE_LINK grep ${CMAKE_INSTALL_PREFIX}/bin/fgrep SYMBOLIC)"
 install(CODE "file(CREATE_LINK grep ${CMAKE_INSTALL_PREFIX}/bin/rgrep SYMBOLIC)")
 install(CODE "file(CREATE_LINK grep ${CMAKE_INSTALL_PREFIX}/bin/rgrep SYMBOLIC)")
 
 
 target_link_libraries(abench PRIVATE LibAudio LibFileSystem)
 target_link_libraries(abench PRIVATE LibAudio LibFileSystem)
-target_link_libraries(aconv PRIVATE LibAudio)
+target_link_libraries(aconv PRIVATE LibAudio LibFileSystem)
 target_link_libraries(aplay PRIVATE LibAudio LibFileSystem LibIPC)
 target_link_libraries(aplay PRIVATE LibAudio LibFileSystem LibIPC)
 target_link_libraries(asctl PRIVATE LibAudio LibIPC)
 target_link_libraries(asctl PRIVATE LibAudio LibIPC)
 target_link_libraries(bt PRIVATE LibSymbolication)
 target_link_libraries(bt PRIVATE LibSymbolication)

+ 3 - 3
Userland/Utilities/aconv.cpp

@@ -9,8 +9,8 @@
 #include <LibAudio/Loader.h>
 #include <LibAudio/Loader.h>
 #include <LibAudio/WavWriter.h>
 #include <LibAudio/WavWriter.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/System.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <stdio.h>
 
 
@@ -80,9 +80,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         return Error::from_string_view("Output format must be specified manually when writing to standard output"sv);
         return Error::from_string_view("Output format must be specified manually when writing to standard output"sv);
 
 
     if (input != "-"sv)
     if (input != "-"sv)
-        TRY(Core::System::unveil(Core::DeprecatedFile::absolute_path(input), "r"sv));
+        TRY(Core::System::unveil(TRY(FileSystem::absolute_path(input)), "r"sv));
     if (output != "-"sv)
     if (output != "-"sv)
-        TRY(Core::System::unveil(Core::DeprecatedFile::absolute_path(output), "rwc"sv));
+        TRY(Core::System::unveil(TRY(FileSystem::absolute_path(output)), "rwc"sv));
     TRY(Core::System::unveil(nullptr, nullptr));
     TRY(Core::System::unveil(nullptr, nullptr));
 
 
     RefPtr<Audio::Loader> input_loader;
     RefPtr<Audio::Loader> input_loader;