diff options
author | FrHun <28605587+frhun@users.noreply.github.com> | 2022-06-12 22:35:17 +0200 |
---|---|---|
committer | Sam Atkins <atkinssj@gmail.com> | 2022-06-28 17:52:42 +0100 |
commit | 8dd08d47f1ebf7f248be27279d6b3a68e4c3f9a1 (patch) | |
tree | e3b923bcf570a704dff7ed10bbede69b6e11c1ee /Userland/Games | |
parent | ec1e25929e79b34f2f602560280fe5f399bcc5d6 (diff) | |
download | serenity-8dd08d47f1ebf7f248be27279d6b3a68e4c3f9a1.zip |
Applications: Remove usages of deprecated implicit conversions
These deprecated conversions are currently in place to make the system
compile, but they are to be removed soon. This prepares that.
Diffstat (limited to 'Userland/Games')
-rw-r--r-- | Userland/Games/Hearts/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Games/Minesweeper/Field.cpp | 2 | ||||
-rw-r--r-- | Userland/Games/Minesweeper/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Games/Solitaire/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Games/Spider/main.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp index 3ce2a8c0a4..b73081f1bb 100644 --- a/Userland/Games/Hearts/main.cpp +++ b/Userland/Games/Hearts/main.cpp @@ -104,7 +104,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Hearts", app_icon, window))); window->set_resizable(false); - window->resize(Hearts::Game::width, Hearts::Game::height + statusbar.max_height()); + window->resize(Hearts::Game::width, Hearts::Game::height + statusbar.max_height().as_int()); window->set_icon(app_icon.bitmap_for_size(16)); window->show(); game.setup(player_name); diff --git a/Userland/Games/Minesweeper/Field.cpp b/Userland/Games/Minesweeper/Field.cpp index 09bf9dc394..df88e1e0a3 100644 --- a/Userland/Games/Minesweeper/Field.cpp +++ b/Userland/Games/Minesweeper/Field.cpp @@ -518,7 +518,7 @@ void Field::set_field_size(Difficulty difficulty, size_t rows, size_t columns, s m_mine_count = mine_count; set_fixed_size(frame_thickness() * 2 + m_columns * square_size(), frame_thickness() * 2 + m_rows * square_size()); reset(); - m_on_size_changed(min_size()); + m_on_size_changed(Gfx::IntSize(min_size())); } void Field::set_single_chording(bool enabled) diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index 94a90595fd..78e786eddf 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -90,7 +90,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) container->layout()->add_spacer(); auto field = TRY(widget->try_add<Field>(flag_label, time_label, face_button, [&](auto size) { - size.set_height(size.height() + container->min_size().height()); + size.set_height(size.height() + container->min_size().height().as_int()); window->resize(size); })); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index a900574f74..663869ee8b 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -206,7 +206,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window))); window->set_resizable(false); - window->resize(Solitaire::Game::width, Solitaire::Game::height + statusbar.max_height()); + window->resize(Solitaire::Game::width, Solitaire::Game::height + statusbar.max_height().as_int()); window->set_icon(app_icon.bitmap_for_size(16)); window->show(); diff --git a/Userland/Games/Spider/main.cpp b/Userland/Games/Spider/main.cpp index db67616b80..00db82211f 100644 --- a/Userland/Games/Spider/main.cpp +++ b/Userland/Games/Spider/main.cpp @@ -268,7 +268,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) help_menu->add_action(GUI::CommonActions::make_about_action("Spider", app_icon, window)); window->set_resizable(false); - window->resize(Spider::Game::width, Spider::Game::height + statusbar.max_height()); + window->resize(Spider::Game::width, Spider::Game::height + statusbar.max_height().as_int()); window->set_icon(app_icon.bitmap_for_size(16)); window->show(); |