jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 11:03:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rebase fix, moved toLower to constructor

Browse source 
Rebase fix
This commit is contained in:
Jurriaan van den Berg 2026-11-01 23:24:08 +01:00
parent b13395eb4d
commit de683434e4
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
View file

@ -176,23 +176,24 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st
lowercaseTerm = term.toLower(); lowercaseTerm = term.toLower();
switch (attr()) { switch (attr()) {
case CardFilter::AttrColor: { case CardFilter::AttrColor:
QString converted = term.trimmed(); case CardFilter::AttrColorIdentity: {
QString converted = term.trimmed().toLower();
converted.replace("green", "g", Qt::CaseInsensitive); converted.replace("green", "g");
converted.replace("grn", "g", Qt::CaseInsensitive); converted.replace("grn", "g");
converted.replace("blue", "u", Qt::CaseInsensitive); converted.replace("blue", "u");
converted.replace("blu", "u", Qt::CaseInsensitive); converted.replace("blu", "u");
converted.replace("black", "b", Qt::CaseInsensitive); converted.replace("black", "b");
converted.replace("blk", "b", Qt::CaseInsensitive); converted.replace("blk", "b");
converted.replace("red", "r", Qt::CaseInsensitive); converted.replace("red", "r");
converted.replace("white", "w", Qt::CaseInsensitive); converted.replace("white", "w");
converted.replace("wht", "w", Qt::CaseInsensitive); converted.replace("wht", "w");
converted.replace("colorless", "c", Qt::CaseInsensitive); converted.replace("colorless", "c");
converted.replace("colourless", "c", Qt::CaseInsensitive); converted.replace("colourless", "c");
converted.replace("none", "c", Qt::CaseInsensitive); converted.replace("none", "c");
converted.replace(QString(" "), QString(""), Qt::CaseInsensitive); converted.replace(QString(" "), QString(""));
convertedColorTerm = converted; convertedColorTerm = converted;
break; break;
@ -358,10 +359,10 @@ bool FilterItem::acceptSubType(const CardInfoPtr &info) const
return subType.contains(term, Qt::CaseInsensitive); return subType.contains(term, Qt::CaseInsensitive);
} }
static bool matchesColor(const QString &convertedColorTerm, const QString &color) static bool matchesColor(const QString &convertedColorTerm, const QString &colors)
{ {
// Colorless card filter // Colorless card filter
if (convertedColorTerm.toLower() == "c" && colors.length() < 1) { if (convertedColorTerm == "c" && colors.length() < 1) {
return true; return true;
} }
@ -386,6 +387,8 @@ bool FilterItem::acceptColor(const CardInfoPtr &info) const
bool FilterItem::acceptColorIdentity(const CardInfoPtr &info) const bool FilterItem::acceptColorIdentity(const CardInfoPtr &info) const
{ {
// if (info->getColorIdentity() == "")
// system(std::format("notify-send \"{}, {}\"", convertedColorTerm.toStdString(), info->getColorIdentity().toStdString()).c_str());
return matchesColor(convertedColorTerm, info->getColorIdentity()); return matchesColor(convertedColorTerm, info->getColorIdentity());
} }