diff options
author | Linus Groh <mail@linusgroh.de> | 2022-12-04 18:02:33 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-12-06 08:54:33 +0100 |
commit | 6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch) | |
tree | 372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Utilities/grep.cpp | |
parent | f74251606d74b504a1379ebb893fdb5529054ea5 (diff) | |
download | serenity-6e19ab2bbce0b113b628e6f8e9b5c0640053933e.zip |
AK+Everywhere: Rename String to DeprecatedString
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
Diffstat (limited to 'Userland/Utilities/grep.cpp')
-rw-r--r-- | Userland/Utilities/grep.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Utilities/grep.cpp b/Userland/Utilities/grep.cpp index eed4c9a24c..a328d6526d 100644 --- a/Userland/Utilities/grep.cpp +++ b/Userland/Utilities/grep.cpp @@ -5,9 +5,9 @@ */ #include <AK/Assertions.h> +#include <AK/DeprecatedString.h> #include <AK/LexicalPath.h> #include <AK/ScopeGuard.h> -#include <AK/String.h> #include <AK/Vector.h> #include <LibCore/ArgsParser.h> #include <LibCore/DirIterator.h> @@ -37,13 +37,13 @@ ErrorOr<int> serenity_main(Main::Arguments args) { TRY(Core::System::pledge("stdio rpath")); - String program_name = AK::LexicalPath::basename(args.strings[0]); + DeprecatedString program_name = AK::LexicalPath::basename(args.strings[0]); - Vector<String> files; + Vector<DeprecatedString> files; bool recursive = (program_name == "rgrep"sv); bool use_ere = (program_name == "egrep"sv); - Vector<String> patterns; + Vector<DeprecatedString> patterns; BinaryFileMode binary_mode { BinaryFileMode::Binary }; bool case_insensitive = false; bool line_numbers = false; @@ -232,7 +232,7 @@ ErrorOr<int> serenity_main(Main::Arguments args) return true; }; - auto add_directory = [&handle_file, user_has_specified_files](String base, Optional<String> recursive, auto handle_directory) -> void { + auto add_directory = [&handle_file, user_has_specified_files](DeprecatedString base, Optional<DeprecatedString> recursive, auto handle_directory) -> void { Core::DirIterator it(recursive.value_or(base), Core::DirIterator::Flags::SkipDots); while (it.has_next()) { auto path = it.next_full_path(); |