Browse Source

Everywhere: Rename get in ConfigFile::get_for_{lib,app,system} to open

This patch brings the ConfigFile helpers for opening lib, app and system
configs more inline with the regular ConfigFile::open functions.
networkException 3 years ago
parent
commit
acde7d12b0
37 changed files with 51 additions and 51 deletions
  1. 2 2
      Userland/Applets/Audio/main.cpp
  2. 4 4
      Userland/Applications/Browser/BrowserWindow.cpp
  3. 2 2
      Userland/Applications/Browser/DownloadWidget.cpp
  4. 1 1
      Userland/Applications/Browser/main.cpp
  5. 2 2
      Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
  6. 2 2
      Userland/Applications/FileManager/main.cpp
  7. 1 1
      Userland/Applications/HexEditor/HexEditorWidget.cpp
  8. 1 1
      Userland/Applications/IRCClient/IRCClient.cpp
  9. 1 1
      Userland/Applications/KeyboardSettings/main.cpp
  10. 1 1
      Userland/Applications/Mail/MailWidget.cpp
  11. 1 1
      Userland/Applications/MailSettings/MailSettingsWindow.cpp
  12. 1 1
      Userland/Applications/Terminal/main.cpp
  13. 1 1
      Userland/Applications/TextEditor/MainWidget.cpp
  14. 1 1
      Userland/DevTools/HackStudio/TerminalWrapper.cpp
  15. 1 1
      Userland/Games/2048/main.cpp
  16. 1 1
      Userland/Games/Chess/main.cpp
  17. 1 1
      Userland/Games/FlappyBug/main.cpp
  18. 1 1
      Userland/Games/Hearts/main.cpp
  19. 3 3
      Userland/Games/Minesweeper/Field.cpp
  20. 1 1
      Userland/Games/Minesweeper/main.cpp
  21. 1 1
      Userland/Games/Pong/main.cpp
  22. 2 2
      Userland/Games/Snake/SnakeGame.cpp
  23. 1 1
      Userland/Games/Snake/main.cpp
  24. 1 1
      Userland/Games/Solitaire/main.cpp
  25. 1 1
      Userland/Games/Spider/main.cpp
  26. 3 3
      Userland/Libraries/LibCore/ConfigFile.cpp
  27. 3 3
      Userland/Libraries/LibCore/ConfigFile.h
  28. 1 1
      Userland/Libraries/LibGUI/Desktop.cpp
  29. 1 1
      Userland/Libraries/LibLine/Editor.cpp
  30. 1 1
      Userland/Libraries/LibTLS/TLSv12.cpp
  31. 1 1
      Userland/Services/AudioServer/main.cpp
  32. 1 1
      Userland/Services/KeyboardPreferenceLoader/main.cpp
  33. 1 1
      Userland/Services/LaunchServer/main.cpp
  34. 1 1
      Userland/Services/LookupServer/LookupServer.cpp
  35. 1 1
      Userland/Services/SystemServer/main.cpp
  36. 1 1
      Userland/Services/Taskbar/TaskbarWindow.cpp
  37. 1 1
      Userland/Utilities/run-tests.cpp

+ 2 - 2
Userland/Applets/Audio/main.cpp

@@ -211,9 +211,9 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("AudioApplet", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("AudioApplet", Core::ConfigFile::AllowWriting::Yes);
     // To not upset the audio server state, we responsibly read this once.
     // To not upset the audio server state, we responsibly read this once.
-    auto audio_master_config = Core::ConfigFile::get_for_app("Audio");
+    auto audio_master_config = Core::ConfigFile::open_for_app("Audio");
 
 
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
 
 

+ 4 - 4
Userland/Applications/Browser/BrowserWindow.cpp

@@ -277,7 +277,7 @@ void BrowserWindow::build_menus()
 
 
     m_change_homepage_action = GUI::Action::create(
     m_change_homepage_action = GUI::Action::create(
         "Set Homepage URL", [this](auto&) {
         "Set Homepage URL", [this](auto&) {
-            auto config = Core::ConfigFile::get_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
+            auto config = Core::ConfigFile::open_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
             String homepage_url = config->read_entry("Preferences", "Home", "about:blank");
             String homepage_url = config->read_entry("Preferences", "Home", "about:blank");
             if (GUI::InputBox::show(this, homepage_url, "Enter URL", "Change homepage URL") == GUI::InputBox::ExecOK) {
             if (GUI::InputBox::show(this, homepage_url, "Enter URL", "Change homepage URL") == GUI::InputBox::ExecOK) {
                 if (URL(homepage_url).is_valid()) {
                 if (URL(homepage_url).is_valid()) {
@@ -300,7 +300,7 @@ void BrowserWindow::build_menus()
         auto action = GUI::Action::create_checkable(
         auto action = GUI::Action::create_checkable(
             name, [&](auto&) {
             name, [&](auto&) {
                 g_search_engine = url_format;
                 g_search_engine = url_format;
-                auto config = Core::ConfigFile::get_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
+                auto config = Core::ConfigFile::open_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
                 config->write_entry("Preferences", "SearchEngine", g_search_engine);
                 config->write_entry("Preferences", "SearchEngine", g_search_engine);
             },
             },
             this);
             this);
@@ -317,7 +317,7 @@ void BrowserWindow::build_menus()
     m_disable_search_engine_action = GUI::Action::create_checkable(
     m_disable_search_engine_action = GUI::Action::create_checkable(
         "Disable", [](auto&) {
         "Disable", [](auto&) {
             g_search_engine = {};
             g_search_engine = {};
-            auto config = Core::ConfigFile::get_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
+            auto config = Core::ConfigFile::open_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
             config->write_entry("Preferences", "SearchEngine", g_search_engine);
             config->write_entry("Preferences", "SearchEngine", g_search_engine);
         },
         },
         this);
         this);
@@ -347,7 +347,7 @@ void BrowserWindow::build_menus()
         }
         }
 
 
         g_search_engine = search_engine;
         g_search_engine = search_engine;
-        auto config = Core::ConfigFile::get_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
+        auto config = Core::ConfigFile::open_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
         config->write_entry("Preferences", "SearchEngine", g_search_engine);
         config->write_entry("Preferences", "SearchEngine", g_search_engine);
         action.set_status_tip(search_engine);
         action.set_status_tip(search_engine);
     });
     });

+ 2 - 2
Userland/Applications/Browser/DownloadWidget.cpp

@@ -36,7 +36,7 @@ DownloadWidget::DownloadWidget(const URL& url)
         m_destination_path = builder.to_string();
         m_destination_path = builder.to_string();
     }
     }
 
 
-    auto browser_config = Core::ConfigFile::get_for_app("Browser");
+    auto browser_config = Core::ConfigFile::open_for_app("Browser");
     auto close_on_finish = browser_config->read_bool_entry("Preferences", "CloseDownloadWidgetOnFinish", false);
     auto close_on_finish = browser_config->read_bool_entry("Preferences", "CloseDownloadWidgetOnFinish", false);
 
 
     m_elapsed_timer.start();
     m_elapsed_timer.start();
@@ -90,7 +90,7 @@ DownloadWidget::DownloadWidget(const URL& url)
     m_close_on_finish_checkbox->set_checked(close_on_finish);
     m_close_on_finish_checkbox->set_checked(close_on_finish);
 
 
     m_close_on_finish_checkbox->on_checked = [&](bool checked) {
     m_close_on_finish_checkbox->on_checked = [&](bool checked) {
-        auto browser_config = Core::ConfigFile::get_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
+        auto browser_config = Core::ConfigFile::open_for_app("Browser", Core::ConfigFile::AllowWriting::Yes);
         browser_config->write_bool_entry("Preferences", "CloseDownloadWidgetOnFinish", checked);
         browser_config->write_bool_entry("Preferences", "CloseDownloadWidgetOnFinish", checked);
     };
     };
 
 

+ 1 - 1
Userland/Applications/Browser/main.cpp

@@ -103,7 +103,7 @@ int main(int argc, char** argv)
 
 
     auto app_icon = GUI::Icon::default_icon("app-browser");
     auto app_icon = GUI::Icon::default_icon("app-browser");
 
 
-    auto m_config = Core::ConfigFile::get_for_app("Browser");
+    auto m_config = Core::ConfigFile::open_for_app("Browser");
     Browser::g_home_url = m_config->read_entry("Preferences", "Home", "about:blank");
     Browser::g_home_url = m_config->read_entry("Preferences", "Home", "about:blank");
     Browser::g_search_engine = m_config->read_entry("Preferences", "SearchEngine", {});
     Browser::g_search_engine = m_config->read_entry("Preferences", "SearchEngine", {});
 
 

+ 2 - 2
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp

@@ -86,7 +86,7 @@ void BackgroundSettingsWidget::create_frame()
 void BackgroundSettingsWidget::load_current_settings()
 void BackgroundSettingsWidget::load_current_settings()
 {
 {
     auto ws_config = Core::ConfigFile::open("/etc/WindowServer.ini");
     auto ws_config = Core::ConfigFile::open("/etc/WindowServer.ini");
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    auto wm_config = Core::ConfigFile::open_for_app("WindowManager");
 
 
     auto selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
     auto selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
     if (!selected_wallpaper.is_empty()) {
     if (!selected_wallpaper.is_empty()) {
@@ -118,7 +118,7 @@ void BackgroundSettingsWidget::load_current_settings()
 
 
 void BackgroundSettingsWidget::apply_settings()
 void BackgroundSettingsWidget::apply_settings()
 {
 {
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager", Core::ConfigFile::AllowWriting::Yes);
+    auto wm_config = Core::ConfigFile::open_for_app("WindowManager", Core::ConfigFile::AllowWriting::Yes);
     wm_config->write_entry("Background", "Wallpaper", m_monitor_widget->wallpaper());
     wm_config->write_entry("Background", "Wallpaper", m_monitor_widget->wallpaper());
 
 
     if (!m_monitor_widget->wallpaper().is_empty()) {
     if (!m_monitor_widget->wallpaper().is_empty()) {

+ 2 - 2
Userland/Applications/FileManager/main.cpp

@@ -75,7 +75,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    RefPtr<Core::ConfigFile> config = Core::ConfigFile::get_for_app("FileManager", Core::ConfigFile::AllowWriting::Yes);
+    RefPtr<Core::ConfigFile> config = Core::ConfigFile::open_for_app("FileManager", Core::ConfigFile::AllowWriting::Yes);
 
 
     Core::ArgsParser args_parser;
     Core::ArgsParser args_parser;
     bool is_desktop_mode { false }, is_selection_mode { false }, ignore_path_resolution { false };
     bool is_desktop_mode { false }, is_selection_mode { false }, ignore_path_resolution { false };
@@ -415,7 +415,7 @@ int run_in_desktop_mode([[maybe_unused]] RefPtr<Core::ConfigFile> config)
         }
         }
     };
     };
 
 
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    auto wm_config = Core::ConfigFile::open_for_app("WindowManager");
     auto selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
     auto selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
     if (!selected_wallpaper.is_empty()) {
     if (!selected_wallpaper.is_empty()) {
         GUI::Desktop::the().set_wallpaper(selected_wallpaper, false);
         GUI::Desktop::the().set_wallpaper(selected_wallpaper, false);

+ 1 - 1
Userland/Applications/HexEditor/HexEditorWidget.cpp

@@ -35,7 +35,7 @@ HexEditorWidget::HexEditorWidget()
 {
 {
     load_from_gml(hex_editor_window_gml);
     load_from_gml(hex_editor_window_gml);
 
 
-    m_config = Core::ConfigFile::get_for_app("HexEditor", Core::ConfigFile::AllowWriting::Yes);
+    m_config = Core::ConfigFile::open_for_app("HexEditor", Core::ConfigFile::AllowWriting::Yes);
 
 
     m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
     m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");

+ 1 - 1
Userland/Applications/IRCClient/IRCClient.cpp

@@ -47,7 +47,7 @@ IRCClient::IRCClient(String server, int port)
     : m_nickname("seren1ty")
     : m_nickname("seren1ty")
     , m_client_window_list_model(IRCWindowListModel::create(*this))
     , m_client_window_list_model(IRCWindowListModel::create(*this))
     , m_log(IRCLogBuffer::create())
     , m_log(IRCLogBuffer::create())
-    , m_config(Core::ConfigFile::get_for_app("IRCClient", Core::ConfigFile::AllowWriting::Yes))
+    , m_config(Core::ConfigFile::open_for_app("IRCClient", Core::ConfigFile::AllowWriting::Yes))
 {
 {
     struct passwd* user_pw = getpwuid(getuid());
     struct passwd* user_pw = getpwuid(getuid());
     m_socket = Core::TCPSocket::construct(this);
     m_socket = Core::TCPSocket::construct(this);

+ 1 - 1
Userland/Applications/KeyboardSettings/main.cpp

@@ -38,7 +38,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("KeyboardSettings", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("KeyboardSettings", Core::ConfigFile::AllowWriting::Yes);
     if (unveil(config->filename().characters(), "rwc") < 0) {
     if (unveil(config->filename().characters(), "rwc") < 0) {
         perror("unveil");
         perror("unveil");
         return 1;
         return 1;

+ 1 - 1
Userland/Applications/Mail/MailWidget.cpp

@@ -100,7 +100,7 @@ MailWidget::~MailWidget()
 
 
 bool MailWidget::connect_and_login()
 bool MailWidget::connect_and_login()
 {
 {
-    auto config = Core::ConfigFile::get_for_app("Mail");
+    auto config = Core::ConfigFile::open_for_app("Mail");
 
 
     auto server = config->read_entry("Connection", "Server", {});
     auto server = config->read_entry("Connection", "Server", {});
 
 

+ 1 - 1
Userland/Applications/MailSettings/MailSettingsWindow.cpp

@@ -43,7 +43,7 @@ void MailSettingsWindow::write_values()
 
 
 MailSettingsWindow::MailSettingsWindow()
 MailSettingsWindow::MailSettingsWindow()
 {
 {
-    m_config = Core::ConfigFile::get_for_app("Mail", Core::ConfigFile::AllowWriting::Yes);
+    m_config = Core::ConfigFile::open_for_app("Mail", Core::ConfigFile::AllowWriting::Yes);
     if (unveil(m_config->filename().characters(), "rwc") < 0) {
     if (unveil(m_config->filename().characters(), "rwc") < 0) {
         perror("unveil");
         perror("unveil");
         GUI::Application::the()->quit();
         GUI::Application::the()->quit();

+ 1 - 1
Userland/Applications/Terminal/main.cpp

@@ -291,7 +291,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    RefPtr<Core::ConfigFile> config = Core::ConfigFile::get_for_app("Terminal", Core::ConfigFile::AllowWriting::Yes);
+    RefPtr<Core::ConfigFile> config = Core::ConfigFile::open_for_app("Terminal", Core::ConfigFile::AllowWriting::Yes);
     Core::File::ensure_parent_directories(config->filename());
     Core::File::ensure_parent_directories(config->filename());
 
 
     int ptm_fd;
     int ptm_fd;

+ 1 - 1
Userland/Applications/TextEditor/MainWidget.cpp

@@ -47,7 +47,7 @@ MainWidget::MainWidget()
 {
 {
     load_from_gml(text_editor_window_gml);
     load_from_gml(text_editor_window_gml);
 
 
-    m_config = Core::ConfigFile::get_for_app("TextEditor", Core::ConfigFile::AllowWriting::Yes);
+    m_config = Core::ConfigFile::open_for_app("TextEditor", Core::ConfigFile::AllowWriting::Yes);
 
 
     m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
     m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");

+ 1 - 1
Userland/DevTools/HackStudio/TerminalWrapper.cpp

@@ -157,7 +157,7 @@ TerminalWrapper::TerminalWrapper(bool user_spawned)
 {
 {
     set_layout<GUI::VerticalBoxLayout>();
     set_layout<GUI::VerticalBoxLayout>();
 
 
-    RefPtr<Core::ConfigFile> config = Core::ConfigFile::get_for_app("Terminal");
+    RefPtr<Core::ConfigFile> config = Core::ConfigFile::open_for_app("Terminal");
     m_terminal_widget = add<VT::TerminalWidget>(-1, false, config);
     m_terminal_widget = add<VT::TerminalWidget>(-1, false, config);
 
 
     if (user_spawned)
     if (user_spawned)

+ 1 - 1
Userland/Games/2048/main.cpp

@@ -37,7 +37,7 @@ int main(int argc, char** argv)
 
 
     auto window = GUI::Window::construct();
     auto window = GUI::Window::construct();
 
 
-    auto config = Core::ConfigFile::get_for_app("2048", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("2048", Core::ConfigFile::AllowWriting::Yes);
 
 
     size_t board_size = config->read_num_entry("", "board_size", 4);
     size_t board_size = config->read_num_entry("", "board_size", 4);
     u32 target_tile = config->read_num_entry("", "target_tile", 2048);
     u32 target_tile = config->read_num_entry("", "target_tile", 2048);

+ 1 - 1
Userland/Games/Chess/main.cpp

@@ -26,7 +26,7 @@ int main(int argc, char** argv)
     auto window = GUI::Window::construct();
     auto window = GUI::Window::construct();
     auto& widget = window->set_main_widget<ChessWidget>();
     auto& widget = window->set_main_widget<ChessWidget>();
 
 
-    RefPtr<Core::ConfigFile> config = Core::ConfigFile::get_for_app("Chess", Core::ConfigFile::AllowWriting::Yes);
+    RefPtr<Core::ConfigFile> config = Core::ConfigFile::open_for_app("Chess", Core::ConfigFile::AllowWriting::Yes);
 
 
     if (pledge("stdio rpath wpath cpath recvfd sendfd thread proc exec", nullptr) < 0) {
     if (pledge("stdio rpath wpath cpath recvfd sendfd thread proc exec", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 1 - 1
Userland/Games/FlappyBug/main.cpp

@@ -22,7 +22,7 @@ int main(int argc, char** argv)
     }
     }
 
 
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
-    auto config = Core::ConfigFile::get_for_app("FlappyBug", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("FlappyBug", Core::ConfigFile::AllowWriting::Yes);
 
 
     if (pledge("stdio rpath wpath cpath recvfd sendfd", nullptr) < 0) {
     if (pledge("stdio rpath wpath cpath recvfd sendfd", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 1 - 1
Userland/Games/Hearts/main.cpp

@@ -26,7 +26,7 @@ int main(int argc, char** argv)
 {
 {
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
     auto app_icon = GUI::Icon::default_icon("app-hearts");
     auto app_icon = GUI::Icon::default_icon("app-hearts");
-    auto config = Core::ConfigFile::get_for_app("Hearts", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("Hearts", Core::ConfigFile::AllowWriting::Yes);
 
 
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 3 - 3
Userland/Games/Minesweeper/Field.cpp

@@ -137,7 +137,7 @@ Field::Field(GUI::Label& flag_label, GUI::Label& time_label, GUI::Button& face_b
     set_face(Face::Default);
     set_face(Face::Default);
 
 
     {
     {
-        auto config = Core::ConfigFile::get_for_app("Minesweeper");
+        auto config = Core::ConfigFile::open_for_app("Minesweeper");
         bool single_chording = config->read_num_entry("Minesweeper", "SingleChording", false);
         bool single_chording = config->read_num_entry("Minesweeper", "SingleChording", false);
         int mine_count = config->read_num_entry("Game", "MineCount", 10);
         int mine_count = config->read_num_entry("Game", "MineCount", 10);
         int rows = config->read_num_entry("Game", "Rows", 9);
         int rows = config->read_num_entry("Game", "Rows", 9);
@@ -488,7 +488,7 @@ void Field::set_field_size(size_t rows, size_t columns, size_t mine_count)
     if (m_rows == rows && m_columns == columns && m_mine_count == mine_count)
     if (m_rows == rows && m_columns == columns && m_mine_count == mine_count)
         return;
         return;
     {
     {
-        auto config = Core::ConfigFile::get_for_app("Minesweeper", Core::ConfigFile::AllowWriting::Yes);
+        auto config = Core::ConfigFile::open_for_app("Minesweeper", Core::ConfigFile::AllowWriting::Yes);
         config->write_num_entry("Game", "MineCount", mine_count);
         config->write_num_entry("Game", "MineCount", mine_count);
         config->write_num_entry("Game", "Rows", rows);
         config->write_num_entry("Game", "Rows", rows);
         config->write_num_entry("Game", "Columns", columns);
         config->write_num_entry("Game", "Columns", columns);
@@ -503,7 +503,7 @@ void Field::set_field_size(size_t rows, size_t columns, size_t mine_count)
 
 
 void Field::set_single_chording(bool enabled)
 void Field::set_single_chording(bool enabled)
 {
 {
-    auto config = Core::ConfigFile::get_for_app("Minesweeper", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("Minesweeper", Core::ConfigFile::AllowWriting::Yes);
     m_single_chording = enabled;
     m_single_chording = enabled;
     config->write_bool_entry("Minesweeper", "SingleChording", m_single_chording);
     config->write_bool_entry("Minesweeper", "SingleChording", m_single_chording);
 }
 }

+ 1 - 1
Userland/Games/Minesweeper/main.cpp

@@ -33,7 +33,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("Minesweeper");
+    auto config = Core::ConfigFile::open_for_app("Minesweeper");
 
 
     if (unveil("/res", "r") < 0) {
     if (unveil("/res", "r") < 0) {
         perror("unveil");
         perror("unveil");

+ 1 - 1
Userland/Games/Pong/main.cpp

@@ -28,7 +28,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("Pong");
+    auto config = Core::ConfigFile::open_for_app("Pong");
 
 
     if (unveil("/res", "r") < 0) {
     if (unveil("/res", "r") < 0) {
         perror("unveil");
         perror("unveil");

+ 2 - 2
Userland/Games/Snake/SnakeGame.cpp

@@ -23,7 +23,7 @@ SnakeGame::SnakeGame()
     srand(time(nullptr));
     srand(time(nullptr));
     reset();
     reset();
 
 
-    auto config = Core::ConfigFile::get_for_app("Snake");
+    auto config = Core::ConfigFile::open_for_app("Snake");
     m_high_score = config->read_num_entry("Snake", "HighScore", 0);
     m_high_score = config->read_num_entry("Snake", "HighScore", 0);
     m_high_score_text = String::formatted("Best: {}", m_high_score);
     m_high_score_text = String::formatted("Best: {}", m_high_score);
 }
 }
@@ -131,7 +131,7 @@ void SnakeGame::timer_event(Core::TimerEvent&)
             m_high_score = m_score;
             m_high_score = m_score;
             m_high_score_text = String::formatted("Best: {}", m_high_score);
             m_high_score_text = String::formatted("Best: {}", m_high_score);
             update(high_score_rect());
             update(high_score_rect());
-            auto config = Core::ConfigFile::get_for_app("Snake", Core::ConfigFile::AllowWriting::Yes);
+            auto config = Core::ConfigFile::open_for_app("Snake", Core::ConfigFile::AllowWriting::Yes);
             config->write_num_entry("Snake", "HighScore", m_high_score);
             config->write_num_entry("Snake", "HighScore", m_high_score);
         }
         }
         update(score_rect());
         update(score_rect());

+ 1 - 1
Userland/Games/Snake/main.cpp

@@ -31,7 +31,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("Snake");
+    auto config = Core::ConfigFile::open_for_app("Snake");
 
 
     if (unveil("/res", "r") < 0) {
     if (unveil("/res", "r") < 0) {
         perror("unveil");
         perror("unveil");

+ 1 - 1
Userland/Games/Solitaire/main.cpp

@@ -24,7 +24,7 @@ int main(int argc, char** argv)
 {
 {
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
     auto app_icon = GUI::Icon::default_icon("app-solitaire");
     auto app_icon = GUI::Icon::default_icon("app-solitaire");
-    auto config = Core::ConfigFile::get_for_app("Solitaire", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("Solitaire", Core::ConfigFile::AllowWriting::Yes);
 
 
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 1 - 1
Userland/Games/Spider/main.cpp

@@ -39,7 +39,7 @@ int main(int argc, char** argv)
 {
 {
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
     auto app_icon = GUI::Icon::default_icon("app-spider");
     auto app_icon = GUI::Icon::default_icon("app-spider");
-    auto config = Core::ConfigFile::get_for_app("Spider", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("Spider", Core::ConfigFile::AllowWriting::Yes);
 
 
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
     if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 3 - 3
Userland/Libraries/LibCore/ConfigFile.cpp

@@ -14,7 +14,7 @@
 
 
 namespace Core {
 namespace Core {
 
 
-NonnullRefPtr<ConfigFile> ConfigFile::get_for_lib(String const& lib_name, AllowWriting allow_altering)
+NonnullRefPtr<ConfigFile> ConfigFile::open_for_lib(String const& lib_name, AllowWriting allow_altering)
 {
 {
     String directory = StandardPaths::config_directory();
     String directory = StandardPaths::config_directory();
     auto path = String::formatted("{}/lib/{}.ini", directory, lib_name);
     auto path = String::formatted("{}/lib/{}.ini", directory, lib_name);
@@ -22,14 +22,14 @@ NonnullRefPtr<ConfigFile> ConfigFile::get_for_lib(String const& lib_name, AllowW
     return adopt_ref(*new ConfigFile(path, allow_altering));
     return adopt_ref(*new ConfigFile(path, allow_altering));
 }
 }
 
 
-NonnullRefPtr<ConfigFile> ConfigFile::get_for_app(String const& app_name, AllowWriting allow_altering)
+NonnullRefPtr<ConfigFile> ConfigFile::open_for_app(String const& app_name, AllowWriting allow_altering)
 {
 {
     String directory = StandardPaths::config_directory();
     String directory = StandardPaths::config_directory();
     auto path = String::formatted("{}/{}.ini", directory, app_name);
     auto path = String::formatted("{}/{}.ini", directory, app_name);
     return adopt_ref(*new ConfigFile(path, allow_altering));
     return adopt_ref(*new ConfigFile(path, allow_altering));
 }
 }
 
 
-NonnullRefPtr<ConfigFile> ConfigFile::get_for_system(String const& app_name, AllowWriting allow_altering)
+NonnullRefPtr<ConfigFile> ConfigFile::open_for_system(String const& app_name, AllowWriting allow_altering)
 {
 {
     auto path = String::formatted("/etc/{}.ini", app_name);
     auto path = String::formatted("/etc/{}.ini", app_name);
     return adopt_ref(*new ConfigFile(path, allow_altering));
     return adopt_ref(*new ConfigFile(path, allow_altering));

+ 3 - 3
Userland/Libraries/LibCore/ConfigFile.h

@@ -24,9 +24,9 @@ public:
         No,
         No,
     };
     };
 
 
-    static NonnullRefPtr<ConfigFile> get_for_lib(String const& lib_name, AllowWriting = AllowWriting::No);
-    static NonnullRefPtr<ConfigFile> get_for_app(String const& app_name, AllowWriting = AllowWriting::No);
-    static NonnullRefPtr<ConfigFile> get_for_system(String const& app_name, AllowWriting = AllowWriting::No);
+    static NonnullRefPtr<ConfigFile> open_for_lib(String const& lib_name, AllowWriting = AllowWriting::No);
+    static NonnullRefPtr<ConfigFile> open_for_app(String const& app_name, AllowWriting = AllowWriting::No);
+    static NonnullRefPtr<ConfigFile> open_for_system(String const& app_name, AllowWriting = AllowWriting::No);
     static NonnullRefPtr<ConfigFile> open(String const& filename, AllowWriting = AllowWriting::No);
     static NonnullRefPtr<ConfigFile> open(String const& filename, AllowWriting = AllowWriting::No);
     static NonnullRefPtr<ConfigFile> open(String const& filename, int fd);
     static NonnullRefPtr<ConfigFile> open(String const& filename, int fd);
     ~ConfigFile();
     ~ConfigFile();

+ 1 - 1
Userland/Libraries/LibGUI/Desktop.cpp

@@ -59,7 +59,7 @@ bool Desktop::set_wallpaper(const StringView& path, bool save_config)
     auto ret_val = WindowServerConnection::the().wait_for_specific_message<Messages::WindowClient::SetWallpaperFinished>()->success();
     auto ret_val = WindowServerConnection::the().wait_for_specific_message<Messages::WindowClient::SetWallpaperFinished>()->success();
 
 
     if (ret_val && save_config) {
     if (ret_val && save_config) {
-        RefPtr<Core::ConfigFile> config = Core::ConfigFile::get_for_app("WindowManager", Core::ConfigFile::AllowWriting::Yes);
+        RefPtr<Core::ConfigFile> config = Core::ConfigFile::open_for_app("WindowManager", Core::ConfigFile::AllowWriting::Yes);
         dbgln("Saving wallpaper path '{}' to config file at {}", path, config->filename());
         dbgln("Saving wallpaper path '{}' to config file at {}", path, config->filename());
         config->write_entry("Background", "Wallpaper", path);
         config->write_entry("Background", "Wallpaper", path);
         config->sync();
         config->sync();

+ 1 - 1
Userland/Libraries/LibLine/Editor.cpp

@@ -39,7 +39,7 @@ namespace Line {
 Configuration Configuration::from_config(const StringView& libname)
 Configuration Configuration::from_config(const StringView& libname)
 {
 {
     Configuration configuration;
     Configuration configuration;
-    auto config_file = Core::ConfigFile::get_for_lib(libname);
+    auto config_file = Core::ConfigFile::open_for_lib(libname);
 
 
     // Read behaviour options.
     // Read behaviour options.
     auto refresh = config_file->read_entry("behaviour", "refresh", "lazy");
     auto refresh = config_file->read_entry("behaviour", "refresh", "lazy");

+ 1 - 1
Userland/Libraries/LibTLS/TLSv12.cpp

@@ -348,7 +348,7 @@ Singleton<DefaultRootCACertificates> DefaultRootCACertificates::s_the;
 DefaultRootCACertificates::DefaultRootCACertificates()
 DefaultRootCACertificates::DefaultRootCACertificates()
 {
 {
     // FIXME: This might not be the best format, find a better way to represent CA certificates.
     // FIXME: This might not be the best format, find a better way to represent CA certificates.
-    auto config = Core::ConfigFile::get_for_system("ca_certs");
+    auto config = Core::ConfigFile::open_for_system("ca_certs");
     auto now = Core::DateTime::now();
     auto now = Core::DateTime::now();
     auto last_year = Core::DateTime::create(now.year() - 1);
     auto last_year = Core::DateTime::create(now.year() - 1);
     auto next_year = Core::DateTime::create(now.year() + 1);
     auto next_year = Core::DateTime::create(now.year() + 1);

+ 1 - 1
Userland/Services/AudioServer/main.cpp

@@ -17,7 +17,7 @@ int main(int, char**)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = Core::ConfigFile::get_for_app("Audio", Core::ConfigFile::AllowWriting::Yes);
+    auto config = Core::ConfigFile::open_for_app("Audio", Core::ConfigFile::AllowWriting::Yes);
     if (unveil(config->filename().characters(), "rwc") < 0) {
     if (unveil(config->filename().characters(), "rwc") < 0) {
         perror("unveil");
         perror("unveil");
         return 1;
         return 1;

+ 1 - 1
Userland/Services/KeyboardPreferenceLoader/main.cpp

@@ -19,7 +19,7 @@ int main()
         return 1;
         return 1;
     }
     }
 
 
-    auto keyboard_settings_config = Core::ConfigFile::get_for_app("KeyboardSettings");
+    auto keyboard_settings_config = Core::ConfigFile::open_for_app("KeyboardSettings");
 
 
     if (unveil("/bin/keymap", "x") < 0) {
     if (unveil("/bin/keymap", "x") < 0) {
         perror("unveil /bin/keymap");
         perror("unveil /bin/keymap");

+ 1 - 1
Userland/Services/LaunchServer/main.cpp

@@ -20,7 +20,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
     auto launcher = LaunchServer::Launcher();
     auto launcher = LaunchServer::Launcher();
 
 
     launcher.load_handlers();
     launcher.load_handlers();
-    launcher.load_config(Core::ConfigFile::get_for_app("LaunchServer"));
+    launcher.load_config(Core::ConfigFile::open_for_app("LaunchServer"));
 
 
     if (pledge("stdio accept rpath proc exec", nullptr) < 0) {
     if (pledge("stdio accept rpath proc exec", nullptr) < 0) {
         perror("pledge");
         perror("pledge");

+ 1 - 1
Userland/Services/LookupServer/LookupServer.cpp

@@ -37,7 +37,7 @@ LookupServer::LookupServer()
     VERIFY(s_the == nullptr);
     VERIFY(s_the == nullptr);
     s_the = this;
     s_the = this;
 
 
-    auto config = Core::ConfigFile::get_for_system("LookupServer");
+    auto config = Core::ConfigFile::open_for_system("LookupServer");
     dbgln("Using network config file at {}", config->filename());
     dbgln("Using network config file at {}", config->filename());
     m_nameservers = config->read_entry("DNS", "Nameservers", "1.1.1.1,1.0.0.1").split(',');
     m_nameservers = config->read_entry("DNS", "Nameservers", "1.1.1.1,1.0.0.1").split(',');
 
 

+ 1 - 1
Userland/Services/SystemServer/main.cpp

@@ -215,7 +215,7 @@ int main(int, char**)
     // Read our config and instantiate services.
     // Read our config and instantiate services.
     // This takes care of setting up sockets.
     // This takes care of setting up sockets.
     NonnullRefPtrVector<Service> services;
     NonnullRefPtrVector<Service> services;
-    auto config = Core::ConfigFile::get_for_system("SystemServer");
+    auto config = Core::ConfigFile::open_for_system("SystemServer");
     for (auto name : config->groups()) {
     for (auto name : config->groups()) {
         auto service = Service::construct(*config, name);
         auto service = Service::construct(*config, name);
         if (service->is_enabled())
         if (service->is_enabled())

+ 1 - 1
Userland/Services/Taskbar/TaskbarWindow.cpp

@@ -116,7 +116,7 @@ void TaskbarWindow::create_quick_launch_bar()
     quick_launch_bar.layout()->set_spacing(0);
     quick_launch_bar.layout()->set_spacing(0);
     quick_launch_bar.set_frame_thickness(0);
     quick_launch_bar.set_frame_thickness(0);
 
 
-    auto config = Core::ConfigFile::get_for_app("Taskbar");
+    auto config = Core::ConfigFile::open_for_app("Taskbar");
     constexpr const char* quick_launch = "QuickLaunch";
     constexpr const char* quick_launch = "QuickLaunch";
 
 
     // FIXME: Core::ConfigFile does not keep the order of the entries.
     // FIXME: Core::ConfigFile does not keep the order of the entries.

+ 1 - 1
Userland/Utilities/run-tests.cpp

@@ -329,7 +329,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    auto config = config_file.is_empty() ? Core::ConfigFile::get_for_app("Tests") : Core::ConfigFile::open(config_file);
+    auto config = config_file.is_empty() ? Core::ConfigFile::open_for_app("Tests") : Core::ConfigFile::open(config_file);
     if (config->num_groups() == 0)
     if (config->num_groups() == 0)
         warnln("Empty configuration file ({}) loaded!", config_file.is_empty() ? "User config for Tests" : config_file.characters());
         warnln("Empty configuration file ({}) loaded!", config_file.is_empty() ? "User config for Tests" : config_file.characters());