From db858e31408d5e809ac53db94b937728b54ca82f Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Mon, 25 Nov 2024 22:30:05 -0800
Subject: [PATCH] refactor to use lambda

---
 cockatrice/src/game/cards/card_list.cpp | 20 ++++----------------
 cockatrice/src/game/cards/card_list.h   |  3 ---
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/cockatrice/src/game/cards/card_list.cpp b/cockatrice/src/game/cards/card_list.cpp
index 828aa4a95..f35a0d842 100644
--- a/cockatrice/src/game/cards/card_list.cpp
+++ b/cockatrice/src/game/cards/card_list.cpp
@@ -31,17 +31,9 @@ CardItem *CardList::findCard(const int cardId) const
     return nullptr;
 }
 
-class CardList::compareFunctor
+void CardList::sort(int flags)
 {
-private:
-    int flags;
-
-public:
-    explicit compareFunctor(int _flags) : flags(_flags)
-    {
-    }
-    inline bool operator()(CardItem *a, CardItem *b) const
-    {
+    auto comparator = [flags](CardItem *a, CardItem *b) {
         if (flags & SortByType) {
             QString t1 = a->getInfo() ? a->getInfo()->getMainCardType() : QString();
             QString t2 = b->getInfo() ? b->getInfo()->getMainCardType() : QString();
@@ -50,11 +42,7 @@ public:
             return t1 < t2;
         } else
             return a->getName() < b->getName();
-    }
-};
+    };
 
-void CardList::sort(int flags)
-{
-    compareFunctor cf(flags);
-    std::sort(begin(), end(), cf);
+    std::sort(begin(), end(), comparator);
 }
diff --git a/cockatrice/src/game/cards/card_list.h b/cockatrice/src/game/cards/card_list.h
index 9d72aeaf2..d48e4c3d2 100644
--- a/cockatrice/src/game/cards/card_list.h
+++ b/cockatrice/src/game/cards/card_list.h
@@ -7,9 +7,6 @@ class CardItem;
 
 class CardList : public QList<CardItem *>
 {
-private:
-    class compareFunctor;
-
 protected:
     bool contentsKnown;