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/DevTools/UserspaceEmulator/Emulator.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/DevTools/UserspaceEmulator/Emulator.h')
-rw-r--r-- | Userland/DevTools/UserspaceEmulator/Emulator.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h index fe7ae3efe2..92b0c1d44b 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.h +++ b/Userland/DevTools/UserspaceEmulator/Emulator.h @@ -31,9 +31,9 @@ class Emulator { public: static Emulator& the(); - Emulator(String const& executable_path, Vector<StringView> const& arguments, Vector<String> const& environment); + Emulator(DeprecatedString const& executable_path, Vector<StringView> const& arguments, Vector<DeprecatedString> const& environment); - void set_profiling_details(bool should_dump_profile, size_t instruction_interval, OutputFileStream* profile_stream, NonnullOwnPtrVector<String>* profiler_strings, Vector<int>* profiler_string_id_map) + void set_profiling_details(bool should_dump_profile, size_t instruction_interval, OutputFileStream* profile_stream, NonnullOwnPtrVector<DeprecatedString>* profiler_strings, Vector<int>* profiler_string_id_map) { m_is_profiling = should_dump_profile; m_profile_instruction_interval = instruction_interval; @@ -48,7 +48,7 @@ public: } OutputFileStream& profile_stream() { return *m_profile_stream; } - NonnullOwnPtrVector<String>& profiler_strings() { return *m_profiler_strings; } + NonnullOwnPtrVector<DeprecatedString>& profiler_strings() { return *m_profiler_strings; } Vector<int>& profiler_string_id_map() { return *m_profiler_string_id_map; } bool is_profiling() const { return m_is_profiling; } @@ -114,8 +114,8 @@ public: } struct SymbolInfo { - String lib_name; - String symbol; + DeprecatedString lib_name; + DeprecatedString symbol; Optional<Debug::DebugInfo::SourcePosition> source_position; }; @@ -124,9 +124,9 @@ public: void dump_regions() const; private: - const String m_executable_path; + const DeprecatedString m_executable_path; Vector<StringView> const m_arguments; - Vector<String> const m_environment; + Vector<DeprecatedString> const m_environment; SoftMMU m_mmu; NonnullOwnPtr<SoftCPU> m_cpu; @@ -134,14 +134,14 @@ private: OwnPtr<MallocTracer> m_malloc_tracer; void setup_stack(Vector<ELF::AuxiliaryValue>); - Vector<ELF::AuxiliaryValue> generate_auxiliary_vector(FlatPtr load_base, FlatPtr entry_eip, String const& executable_path, int executable_fd) const; + Vector<ELF::AuxiliaryValue> generate_auxiliary_vector(FlatPtr load_base, FlatPtr entry_eip, DeprecatedString const& executable_path, int executable_fd) const; void register_signal_handlers(); void setup_signal_trampoline(); void send_signal(int); void emit_profile_sample(AK::OutputStream&); - void emit_profile_event(AK::OutputStream&, StringView event_name, String const& contents); + void emit_profile_event(AK::OutputStream&, StringView event_name, DeprecatedString const& contents); int virt$accept4(FlatPtr); int virt$access(FlatPtr, size_t, int); @@ -256,8 +256,8 @@ private: MmapRegion const* find_text_region(FlatPtr address); MmapRegion const* load_library_from_address(FlatPtr address); MmapRegion const* first_region_for_object(StringView name); - String create_backtrace_line(FlatPtr address); - String create_instruction_line(FlatPtr address, X86::Instruction const& insn); + DeprecatedString create_backtrace_line(FlatPtr address); + DeprecatedString create_instruction_line(FlatPtr address, X86::Instruction const& insn); bool m_shutdown { false }; int m_exit_status { 0 }; @@ -292,13 +292,13 @@ private: NonnullOwnPtr<ELF::Image> image; }; - HashMap<String, CachedELF> m_dynamic_library_cache; + HashMap<DeprecatedString, CachedELF> m_dynamic_library_cache; RangeAllocator m_range_allocator; OutputFileStream* m_profile_stream { nullptr }; Vector<int>* m_profiler_string_id_map { nullptr }; - NonnullOwnPtrVector<String>* m_profiler_strings { nullptr }; + NonnullOwnPtrVector<DeprecatedString>* m_profiler_strings { nullptr }; bool m_is_profiling { false }; size_t m_profile_instruction_interval { 0 }; |