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 :^)

4 files changed, 61 insertions, 61 deletions

diff --git a/Userland/Services/ConfigServer/ConfigClient.ipc b/Userland/Services/ConfigServer/ConfigClient.ipc
index 0700c1ec5a..db5a2a411a 100644
--- a/Userland/Services/ConfigServer/ConfigClient.ipc
+++ b/Userland/Services/ConfigServer/ConfigClient.ipc
@@ -1,9 +1,9 @@
 endpoint ConfigClient
 {
-    notify_changed_string_value(String domain, String group, String key, String value) =|
-    notify_changed_i32_value(String domain, String group, String key, i32 value) =|
-    notify_changed_bool_value(String domain, String group, String key, bool value) =|
-    notify_removed_key(String domain, String group, String key) =|
-    notify_removed_group(String domain, String group) =|
-    notify_added_group(String domain, String group) =|
+    notify_changed_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, DeprecatedString value) =|
+    notify_changed_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, i32 value) =|
+    notify_changed_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, bool value) =|
+    notify_removed_key(DeprecatedString domain, DeprecatedString group, DeprecatedString key) =|
+    notify_removed_group(DeprecatedString domain, DeprecatedString group) =|
+    notify_added_group(DeprecatedString domain, DeprecatedString group) =|
 }
diff --git a/Userland/Services/ConfigServer/ConfigServer.ipc b/Userland/Services/ConfigServer/ConfigServer.ipc
index e68dd2b2eb..4a7bd1a428 100644
--- a/Userland/Services/ConfigServer/ConfigServer.ipc
+++ b/Userland/Services/ConfigServer/ConfigServer.ipc
@@ -1,20 +1,20 @@
 endpoint ConfigServer
 {
-    pledge_domains(Vector<String> domains) =|
+    pledge_domains(Vector<DeprecatedString> domains) =|
 
-    monitor_domain(String domain) =|
+    monitor_domain(DeprecatedString domain) =|
 
-    list_config_groups(String domain) => (Vector<String> groups)
-    list_config_keys(String domain, String group) => (Vector<String> keys)
+    list_config_groups(DeprecatedString domain) => (Vector<DeprecatedString> groups)
+    list_config_keys(DeprecatedString domain, DeprecatedString group) => (Vector<DeprecatedString> keys)
 
-    read_string_value(String domain, String group, String key) => (Optional<String> value)
-    read_i32_value(String domain, String group, String key) => (Optional<i32> value)
-    read_bool_value(String domain, String group, String key) => (Optional<bool> value)
+    read_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<DeprecatedString> value)
+    read_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<i32> value)
+    read_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<bool> value)
 
-    write_string_value(String domain, String group, String key, String value) => ()
-    write_i32_value(String domain, String group, String key, i32 value) => ()
-    write_bool_value(String domain, String group, String key, bool value)  => ()
-    remove_key_entry(String domain, String group, String key) => ()
-    remove_group_entry(String domain, String group) => ()
-    add_group_entry(String domain, String group)  => ()
+    write_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, DeprecatedString value) => ()
+    write_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, i32 value) => ()
+    write_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, bool value)  => ()
+    remove_key_entry(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => ()
+    remove_group_entry(DeprecatedString domain, DeprecatedString group) => ()
+    add_group_entry(DeprecatedString domain, DeprecatedString group)  => ()
 }
diff --git a/Userland/Services/ConfigServer/ConnectionFromClient.cpp b/Userland/Services/ConfigServer/ConnectionFromClient.cpp
index 264cd7ead1..ccc7ba188c 100644
--- a/Userland/Services/ConfigServer/ConnectionFromClient.cpp
+++ b/Userland/Services/ConfigServer/ConnectionFromClient.cpp
@@ -15,15 +15,15 @@ namespace ConfigServer {
 static HashMap<int, RefPtr<ConnectionFromClient>> s_connections;
 
 struct CachedDomain {
-    String domain;
+    DeprecatedString domain;
     NonnullRefPtr<Core::ConfigFile> config;
     RefPtr<Core::FileWatcher> watcher;
 };
 
-static HashMap<String, NonnullOwnPtr<CachedDomain>> s_cache;
+static HashMap<DeprecatedString, NonnullOwnPtr<CachedDomain>> s_cache;
 static constexpr int s_disk_sync_delay_ms = 5'000;
 
-static void for_each_monitoring_connection(String const& domain, ConnectionFromClient* excluded_connection, Function<void(ConnectionFromClient&)> callback)
+static void for_each_monitoring_connection(DeprecatedString const& domain, ConnectionFromClient* excluded_connection, Function<void(ConnectionFromClient&)> callback)
 {
     for (auto& it : s_connections) {
         if (it.value->is_monitoring_domain(domain) && (!excluded_connection || it.value != excluded_connection))
@@ -31,7 +31,7 @@ static void for_each_monitoring_connection(String const& domain, ConnectionFromC
     }
 }
 
-static Core::ConfigFile& ensure_domain_config(String const& domain)
+static Core::ConfigFile& ensure_domain_config(DeprecatedString const& domain)
 {
     auto it = s_cache.find(domain);
     if (it != s_cache.end())
@@ -88,7 +88,7 @@ void ConnectionFromClient::die()
     sync_dirty_domains_to_disk();
 }
 
-void ConnectionFromClient::pledge_domains(Vector<String> const& domains)
+void ConnectionFromClient::pledge_domains(Vector<DeprecatedString> const& domains)
 {
     if (m_has_pledged) {
         did_misbehave("Tried to pledge domains twice.");
@@ -99,7 +99,7 @@ void ConnectionFromClient::pledge_domains(Vector<String> const& domains)
         m_pledged_domains.set(domain);
 }
 
-void ConnectionFromClient::monitor_domain(String const& domain)
+void ConnectionFromClient::monitor_domain(DeprecatedString const& domain)
 {
     if (m_has_pledged && !m_pledged_domains.contains(domain)) {
         did_misbehave("Attempt to monitor non-pledged domain");
@@ -109,13 +109,13 @@ void ConnectionFromClient::monitor_domain(String const& domain)
     m_monitored_domains.set(domain);
 }
 
-bool ConnectionFromClient::validate_access(String const& domain, String const& group, String const& key)
+bool ConnectionFromClient::validate_access(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
 {
     if (!m_has_pledged)
         return true;
     if (m_pledged_domains.contains(domain))
         return true;
-    did_misbehave(String::formatted("Blocked attempt to access domain '{}', group={}, key={}", domain, group, key).characters());
+    did_misbehave(DeprecatedString::formatted("Blocked attempt to access domain '{}', group={}, key={}", domain, group, key).characters());
     return false;
 }
 
@@ -135,34 +135,34 @@ void ConnectionFromClient::sync_dirty_domains_to_disk()
     }
 }
 
-Messages::ConfigServer::ListConfigKeysResponse ConnectionFromClient::list_config_keys(String const& domain, String const& group)
+Messages::ConfigServer::ListConfigKeysResponse ConnectionFromClient::list_config_keys(DeprecatedString const& domain, DeprecatedString const& group)
 {
     if (!validate_access(domain, group, ""))
-        return Vector<String> {};
+        return Vector<DeprecatedString> {};
     auto& config = ensure_domain_config(domain);
     return { config.keys(group) };
 }
 
-Messages::ConfigServer::ListConfigGroupsResponse ConnectionFromClient::list_config_groups(String const& domain)
+Messages::ConfigServer::ListConfigGroupsResponse ConnectionFromClient::list_config_groups(DeprecatedString const& domain)
 {
     if (!validate_access(domain, "", ""))
-        return Vector<String> {};
+        return Vector<DeprecatedString> {};
     auto& config = ensure_domain_config(domain);
     return { config.groups() };
 }
 
-Messages::ConfigServer::ReadStringValueResponse ConnectionFromClient::read_string_value(String const& domain, String const& group, String const& key)
+Messages::ConfigServer::ReadStringValueResponse ConnectionFromClient::read_string_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
 {
     if (!validate_access(domain, group, key))
         return nullptr;
 
     auto& config = ensure_domain_config(domain);
     if (!config.has_key(group, key))
-        return Optional<String> {};
-    return Optional<String> { config.read_entry(group, key) };
+        return Optional<DeprecatedString> {};
+    return Optional<DeprecatedString> { config.read_entry(group, key) };
 }
 
-Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_value(String const& domain, String const& group, String const& key)
+Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
 {
     if (!validate_access(domain, group, key))
         return nullptr;
@@ -173,7 +173,7 @@ Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_valu
     return Optional<i32> { config.read_num_entry(group, key) };
 }
 
-Messages::ConfigServer::ReadBoolValueResponse ConnectionFromClient::read_bool_value(String const& domain, String const& group, String const& key)
+Messages::ConfigServer::ReadBoolValueResponse ConnectionFromClient::read_bool_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
 {
     if (!validate_access(domain, group, key))
         return nullptr;
@@ -192,7 +192,7 @@ void ConnectionFromClient::start_or_restart_sync_timer()
         m_sync_timer->start();
 }
 
-void ConnectionFromClient::write_string_value(String const& domain, String const& group, String const& key, String const& value)
+void ConnectionFromClient::write_string_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, DeprecatedString const& value)
 {
     if (!validate_access(domain, group, key))
         return;
@@ -211,7 +211,7 @@ void ConnectionFromClient::write_string_value(String const& domain, String const
     });
 }
 
-void ConnectionFromClient::write_i32_value(String const& domain, String const& group, String const& key, i32 value)
+void ConnectionFromClient::write_i32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, i32 value)
 {
     if (!validate_access(domain, group, key))
         return;
@@ -230,7 +230,7 @@ void ConnectionFromClient::write_i32_value(String const& domain, String const& g
     });
 }
 
-void ConnectionFromClient::write_bool_value(String const& domain, String const& group, String const& key, bool value)
+void ConnectionFromClient::write_bool_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, bool value)
 {
     if (!validate_access(domain, group, key))
         return;
@@ -249,7 +249,7 @@ void ConnectionFromClient::write_bool_value(String const& domain, String const&
     });
 }
 
-void ConnectionFromClient::remove_key_entry(String const& domain, String const& group, String const& key)
+void ConnectionFromClient::remove_key_entry(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
 {
     if (!validate_access(domain, group, key))
         return;
@@ -267,7 +267,7 @@ void ConnectionFromClient::remove_key_entry(String const& domain, String const&
     });
 }
 
-void ConnectionFromClient::remove_group_entry(String const& domain, String const& group)
+void ConnectionFromClient::remove_group_entry(DeprecatedString const& domain, DeprecatedString const& group)
 {
     if (!validate_access(domain, group, {}))
         return;
@@ -285,7 +285,7 @@ void ConnectionFromClient::remove_group_entry(String const& domain, String const
     });
 }
 
-void ConnectionFromClient::add_group_entry(String const& domain, String const& group)
+void ConnectionFromClient::add_group_entry(DeprecatedString const& domain, DeprecatedString const& group)
 {
     if (!validate_access(domain, group, {}))
         return;
diff --git a/Userland/Services/ConfigServer/ConnectionFromClient.h b/Userland/Services/ConfigServer/ConnectionFromClient.h
index a5ca6a5762..c500ce3ccd 100644
--- a/Userland/Services/ConfigServer/ConnectionFromClient.h
+++ b/Userland/Services/ConfigServer/ConnectionFromClient.h
@@ -20,36 +20,36 @@ public:
 
     virtual void die() override;
 
-    bool is_monitoring_domain(String const& domain) const { return m_monitored_domains.contains(domain); }
+    bool is_monitoring_domain(DeprecatedString const& domain) const { return m_monitored_domains.contains(domain); }
 
 private:
     explicit ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>, int client_id);
 
-    virtual void pledge_domains(Vector<String> const&) override;
-    virtual void monitor_domain(String const&) override;
-    virtual Messages::ConfigServer::ListConfigGroupsResponse list_config_groups([[maybe_unused]] String const& domain) override;
-    virtual Messages::ConfigServer::ListConfigKeysResponse list_config_keys([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group) override;
-    virtual Messages::ConfigServer::ReadStringValueResponse read_string_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
-    virtual Messages::ConfigServer::ReadI32ValueResponse read_i32_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
-    virtual Messages::ConfigServer::ReadBoolValueResponse read_bool_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
-    virtual void write_string_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] String const& value) override;
-    virtual void write_i32_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] i32 value) override;
-    virtual void write_bool_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] bool value) override;
-    virtual void remove_key_entry([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
-    virtual void remove_group_entry([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group) override;
-    virtual void add_group_entry([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group) override;
-
-    bool validate_access(String const& domain, String const& group, String const& key);
+    virtual void pledge_domains(Vector<DeprecatedString> const&) override;
+    virtual void monitor_domain(DeprecatedString const&) override;
+    virtual Messages::ConfigServer::ListConfigGroupsResponse list_config_groups([[maybe_unused]] DeprecatedString const& domain) override;
+    virtual Messages::ConfigServer::ListConfigKeysResponse list_config_keys([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
+    virtual Messages::ConfigServer::ReadStringValueResponse read_string_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
+    virtual Messages::ConfigServer::ReadI32ValueResponse read_i32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
+    virtual Messages::ConfigServer::ReadBoolValueResponse read_bool_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
+    virtual void write_string_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] DeprecatedString const& value) override;
+    virtual void write_i32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] i32 value) override;
+    virtual void write_bool_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] bool value) override;
+    virtual void remove_key_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
+    virtual void remove_group_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
+    virtual void add_group_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
+
+    bool validate_access(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key);
     void sync_dirty_domains_to_disk();
     void start_or_restart_sync_timer();
 
     bool m_has_pledged { false };
-    HashTable<String> m_pledged_domains;
+    HashTable<DeprecatedString> m_pledged_domains;
 
-    HashTable<String> m_monitored_domains;
+    HashTable<DeprecatedString> m_monitored_domains;
 
     NonnullRefPtr<Core::Timer> m_sync_timer;
-    HashTable<String> m_dirty_domains;
+    HashTable<DeprecatedString> m_dirty_domains;
 };
 
 }