jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -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 66065045f0
commit 8af56f5c3d
5 changed files with 17 additions and 17 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<CardInfoPtr> *cardsInZone = deckListModel->getCardsAsCardInfoPtrsForZone(zoneName);
QList<CardInfoPtr> cardsInZone = deckListModel->getCardsAsCardInfoPtrsForZone(zoneName);
for (CardInfoPtr cardInZone : *cardsInZone) {
for (CardInfoPtr cardInZone : cardsInZone) {
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();
}
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)

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

@ -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();

12
cockatrice/src/deck/deck_list_model.cpp
View file

@ -484,9 +484,9 @@ void DeckListModel::setDeckList(DeckLoader *_deck)
rebuildTree();
}
QList<CardInfoPtr> *DeckListModel::getCardsAsCardInfoPtrs() const
QList<CardInfoPtr> DeckListModel::getCardsAsCardInfoPtrs() const
{
QList<CardInfoPtr> *cards = new QList<CardInfoPtr>();
QList<CardInfoPtr> cards;
DeckList *decklist = getDeckList();
if (!decklist) {
return cards;
@ -507,7 +507,7 @@ QList<CardInfoPtr> *DeckListModel::getCardsAsCardInfoPtrs() const
CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
currentCard->getName(), currentCard->getCardProviderId());
if (info) {
cards->append(info);
cards.append(info);
} else {
qDebug() << "Card not found in database!";
}
@ -517,9 +517,9 @@ QList<CardInfoPtr> *DeckListModel::getCardsAsCardInfoPtrs() const
return cards;
}
QList<CardInfoPtr> *DeckListModel::getCardsAsCardInfoPtrsForZone(QString zoneName) const
QList<CardInfoPtr> DeckListModel::getCardsAsCardInfoPtrsForZone(QString zoneName) const
{
QList<CardInfoPtr> *cards = new QList<CardInfoPtr>();
QList<CardInfoPtr> cards;
DeckList *decklist = getDeckList();
if (!decklist) {
return cards;
@ -541,7 +541,7 @@ QList<CardInfoPtr> *DeckListModel::getCardsAsCardInfoPtrsForZone(QString zoneNam
CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
currentCard->getName(), currentCard->getCardProviderId());
if (info) {
cards->append(info);
cards.append(info);
} else {
qDebug() << "Card not found in database!";
}

4
cockatrice/src/deck/deck_list_model.h
View file

@ -110,8 +110,8 @@ public:
return deckList;
}
void setDeckList(DeckLoader *_deck);
QList<CardInfoPtr> *getCardsAsCardInfoPtrs() const;
QList<CardInfoPtr> *getCardsAsCardInfoPtrsForZone(QString zoneName) const;
QList<CardInfoPtr> getCardsAsCardInfoPtrs() const;
QList<CardInfoPtr> getCardsAsCardInfoPtrsForZone(QString zoneName) const;
QList<QString> *getZones() const;
private: