From 943ecaede62065a2b64f537a9de58944db92df21 Mon Sep 17 00:00:00 2001
From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Date: Sun, 14 May 2023 23:04:47 +0200
Subject: [PATCH] LibIPC: Remove redundant IPC::Dictionary type

We already have and use HashMap<DeprecatedString, DeprecatedString>
nearly everywhere, which is essentially equivalent.
---
 .../Tools/CodeGenerators/IPCCompiler/main.cpp |  1 -
 Userland/Libraries/LibIPC/Decoder.cpp         | 16 ------
 Userland/Libraries/LibIPC/Decoder.h           |  3 -
 Userland/Libraries/LibIPC/Dictionary.h        | 55 -------------------
 Userland/Libraries/LibIPC/Encoder.cpp         | 15 -----
 Userland/Libraries/LibIPC/Encoder.h           |  3 -
 Userland/Libraries/LibIPC/Forward.h           |  1 -
 7 files changed, 94 deletions(-)
 delete mode 100644 Userland/Libraries/LibIPC/Dictionary.h

diff --git a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
index 03dba12c79..2a4781a015 100644
--- a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
@@ -779,7 +779,6 @@ void build(StringBuilder& builder, Vector<Endpoint> const& endpoints)
 #include <AK/Utf8View.h>
 #include <LibIPC/Connection.h>
 #include <LibIPC/Decoder.h>
-#include <LibIPC/Dictionary.h>
 #include <LibIPC/Encoder.h>
 #include <LibIPC/File.h>
 #include <LibIPC/Message.h>
diff --git a/Userland/Libraries/LibIPC/Decoder.cpp b/Userland/Libraries/LibIPC/Decoder.cpp
index ea9870b812..fccfa96045 100644
--- a/Userland/Libraries/LibIPC/Decoder.cpp
+++ b/Userland/Libraries/LibIPC/Decoder.cpp
@@ -13,7 +13,6 @@
 #include <LibCore/Proxy.h>
 #include <LibCore/Socket.h>
 #include <LibIPC/Decoder.h>
-#include <LibIPC/Dictionary.h>
 #include <LibIPC/File.h>
 #include <fcntl.h>
 
@@ -84,21 +83,6 @@ ErrorOr<URL> decode(Decoder& decoder)
     return URL { url };
 }
 
-template<>
-ErrorOr<Dictionary> decode(Decoder& decoder)
-{
-    auto size = TRY(decoder.decode_size());
-    Dictionary dictionary {};
-
-    for (size_t i = 0; i < size; ++i) {
-        auto key = TRY(decoder.decode<DeprecatedString>());
-        auto value = TRY(decoder.decode<DeprecatedString>());
-        dictionary.add(move(key), move(value));
-    }
-
-    return dictionary;
-}
-
 template<>
 ErrorOr<File> decode(Decoder& decoder)
 {
diff --git a/Userland/Libraries/LibIPC/Decoder.h b/Userland/Libraries/LibIPC/Decoder.h
index 512a1bf2b7..f81c41fce7 100644
--- a/Userland/Libraries/LibIPC/Decoder.h
+++ b/Userland/Libraries/LibIPC/Decoder.h
@@ -99,9 +99,6 @@ ErrorOr<Time> decode(Decoder&);
 template<>
 ErrorOr<URL> decode(Decoder&);
 
-template<>
-ErrorOr<Dictionary> decode(Decoder&);
-
 template<>
 ErrorOr<File> decode(Decoder&);
 
diff --git a/Userland/Libraries/LibIPC/Dictionary.h b/Userland/Libraries/LibIPC/Dictionary.h
deleted file mode 100644
index c653c56dbb..0000000000
--- a/Userland/Libraries/LibIPC/Dictionary.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
- * Copyright (c) 2022, the SerenityOS developers.
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <AK/Concepts.h>
-#include <AK/DeprecatedString.h>
-#include <AK/HashMap.h>
-
-namespace IPC {
-
-class Dictionary {
-public:
-    Dictionary() = default;
-
-    Dictionary(HashMap<DeprecatedString, DeprecatedString>&& initial_entries)
-        : m_entries(move(initial_entries))
-    {
-    }
-
-    bool is_empty() const { return m_entries.is_empty(); }
-    size_t size() const { return m_entries.size(); }
-
-    void add(DeprecatedString key, DeprecatedString value)
-    {
-        m_entries.set(move(key), move(value));
-    }
-
-    template<typename Callback>
-    void for_each_entry(Callback callback) const
-    {
-        for (auto& it : m_entries) {
-            callback(it.key, it.value);
-        }
-    }
-
-    template<FallibleFunction<DeprecatedString const&, DeprecatedString const&> Callback>
-    ErrorOr<void> try_for_each_entry(Callback&& callback) const
-    {
-        for (auto const& it : m_entries)
-            TRY(callback(it.key, it.value));
-        return {};
-    }
-
-    HashMap<DeprecatedString, DeprecatedString> const& entries() const { return m_entries; }
-
-private:
-    HashMap<DeprecatedString, DeprecatedString> m_entries;
-};
-
-}
diff --git a/Userland/Libraries/LibIPC/Encoder.cpp b/Userland/Libraries/LibIPC/Encoder.cpp
index d359507e2a..351b7a9c03 100644
--- a/Userland/Libraries/LibIPC/Encoder.cpp
+++ b/Userland/Libraries/LibIPC/Encoder.cpp
@@ -19,7 +19,6 @@
 #include <LibCore/DateTime.h>
 #include <LibCore/Proxy.h>
 #include <LibCore/System.h>
-#include <LibIPC/Dictionary.h>
 #include <LibIPC/Encoder.h>
 #include <LibIPC/File.h>
 
@@ -97,20 +96,6 @@ ErrorOr<void> encode(Encoder& encoder, URL const& value)
     return encoder.encode(value.to_deprecated_string());
 }
 
-template<>
-ErrorOr<void> encode(Encoder& encoder, Dictionary const& dictionary)
-{
-    TRY(encoder.encode_size(dictionary.size()));
-
-    TRY(dictionary.try_for_each_entry([&](auto const& key, auto const& value) -> ErrorOr<void> {
-        TRY(encoder.encode(key));
-        TRY(encoder.encode(value));
-        return {};
-    }));
-
-    return {};
-}
-
 template<>
 ErrorOr<void> encode(Encoder& encoder, File const& file)
 {
diff --git a/Userland/Libraries/LibIPC/Encoder.h b/Userland/Libraries/LibIPC/Encoder.h
index 6e90c54390..61d9a7d452 100644
--- a/Userland/Libraries/LibIPC/Encoder.h
+++ b/Userland/Libraries/LibIPC/Encoder.h
@@ -128,9 +128,6 @@ ErrorOr<void> encode(Encoder&, Time const&);
 template<>
 ErrorOr<void> encode(Encoder&, URL const&);
 
-template<>
-ErrorOr<void> encode(Encoder&, Dictionary const&);
-
 template<>
 ErrorOr<void> encode(Encoder&, File const&);
 
diff --git a/Userland/Libraries/LibIPC/Forward.h b/Userland/Libraries/LibIPC/Forward.h
index c3b5d4f23a..451961bb32 100644
--- a/Userland/Libraries/LibIPC/Forward.h
+++ b/Userland/Libraries/LibIPC/Forward.h
@@ -11,7 +11,6 @@
 namespace IPC {
 
 class Decoder;
-class Dictionary;
 class Encoder;
 class Message;
 class File;