jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 23:12:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return cardlists directly.

Browse source
This commit is contained in:
Lukas Brübach 2025-03-02 09:54:51 +01:00
parent 8a47412db2
commit c14923db33
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -129,9 +129,9 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
{ {
QList<QString> groupCriteriaValues; 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)); groupCriteriaValues.append(cardInZone->getProperty(activeGroupCriteria));
} }

10
cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp
View file

@ -103,7 +103,7 @@ void OverlappedCardGroupDisplayWidget::updateCardDisplays()
overlapWidget->adjustMaxColumnsAndRows(); overlapWidget->adjustMaxColumnsAndRows();
} }
QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> *cardsToSort) QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort)
{ {
QList<CardInfoPtr> activeList; QList<CardInfoPtr> activeList;
@ -111,8 +111,8 @@ QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList
sortCriteria.append(activeSortCriteria); sortCriteria.append(activeSortCriteria);
sortCardList(cardsToSort, sortCriteria, Qt::SortOrder::AscendingOrder); sortCardList(cardsToSort, sortCriteria, Qt::SortOrder::AscendingOrder);
for (int i = 0; i < cardsToSort->size(); ++i) { for (int i = 0; i < cardsToSort.size(); ++i) {
CardInfoPtr info = cardsToSort->at(i); CardInfoPtr info = cardsToSort.at(i);
if (info) { if (info) {
if (info->getProperty(activeGroupCriteria) == cardGroupCategory) { if (info->getProperty(activeGroupCriteria) == cardGroupCategory) {
activeList.append(info); activeList.append(info);
@ -125,12 +125,12 @@ QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList
return activeList; return activeList;
} }
void OverlappedCardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> *cardsToSort, void OverlappedCardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> cardsToSort,
const QStringList properties, const QStringList properties,
Qt::SortOrder order = Qt::AscendingOrder) Qt::SortOrder order = Qt::AscendingOrder)
{ {
CardInfoComparator comparator(properties, order); CardInfoComparator comparator(properties, order);
std::sort(cardsToSort->begin(), cardsToSort->end(), comparator); std::sort(cardsToSort.begin(), cardsToSort.end(), comparator);
} }
void OverlappedCardGroupDisplayWidget::onActiveSortCriteriaChanged(QString _activeSortCriteria) void OverlappedCardGroupDisplayWidget::onActiveSortCriteriaChanged(QString _activeSortCriteria)

4
cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h
View file

@ -24,7 +24,7 @@ public:
QString activeSortCriteria, QString activeSortCriteria,
int bannerOpacity); int bannerOpacity);
QList<CardInfoPtr> getCardsMatchingGroup(QList<CardInfoPtr> *cardsToSort); QList<CardInfoPtr> getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort);
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
DeckListModel *deckListModel; DeckListModel *deckListModel;
@ -34,7 +34,7 @@ public:
QString activeSortCriteria; QString activeSortCriteria;
public slots: 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 onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
void onHover(CardInfoPtr card); void onHover(CardInfoPtr card);
void updateCardDisplays(); void updateCardDisplays();