From c14923db330ffd9134c8d8158da2db7c08866444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sun, 2 Mar 2025 09:54:51 +0100
Subject: [PATCH] Return cardlists directly.

---
 .../ui/widgets/cards/deck_card_zone_display_widget.cpp |  4 ++--
 .../cards/overlapped_card_group_display_widget.cpp     | 10 +++++-----
 .../cards/overlapped_card_group_display_widget.h       |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
index 8583488b6..b531a1e69 100644
--- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
@@ -129,9 +129,9 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 {
     QList<QString> groupCriteriaValues;
 
-    QList<CardInfoPtr> *cardsInZone = deckListModel->getCardsAsCardInfoPtrsForZone(zoneName);
+    QList<CardInfoPtr> cardsInZone = deckListModel->getCardsAsCardInfoPtrsForZone(zoneName);
 
-    for (CardInfoPtr cardInZone : *cardsInZone) {
+    for (CardInfoPtr cardInZone : cardsInZone) {
         groupCriteriaValues.append(cardInZone->getProperty(activeGroupCriteria));
     }
 
diff --git a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp
index 96814659e..7170f4dec 100644
--- a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp
@@ -103,7 +103,7 @@ void OverlappedCardGroupDisplayWidget::updateCardDisplays()
     overlapWidget->adjustMaxColumnsAndRows();
 }
 
-QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> *cardsToSort)
+QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort)
 {
     QList<CardInfoPtr> activeList;
 
@@ -111,8 +111,8 @@ QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList
     sortCriteria.append(activeSortCriteria);
     sortCardList(cardsToSort, sortCriteria, Qt::SortOrder::AscendingOrder);
 
-    for (int i = 0; i < cardsToSort->size(); ++i) {
-        CardInfoPtr info = cardsToSort->at(i);
+    for (int i = 0; i < cardsToSort.size(); ++i) {
+        CardInfoPtr info = cardsToSort.at(i);
         if (info) {
             if (info->getProperty(activeGroupCriteria) == cardGroupCategory) {
                 activeList.append(info);
@@ -125,12 +125,12 @@ QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList
     return activeList;
 }
 
-void OverlappedCardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> *cardsToSort,
+void OverlappedCardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> cardsToSort,
                                                     const QStringList properties,
                                                     Qt::SortOrder order = Qt::AscendingOrder)
 {
     CardInfoComparator comparator(properties, order);
-    std::sort(cardsToSort->begin(), cardsToSort->end(), comparator);
+    std::sort(cardsToSort.begin(), cardsToSort.end(), comparator);
 }
 
 void OverlappedCardGroupDisplayWidget::onActiveSortCriteriaChanged(QString _activeSortCriteria)
diff --git a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h
index 196625424..00ce7c138 100644
--- a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h
+++ b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h
@@ -24,7 +24,7 @@ public:
                                      QString activeSortCriteria,
                                      int bannerOpacity);
 
-    QList<CardInfoPtr> getCardsMatchingGroup(QList<CardInfoPtr> *cardsToSort);
+    QList<CardInfoPtr> getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort);
     void resizeEvent(QResizeEvent *event) override;
 
     DeckListModel *deckListModel;
@@ -34,7 +34,7 @@ public:
     QString activeSortCriteria;
 
 public slots:
-    void sortCardList(QList<CardInfoPtr> *cardsToSort, QStringList properties, Qt::SortOrder order);
+    void sortCardList(QList<CardInfoPtr> cardsToSort, QStringList properties, Qt::SortOrder order);
     void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
     void onHover(CardInfoPtr card);
     void updateCardDisplays();