From 83687f85df7fd1b454fecee27699c445568b18f3 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Sun, 22 Jan 2023 21:27:23 +0000 Subject: [PATCH] LibCards+Solitaire: Rename `CardStack::move_to_stack()` -> `take_all()` `a.move_to_stack(b)` sounded too much like it moves a's cards to b, when it actually moves b's cards to a. --- Userland/Games/Solitaire/Game.cpp | 2 +- Userland/Libraries/LibCards/CardStack.cpp | 2 +- Userland/Libraries/LibCards/CardStack.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Games/Solitaire/Game.cpp b/Userland/Games/Solitaire/Game.cpp index 9a3cadfe88..8028d22558 100644 --- a/Userland/Games/Solitaire/Game.cpp +++ b/Userland/Games/Solitaire/Game.cpp @@ -424,7 +424,7 @@ void Game::draw_cards() update(stock.bounding_box()); } else { auto play_bounding_box = play.bounding_box(); - play.move_to_stack(waste); + play.take_all(waste); size_t cards_to_draw = 0; switch (m_mode) { diff --git a/Userland/Libraries/LibCards/CardStack.cpp b/Userland/Libraries/LibCards/CardStack.cpp index 8c4a9ff0d4..acb2a732ee 100644 --- a/Userland/Libraries/LibCards/CardStack.cpp +++ b/Userland/Libraries/LibCards/CardStack.cpp @@ -323,7 +323,7 @@ NonnullRefPtr CardStack::pop() return card; } -void CardStack::move_to_stack(CardStack& stack) +void CardStack::take_all(CardStack& stack) { while (!m_stack.is_empty()) { auto card = m_stack.take_first(); diff --git a/Userland/Libraries/LibCards/CardStack.h b/Userland/Libraries/LibCards/CardStack.h index d27e03c9cd..276b17835f 100644 --- a/Userland/Libraries/LibCards/CardStack.h +++ b/Userland/Libraries/LibCards/CardStack.h @@ -45,7 +45,7 @@ public: void push(NonnullRefPtr card); NonnullRefPtr pop(); - void move_to_stack(CardStack&); + void take_all(CardStack&); void rebound_cards(); bool is_allowed_to_push(Card const&, size_t stack_size = 1, MovementRule movement_rule = MovementRule::Alternating) const;