From fdc9ff2ee707ea24a200313786d7fd1c12573c65 Mon Sep 17 00:00:00 2001
From: Mustafa Quraish <mustafaq9@gmail.com>
Date: Sun, 29 Aug 2021 10:07:33 -0400
Subject: KeyboardSettings: Use LibConfig intead of Core::ConfigFile

---
 Userland/Applications/KeyboardSettings/main.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'Userland/Applications/KeyboardSettings/main.cpp')

diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp
index 8ee5820a2b..43199b7e5d 100644
--- a/Userland/Applications/KeyboardSettings/main.cpp
+++ b/Userland/Applications/KeyboardSettings/main.cpp
@@ -6,7 +6,6 @@
 
 #include <AK/JsonObject.h>
 #include <AK/QuickSort.h>
-#include <LibCore/ConfigFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/File.h>
 #include <LibGUI/Action.h>
@@ -24,6 +23,9 @@
 #include <LibKeyboard/CharacterMap.h>
 #include <spawn.h>
 
+// Including this after to avoid LibIPC errors
+#include <LibConfig/Client.h>
+
 int main(int argc, char** argv)
 {
     if (pledge("stdio rpath cpath wpath recvfd sendfd unix proc exec", nullptr) < 0) {
@@ -32,18 +34,13 @@ int main(int argc, char** argv)
     }
 
     auto app = GUI::Application::construct(argc, argv);
+    Config::pledge_domains("KeyboardSettings");
 
     if (pledge("stdio rpath cpath wpath recvfd sendfd proc exec", nullptr) < 0) {
         perror("pledge");
         return 1;
     }
 
-    auto config = Core::ConfigFile::open_for_app("KeyboardSettings", Core::ConfigFile::AllowWriting::Yes);
-    if (unveil(config->filename().characters(), "rwc") < 0) {
-        perror("unveil");
-        return 1;
-    }
-
     if (unveil("/res", "r") < 0) {
         perror("unveil");
         return 1;
@@ -126,7 +123,7 @@ int main(int argc, char** argv)
     character_map_file_combo.set_selected_index(initial_keymap_index);
 
     auto& num_lock_checkbox = root_widget.add<GUI::CheckBox>("Enable Num Lock on login");
-    num_lock_checkbox.set_checked(config->read_bool_entry("StartupEnable", "NumLock", true));
+    num_lock_checkbox.set_checked(Config::read_bool("KeyboardSettings", "StartupEnable", "NumLock", true));
 
     root_widget.layout()->add_spacer();
 
@@ -143,8 +140,7 @@ int main(int argc, char** argv)
             exit(1);
         }
 
-        config->write_bool_entry("StartupEnable", "NumLock", num_lock_checkbox.is_checked());
-        config->sync();
+        Config::write_bool("KeyboardSettings", "StartupEnable", "NumLock", num_lock_checkbox.is_checked());
 
         if (quit)
             app->quit();
-- 
cgit v1.2.3