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/Shell/Formatter.h | |
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/Shell/Formatter.h')
-rw-r--r-- | Userland/Shell/Formatter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Userland/Shell/Formatter.h b/Userland/Shell/Formatter.h index 1a08790cf2..9cb6bfbc18 100644 --- a/Userland/Shell/Formatter.h +++ b/Userland/Shell/Formatter.h @@ -7,8 +7,8 @@ #pragma once #include "NodeVisitor.h" +#include <AK/DeprecatedString.h> #include <AK/Forward.h> -#include <AK/String.h> #include <AK/StringBuilder.h> #include <AK/StringView.h> #include <AK/Types.h> @@ -41,7 +41,7 @@ public: { } - String format(); + DeprecatedString format(); size_t cursor() const { return m_output_cursor; } private: @@ -97,7 +97,7 @@ private: ALWAYS_INLINE void with_added_indent(int indent, Function<void()>); ALWAYS_INLINE void in_new_block(Function<void()>); - ALWAYS_INLINE String in_new_builder(Function<void()>, StringBuilder new_builder = StringBuilder {}); + ALWAYS_INLINE DeprecatedString in_new_builder(Function<void()>, StringBuilder new_builder = StringBuilder {}); StringBuilder& current_builder() { return m_builders.last(); } @@ -123,7 +123,7 @@ private: const AST::Node* m_last_visited_node { nullptr }; StringView m_trivia; - Vector<String> m_heredocs_to_append_after_sequence; + Vector<DeprecatedString> m_heredocs_to_append_after_sequence; }; } |