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

[Fix-Warnings] Remove redundant parentheses

Browse source
This commit is contained in:
Brübach, Lukas 2025-11-29 09:23:11 +01:00
parent 858361e6d3
commit 8ddbdf31f9
75 changed files with 269 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
template <class T> FilterTreeNode *FilterTreeBranch<T>::nodeAt(int i) const
{
return (childNodes.size() > i) ? childNodes.at(i) : nullptr;
return childNodes.size() > i ? childNodes.at(i) : nullptr;
}
template <class T> void FilterTreeBranch<T>::deleteAt(int i)
@ -21,7 +21,7 @@ template <class T> int FilterTreeBranch<T>::childIndex(const FilterTreeNode *nod
{
auto *unconst = const_cast<FilterTreeNode *>(node);
auto downcasted = dynamic_cast<T>(unconst);
return (downcasted) ? childNodes.indexOf(downcasted) : -1;
return downcasted ? childNodes.indexOf(downcasted) : -1;
}
template <class T> FilterTreeBranch<T>::~FilterTreeBranch()
@ -74,7 +74,7 @@ FilterTreeNode *LogicMap::parent() const
int FilterItemList::termIndex(const QString &term) const
{
for (int i = 0; i < childNodes.count(); i++) {
if ((childNodes.at(i))->term == term) {
if (childNodes.at(i)->term == term) {
return i;
}
}
@ -365,7 +365,7 @@ bool FilterItem::relationCheck(int cardInfo) const
bool result, conversion;
// if int conversion fails, there's probably an operator at the start
result = (cardInfo == term.toInt(&conversion));
result = cardInfo == term.toInt(&conversion);
if (!conversion) {
// leading whitespaces could cause indexing to fail
QString trimmedTerm = term.trimmed();
@ -373,20 +373,20 @@ bool FilterItem::relationCheck(int cardInfo) const
if (trimmedTerm[1] == '=') {
int termInt = trimmedTerm.mid(2).toInt();
if (trimmedTerm.startsWith('<')) {
result = (cardInfo <= termInt);
result = cardInfo <= termInt;
} else if (trimmedTerm.startsWith('>')) {
result = (cardInfo >= termInt);
result = cardInfo >= termInt;
} else {
result = (cardInfo == termInt);
result = cardInfo == termInt;
}
} else {
int termInt = trimmedTerm.mid(1).toInt();
if (trimmedTerm.startsWith('<')) {
result = (cardInfo < termInt);
result = cardInfo < termInt;
} else if (trimmedTerm.startsWith('>')) {
result = (cardInfo > termInt);
result = cardInfo > termInt;
} else if (trimmedTerm.startsWith("=")) {
result = (cardInfo == termInt);
result = cardInfo == termInt;
} else {
// the int conversion hasn't failed due to an operator at the start
result = false;

2
libcockatrice_filters/libcockatrice/filters/filter_tree.h
View file

@ -59,7 +59,7 @@ public:
}
[[nodiscard]] virtual int index() const
{
return (parent() != nullptr) ? parent()->childIndex(this) : -1;
return parent() != nullptr ? parent()->childIndex(this) : -1;
}
[[nodiscard]] virtual const QString text() const
{