소스 검색

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.
Sam Atkins 2 년 전
부모
커밋
83687f85df
3개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      Userland/Games/Solitaire/Game.cpp
  2. 1 1
      Userland/Libraries/LibCards/CardStack.cpp
  3. 1 1
      Userland/Libraries/LibCards/CardStack.h

+ 1 - 1
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) {

+ 1 - 1
Userland/Libraries/LibCards/CardStack.cpp

@@ -323,7 +323,7 @@ NonnullRefPtr<Card> 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();

+ 1 - 1
Userland/Libraries/LibCards/CardStack.h

@@ -45,7 +45,7 @@ public:
 
     void push(NonnullRefPtr<Card> card);
     NonnullRefPtr<Card> 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;