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

Run formatter on all our files (#6942)

Browse source
This commit is contained in:
RickyRister 2026-05-26 15:11:38 -07:00 • committed by GitHub
parent b3c89167c5
commit 1d5d3f2d38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 153 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
View file

@ -89,12 +89,15 @@ static inline QString toString(Type t)
static inline Type fromString(const QString &s)
{
if (s == "Main Type")
if (s == "Main Type") {
return MAIN_TYPE;
if (s == "Mana Cost")
}
if (s == "Mana Cost") {
return MANA_COST;
if (s == "Colors")
}
if (s == "Colors") {
return COLOR;
}
return MAIN_TYPE; // default
}
} // namespace DeckListModelGroupCriteria
@ -427,8 +430,9 @@ private:
template <typename T> T getNode(const QModelIndex &index) const
{
if (!index.isValid())
if (!index.isValid()) {
return dynamic_cast<T>(root);
}
return dynamic_cast<T>(static_cast<AbstractDecklistNode *>(index.internalPointer()));
}

12
libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
View file

@ -29,25 +29,29 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode
QString ln = lNode->getName();
QString rn = rNode->getName();
int cmp = ln.localeAwareCompare(rn);
if (cmp != 0)
if (cmp != 0) {
return cmp < 0;
}
} else if (crit == "cmc") {
int lc = lInfo ? lInfo->getCmc().toInt() : 0;
int rc = rInfo ? rInfo->getCmc().toInt() : 0;
if (lc != rc)
if (lc != rc) {
return lc < rc;
}
} else if (crit == "colors") {
QString lr = lInfo ? lInfo->getColors() : QString();
QString rr = rInfo ? rInfo->getColors() : QString();
int cmp = lr.localeAwareCompare(rr);
if (cmp != 0)
if (cmp != 0) {
return cmp < 0;
}
} else if (crit == "maintype") {
QString lr = lInfo ? lInfo->getMainCardType() : QString();
QString rr = rInfo ? rInfo->getMainCardType() : QString();
int cmp = lr.localeAwareCompare(rr);
if (cmp != 0)
if (cmp != 0) {
return cmp < 0;
}
}
}