refactor CardList (#5197)

cockatrice/src/game/cards/card_list.cpp

@@ -9,42 +9,31 @@ CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_co
 {
 }
 
-CardItem *CardList::findCard(const int id, const bool remove, int *position)
+/**
+ * @brief Finds the CardItem with the given id in the list.
+ * If contentsKnown is false, then this just returns the first element of the list.
+ *
+ * @param cardId The id of the card to find.
+ *
+ * @returns A pointer to the CardItem, or a nullptr if not found.
+ */
+CardItem *CardList::findCard(const int cardId) const
 {
-    if (!contentsKnown) {
+    if (!contentsKnown && !empty()) {
-        if (empty())
+        return at(0);
-            return 0;
+    } else {
-        CardItem *temp = at(0);
+        for (auto *cardItem : *this) {
-        if (remove)
+            if (cardItem->getId() == cardId) {
-            removeAt(0);
+                return cardItem;
-        if (position)
-            *position = id;
-        return temp;
-    } else
-        for (int i = 0; i < size(); i++) {
-            CardItem *temp = at(i);
-            if (temp->getId() == id) {
-                if (remove)
-                    removeAt(i);
-                if (position)
-                    *position = i;
-                return temp;
             }
         }
-    return 0;
+    }
+    return nullptr;
 }
 
-class CardList::compareFunctor
+void CardList::sort(int flags)
 {
-private:
+    auto comparator = [flags](CardItem *a, CardItem *b) {
-    int flags;
-
-public:
-    explicit compareFunctor(int _flags) : flags(_flags)
-    {
-    }
-    inline bool operator()(CardItem *a, CardItem *b) const
-    {
         if (flags & SortByType) {
             QString t1 = a->getInfo() ? a->getInfo()->getMainCardType() : QString();
             QString t2 = b->getInfo() ? b->getInfo()->getMainCardType() : QString();
@@ -53,11 +42,7 @@ public:
             return t1 < t2;
         } else
             return a->getName() < b->getName();
-    }
+    };
-};
 
-void CardList::sort(int flags)
+    std::sort(begin(), end(), comparator);
-{
-    compareFunctor cf(flags);
-    std::sort(begin(), end(), cf);
 }

cockatrice/src/game/cards/card_list.h

@@ -7,9 +7,6 @@ class CardItem;
 
 class CardList : public QList<CardItem *>
 {
-private:
-    class compareFunctor;
-
 protected:
     bool contentsKnown;
 
@@ -20,7 +17,7 @@ public:
         SortByType = 2
     };
     CardList(bool _contentsKnown);
-    CardItem *findCard(const int id, const bool remove, int *position = NULL);
+    CardItem *findCard(const int cardId) const;
     bool getContentsKnown() const
     {
         return contentsKnown;

cockatrice/src/game/zones/card_zone.cpp

@@ -142,7 +142,7 @@ void CardZone::addCard(CardItem *card, bool reorganize, int x, int y)
 
 CardItem *CardZone::getCard(int cardId, const QString &cardName)
 {
-    CardItem *c = cards.findCard(cardId, false);
+    CardItem *c = cards.findCard(cardId);
     if (!c) {
         qDebug() << "CardZone::getCard: card id=" << cardId << "not found";
         return 0;