RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 14:47:46 +00:00
Code Issues Activity Actions

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

Browse source 
This patch brings the ConfigFile helpers for opening lib, app and system
configs more inline with the regular ConfigFile::open functions.
This commit is contained in:
networkException 2021-08-21 16:33:54 +02:00 • committed by Andreas Kling
parent 938051feb8
commit acde7d12b0
37 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/Browser/BrowserWindow.cpp
View file

@ -277,7 +277,7 @@ void BrowserWindow::build_menus()
m_change_homepage_action = GUI::Action::create(
"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");
if (GUI::InputBox::show(this, homepage_url, "Enter URL", "Change homepage URL") == GUI::InputBox::ExecOK) {
if (URL(homepage_url).is_valid()) {
@ -300,7 +300,7 @@ void BrowserWindow::build_menus()
auto action = GUI::Action::create_checkable(
name, [&](auto&) {
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);
},
this);
@ -317,7 +317,7 @@ void BrowserWindow::build_menus()
m_disable_search_engine_action = GUI::Action::create_checkable(
"Disable", [](auto&) {
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);
},
this);
@ -347,7 +347,7 @@ void BrowserWindow::build_menus()
}
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);
action.set_status_tip(search_engine);
});

4
Userland/Applications/Browser/DownloadWidget.cpp
View file

@ -36,7 +36,7 @@ DownloadWidget::DownloadWidget(const URL& url)
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);
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->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);
};

2
Userland/Applications/Browser/main.cpp
View file

@ -103,7 +103,7 @@ int main(int argc, char** argv)
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_search_engine = m_config->read_entry("Preferences", "SearchEngine", {});

4
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
View file

@ -86,7 +86,7 @@ void BackgroundSettingsWidget::create_frame()
void BackgroundSettingsWidget::load_current_settings()
{
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", "");
if (!selected_wallpaper.is_empty()) {
@ -118,7 +118,7 @@ void BackgroundSettingsWidget::load_current_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());
if (!m_monitor_widget->wallpaper().is_empty()) {

4
Userland/Applications/FileManager/main.cpp
View file

@ -75,7 +75,7 @@ int main(int argc, char** argv)
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;
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", "");
if (!selected_wallpaper.is_empty()) {
GUI::Desktop::the().set_wallpaper(selected_wallpaper, false);

2
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -35,7 +35,7 @@ HexEditorWidget::HexEditorWidget()
{
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_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");

2
Userland/Applications/IRCClient/IRCClient.cpp
View file

@ -47,7 +47,7 @@ IRCClient::IRCClient(String server, int port)
: m_nickname("seren1ty")
, m_client_window_list_model(IRCWindowListModel::create(*this))
, 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());
m_socket = Core::TCPSocket::construct(this);

2
Userland/Applications/KeyboardSettings/main.cpp
View file

@ -38,7 +38,7 @@ int main(int argc, char** argv)
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) {
perror("unveil");
return 1;

2
Userland/Applications/Mail/MailWidget.cpp
View file

@ -100,7 +100,7 @@ MailWidget::~MailWidget()
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", {});

2
Userland/Applications/MailSettings/MailSettingsWindow.cpp
View file

@ -43,7 +43,7 @@ void MailSettingsWindow::write_values()
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) {
perror("unveil");
GUI::Application::the()->quit();

2
Userland/Applications/Terminal/main.cpp
View file

@ -291,7 +291,7 @@ int main(int argc, char** argv)
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());
int ptm_fd;

2
Userland/Applications/TextEditor/MainWidget.cpp
View file

@ -47,7 +47,7 @@ MainWidget::MainWidget()
{
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_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");