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

[Fix-Warnings] Local variable can be made const

Browse source
This commit is contained in:
Brübach, Lukas 2025-11-29 15:11:22 +01:00
parent 8abd04dab1
commit f2d3e81331
214 changed files with 1375 additions and 1355 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_filters/libcockatrice/filters/filter_card.cpp
View file

@ -14,8 +14,8 @@ QJsonObject CardFilter::toJson() const
CardFilter *CardFilter::fromJson(const QJsonObject &obj)
{
QString term = obj["term"].toString();
QString typeStr = obj["type"].toString();
QString attrStr = obj["attr"].toString();
const QString typeStr = obj["type"].toString();
const QString attrStr = obj["attr"].toString();
Type type = TypeEnd;
Attr attr = AttrEnd;

6
libcockatrice_filters/libcockatrice/filters/filter_string.cpp
View file

@ -190,7 +190,7 @@ static void setupParserRules()
search["StringValue"] = [](const peg::SemanticValues &sv) -> StringMatcher {
// Helper function for word boundary matching
auto createWordBoundaryMatcher = [](const QString &target) {
QString pattern = QString("\\b%1\\b").arg(QRegularExpression::escape(target));
const QString pattern = QString("\\b%1\\b").arg(QRegularExpression::escape(target));
QRegularExpression regex(pattern, QRegularExpression::CaseInsensitiveOption);
return [regex](const QString &s) { return regex.match(s).hasMatch(); };
};
@ -286,8 +286,8 @@ static void setupParserRules()
};
search["RegexMatcher"] = [](const peg::SemanticValues &sv) -> StringMatcher {
auto target = std::any_cast<QString>(sv[0]);
auto regex = QRegularExpression(target, QRegularExpression::CaseInsensitiveOption);
const auto target = std::any_cast<QString>(sv[0]);
const auto regex = QRegularExpression(target, QRegularExpression::CaseInsensitiveOption);
return [=](const QString &s) { return regex.match(s).hasMatch(); };
};

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

@ -84,10 +84,10 @@ int FilterItemList::termIndex(const QString &term) const
FilterTreeNode *FilterItemList::termNode(const QString &term)
{
int i = termIndex(term);
const int i = termIndex(term);
if (i < 0) {
FilterItem *fi = new FilterItem(term, this);
int count = childNodes.count();
const int count = childNodes.count();
preInsertChild(this, count);
childNodes.append(fi);
@ -199,7 +199,7 @@ bool FilterItem::acceptColor(const CardInfoPtr info) const
* then we should match all of them to the card's colors
*/
int match_count = 0;
for (auto &it : converted_term) {
for (const auto &it : converted_term) {
if (info->getColors().contains(it, Qt::CaseInsensitive))
match_count++;
}
@ -280,7 +280,7 @@ bool FilterItem::acceptLoyalty(const CardInfoPtr info) const
} else {
bool success;
// if loyalty can't be converted to "int" it must be "X"
int loyalty = info->getLoyalty().toInt(&success);
const int loyalty = info->getLoyalty().toInt(&success);
if (success) {
return relationCheck(loyalty);
} else {
@ -291,7 +291,7 @@ bool FilterItem::acceptLoyalty(const CardInfoPtr info) const
bool FilterItem::acceptPowerToughness(const CardInfoPtr info, CardFilter::Attr attr) const
{
int slash = info->getPowTough().indexOf("/");
const int slash = info->getPowTough().indexOf("/");
if (slash == -1) {
return false;
}
@ -306,7 +306,7 @@ bool FilterItem::acceptPowerToughness(const CardInfoPtr info, CardFilter::Attr a
}
// advanced filtering should only happen after fast string comparison failed
bool conversion;
int value = valueString.toInt(&conversion);
const int value = valueString.toInt(&conversion);
return conversion ? relationCheck(value) : false;
}
@ -371,7 +371,7 @@ bool FilterItem::relationCheck(int cardInfo) const
QString trimmedTerm = term.trimmed();
// check whether it's a 2 char operator (<=, >=, or ==)
if (trimmedTerm[1] == '=') {
int termInt = trimmedTerm.mid(2).toInt();
const int termInt = trimmedTerm.mid(2).toInt();
if (trimmedTerm.startsWith('<')) {
result = (cardInfo <= termInt);
} else if (trimmedTerm.startsWith('>')) {
@ -380,7 +380,7 @@ bool FilterItem::relationCheck(int cardInfo) const
result = (cardInfo == termInt);
}
} else {
int termInt = trimmedTerm.mid(1).toInt();
const int termInt = trimmedTerm.mid(1).toInt();
if (trimmedTerm.startsWith('<')) {
result = (cardInfo < termInt);
} else if (trimmedTerm.startsWith('>')) {
@ -523,7 +523,7 @@ bool FilterTree::acceptsCard(const CardInfoPtr info) const
void FilterTree::removeFiltersByAttr(CardFilter::Attr filterType)
{
for (int i = childNodes.size() - 1; i >= 0; --i) {
auto *child = dynamic_cast<LogicMap *>(childNodes.at(i));
const auto *child = dynamic_cast<LogicMap *>(childNodes.at(i));
if (child && child->attr == filterType) {
deleteAt(i);
@ -542,12 +542,12 @@ void FilterTree::removeFilter(const CardFilter *toRemove)
if (!typeList)
continue;
int termIdx = typeList->termIndex(toRemove->term());
const int termIdx = typeList->termIndex(toRemove->term());
if (termIdx != -1) {
typeList->deleteAt(termIdx);
emit typeList->nodeChanged();
if (typeList->childCount() == 0) {
int logicIndex = logicMap->childIndex(typeList);
const int logicIndex = logicMap->childIndex(typeList);
if (logicIndex != -1) {
logicMap->deleteAt(logicIndex);
}