RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

Hearts: Use LibConfig instead of Core::ConfigFile

Browse source
This commit is contained in:
Mustafa Quraish 2021-08-27 09:09:19 -04:00 • committed by Andreas Kling
parent 3edeb9b7e7
commit 0af3855fb9
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Games/Hearts/CMakeLists.txt
View file

@ -17,4 +17,4 @@ set(SOURCES
) )
serenity_app(Hearts ICON app-hearts) serenity_app(Hearts ICON app-hearts)
target_link_libraries(Hearts LibCards LibGUI LibGfx LibCore) target_link_libraries(Hearts LibCards LibGUI LibGfx LibCore LibConfig)

20
Userland/Games/Hearts/main.cpp
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2020, Till Mayer <till.mayer@web.de> * Copyright (c) 2020, Till Mayer <till.mayer@web.de>
* Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org> * Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,7 +9,7 @@
#include "Game.h" #include "Game.h"
#include "SettingsDialog.h" #include "SettingsDialog.h"
#include <Games/Hearts/HeartsGML.h> #include <Games/Hearts/HeartsGML.h>
#include <LibCore/ConfigFile.h> #include <LibConfig/Client.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
@ -26,7 +27,8 @@ 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::open_for_app("Hearts", Core::ConfigFile::AllowWriting::Yes);
Config::pledge_domains("Hearts");
if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) { if (pledge("stdio recvfd sendfd rpath wpath cpath", nullptr) < 0) {
perror("pledge"); perror("pledge");
@ -38,11 +40,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
if (unveil(config->filename().characters(), "crw") < 0) {
perror("unveil");
return 1;
}
if (unveil(nullptr, nullptr) < 0) { if (unveil(nullptr, nullptr) < 0) {
perror("unveil"); perror("unveil");
return 1; return 1;
@ -60,7 +57,7 @@ int main(int argc, char** argv)
auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar"); auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
statusbar.set_text(0, "Score: 0"); statusbar.set_text(0, "Score: 0");
String player_name = config->read_entry("", "player_name", "Gunnar"); String player_name = Config::read_string("Hearts", "", "player_name", "Gunnar");
game.on_status_change = [&](const AK::StringView& status) { game.on_status_change = [&](const AK::StringView& status) {
statusbar.set_override_text(status); statusbar.set_override_text(status);
@ -84,12 +81,7 @@ int main(int argc, char** argv)
player_name = settings_dialog->player_name(); player_name = settings_dialog->player_name();
config->write_entry("", "player_name", player_name); Config::write_string("Hearts", "", "player_name", player_name);
if (!config->sync()) {
GUI::MessageBox::show(window, "Settings could not be saved!", "Error", GUI::MessageBox::Type::Error);
return;
}
GUI::MessageBox::show(window, "Settings have been successfully saved and will take effect in the next game.", "Settings Changed Successfully", GUI::MessageBox::Type::Information); GUI::MessageBox::show(window, "Settings have been successfully saved and will take effect in the next game.", "Settings Changed Successfully", GUI::MessageBox::Type::Information);
}; };