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] 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_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
View file

@ -10,8 +10,8 @@ bool CardCompleterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex
return true;
}
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
QString data = index.data(Qt::DisplayRole).toString();
const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
const QString data = index.data(Qt::DisplayRole).toString();
// Ensure substring matching
return data.contains(filterRegularExpression());

4
libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
View file

@ -44,7 +44,7 @@ void CardSearchModel::updateSearchResults(const QString &query)
for (int i = 0; i < sourceModel->rowCount(); ++i) {
QModelIndex modelIndex = sourceModel->index(i, 0);
QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex);
CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
const CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
if (!sourceDbModel || !sourceIndex.isValid())
return;
@ -54,7 +54,7 @@ void CardSearchModel::updateSearchResults(const QString &query)
if (!card)
continue;
int distance = levenshteinDistance(query.toLower(), card->getName().toLower());
const int distance = levenshteinDistance(query.toLower(), card->getName().toLower());
searchResults.append({card, distance});
}

20
libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
View file

@ -27,8 +27,8 @@ bool CardDatabaseDisplayModel::canFetchMore(const QModelIndex &index) const
void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
{
int remainder = sourceModel()->rowCount(index) - loadedRowCount;
int itemsToFetch = qMin(100, remainder);
const int remainder = sourceModel()->rowCount(index) - loadedRowCount;
const int itemsToFetch = qMin(100, remainder);
if (itemsToFetch == 0) {
return;
@ -49,12 +49,12 @@ int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const
bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
QString leftString = sourceModel()->data(left, CardDatabaseModel::SortRole).toString();
QString rightString = sourceModel()->data(right, CardDatabaseModel::SortRole).toString();
const QString leftString = sourceModel()->data(left, CardDatabaseModel::SortRole).toString();
const QString rightString = sourceModel()->data(right, CardDatabaseModel::SortRole).toString();
if (!cardName.isEmpty() && left.column() == CardDatabaseModel::NameColumn) {
bool isLeftType = leftString.startsWith(cardName, Qt::CaseInsensitive);
bool isRightType = rightString.startsWith(cardName, Qt::CaseInsensitive);
const bool isLeftType = leftString.startsWith(cardName, Qt::CaseInsensitive);
const bool isRightType = rightString.startsWith(cardName, Qt::CaseInsensitive);
// test for an exact match: isLeftType && leftString.size() == cardName.size()
// or an exclusive start match: isLeftType && !isRightType
@ -65,13 +65,13 @@ bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelInd
if (isRightType && (!isLeftType || rightString.size() == cardName.size()))
return false;
} else if (right.column() == CardDatabaseModel::PTColumn && left.column() == CardDatabaseModel::PTColumn) {
QStringList leftList = leftString.split("/");
QStringList rightList = rightString.split("/");
const QStringList leftList = leftString.split("/");
const QStringList rightList = rightString.split("/");
if (leftList.size() == 2 && rightList.size() == 2) {
// cool, have both P/T in list now
int lessThanNum = lessThanNumerically(leftList.at(0), rightList.at(0));
const int lessThanNum = lessThanNumerically(leftList.at(0), rightList.at(0));
if (lessThanNum != 0) {
return lessThanNum < 0;
} else {
@ -153,7 +153,7 @@ int CardDatabaseDisplayModel::lessThanNumerically(const QString &left, const QSt
}
bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
{
CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
const CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken()))
return false;

2
libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
View file

@ -34,7 +34,7 @@ QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
(role != Qt::DisplayRole && role != SortRole))
return QVariant();
CardInfoPtr card = cardList.at(index.row());
const CardInfoPtr card = cardList.at(index.row());
switch (index.column()) {
case NameColumn:
return card->getName();

28
libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
View file

@ -26,7 +26,7 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || (index.column() >= NUM_COLS) || (index.row() >= rowCount()))
return QVariant();
CardSetPtr set = sets[index.row()];
const CardSetPtr set = sets[index.row()];
if (index.column() == EnabledCol) {
switch (role) {
@ -135,7 +135,7 @@ bool SetsModel::dropMimeData(const QMimeData *data,
return false;
row = parent.row();
}
int oldRow = qobject_cast<const SetsMimeData *>(data)->getOldRow();
const int oldRow = qobject_cast<const SetsMimeData *>(data)->getOldRow();
if (oldRow < row)
row--;
@ -146,7 +146,7 @@ bool SetsModel::dropMimeData(const QMimeData *data,
void SetsModel::toggleRow(int row, bool enable)
{
CardSetPtr temp = sets.at(row);
const CardSetPtr temp = sets.at(row);
if (enable)
enabledSets.insert(temp);
@ -158,7 +158,7 @@ void SetsModel::toggleRow(int row, bool enable)
void SetsModel::toggleRow(int row)
{
CardSetPtr tmp = sets.at(row);
const CardSetPtr tmp = sets.at(row);
if (tmp == nullptr)
return;
@ -185,7 +185,7 @@ void SetsModel::toggleAll(bool enabled)
void SetsModel::swapRows(int oldRow, int newRow)
{
beginRemoveRows(QModelIndex(), oldRow, oldRow);
CardSetPtr temp = sets.takeAt(oldRow);
const CardSetPtr temp = sets.takeAt(oldRow);
endRemoveRows();
beginInsertRows(QModelIndex(), newRow, newRow);
@ -197,7 +197,7 @@ void SetsModel::swapRows(int oldRow, int newRow)
void SetsModel::restoreOriginalOrder()
{
int numRows = rowCount();
const int numRows = rowCount();
sets.defaultSort();
emit dataChanged(index(0, 0), index(numRows - 1, columnCount() - 1));
}
@ -205,13 +205,13 @@ void SetsModel::restoreOriginalOrder()
void SetsModel::sort(int column, Qt::SortOrder order)
{
QMultiMap<QString, CardSetPtr> setMap;
int numRows = rowCount();
const int numRows = rowCount();
int row;
for (row = 0; row < numRows; ++row)
setMap.insert(index(row, column).data(SetsModel::SortRole).toString(), sets.at(row));
QList<CardSetPtr> tmp = setMap.values();
const QList<CardSetPtr> tmp = setMap.values();
sets.clear();
if (order == Qt::AscendingOrder) {
for (row = 0; row < tmp.size(); row++) {
@ -270,7 +270,7 @@ SetsDisplayModel::SetsDisplayModel(QObject *parent) : QSortFilterProxyModel(pare
void SetsDisplayModel::fetchMore(const QModelIndex &index)
{
int itemsToFetch = sourceModel()->rowCount(index);
const int itemsToFetch = sourceModel()->rowCount(index);
beginInsertRows(QModelIndex(), 0, itemsToFetch - 1);
@ -279,9 +279,9 @@ void SetsDisplayModel::fetchMore(const QModelIndex &index)
bool SetsDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
auto typeIndex = sourceModel()->index(sourceRow, SetsModel::SetTypeCol, sourceParent);
auto nameIndex = sourceModel()->index(sourceRow, SetsModel::LongNameCol, sourceParent);
auto shortNameIndex = sourceModel()->index(sourceRow, SetsModel::ShortNameCol, sourceParent);
const auto typeIndex = sourceModel()->index(sourceRow, SetsModel::SetTypeCol, sourceParent);
const auto nameIndex = sourceModel()->index(sourceRow, SetsModel::LongNameCol, sourceParent);
const auto shortNameIndex = sourceModel()->index(sourceRow, SetsModel::ShortNameCol, sourceParent);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
const auto filter = filterRegularExpression();
@ -296,8 +296,8 @@ bool SetsDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex &source
bool SetsDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
QString leftString = sourceModel()->data(left, SetsModel::SortRole).toString();
QString rightString = sourceModel()->data(right, SetsModel::SortRole).toString();
const QString leftString = sourceModel()->data(left, SetsModel::SortRole).toString();
const QString rightString = sourceModel()->data(right, SetsModel::SortRole).toString();
return QString::localeAwareCompare(leftString, rightString) < 0;
}

2
libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
View file

@ -8,7 +8,7 @@ TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel
bool TokenDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
{
CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
const CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
return info->getIsToken() && rowMatchesCardName(info);
}

2
libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
View file

@ -11,7 +11,7 @@ TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(paren
bool TokenEditModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
{
CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
const CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
return info->getIsToken() && info->getSets().contains(CardSet::TOKENS_SETNAME) && rowMatchesCardName(info);
}