mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-11 12:54:10 -07:00
[Fix-Warnings] Replace types with auto for libcockatrice/models/ files
This commit is contained in:
parent
799a4368ba
commit
9d7b25ec09
3 changed files with 11 additions and 11 deletions
|
|
@ -44,7 +44,7 @@ void CardSearchModel::updateSearchResults(const QString &query)
|
||||||
for (int i = 0; i < sourceModel->rowCount(); ++i) {
|
for (int i = 0; i < sourceModel->rowCount(); ++i) {
|
||||||
QModelIndex modelIndex = sourceModel->index(i, 0);
|
QModelIndex modelIndex = sourceModel->index(i, 0);
|
||||||
QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex);
|
QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex);
|
||||||
CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
|
auto *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
|
||||||
|
|
||||||
if (!sourceDbModel || !sourceIndex.isValid())
|
if (!sourceDbModel || !sourceIndex.isValid())
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ QMimeData *SetsModel::mimeData(const QModelIndexList &indexes) const
|
||||||
if (indexes.isEmpty())
|
if (indexes.isEmpty())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
SetsMimeData *result = new SetsMimeData(indexes[0].row());
|
auto *result = new SetsMimeData(indexes[0].row());
|
||||||
return qobject_cast<QMimeData *>(result);
|
return qobject_cast<QMimeData *>(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -335,7 +335,7 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName,
|
||||||
const QString &providerId,
|
const QString &providerId,
|
||||||
const QString &cardNumber) const
|
const QString &cardNumber) const
|
||||||
{
|
{
|
||||||
InnerDecklistNode *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
|
auto *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
|
||||||
if (!zoneNode) {
|
if (!zoneNode) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -346,7 +346,7 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName,
|
||||||
}
|
}
|
||||||
|
|
||||||
QString groupCriteria = getGroupCriteriaForCard(info);
|
QString groupCriteria = getGroupCriteriaForCard(info);
|
||||||
InnerDecklistNode *groupNode = dynamic_cast<InnerDecklistNode *>(zoneNode->findChild(groupCriteria));
|
auto *groupNode = dynamic_cast<InnerDecklistNode *>(zoneNode->findChild(groupCriteria));
|
||||||
if (!groupNode) {
|
if (!groupNode) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -555,15 +555,15 @@ QList<ExactCard> DeckListModel::getCards() const
|
||||||
return cards;
|
return cards;
|
||||||
|
|
||||||
for (int i = 0; i < listRoot->size(); i++) {
|
for (int i = 0; i < listRoot->size(); i++) {
|
||||||
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
||||||
if (!currentZone)
|
if (!currentZone)
|
||||||
continue;
|
continue;
|
||||||
for (int j = 0; j < currentZone->size(); j++) {
|
for (int j = 0; j < currentZone->size(); j++) {
|
||||||
DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
|
auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
|
||||||
if (!currentCard)
|
if (!currentCard)
|
||||||
continue;
|
continue;
|
||||||
for (int k = 0; k < currentCard->getNumber(); ++k) {
|
for (int k = 0; k < currentCard->getNumber(); ++k) {
|
||||||
ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
|
auto card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
|
||||||
if (card) {
|
if (card) {
|
||||||
cards.append(card);
|
cards.append(card);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -587,12 +587,12 @@ QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
|
||||||
return cards;
|
return cards;
|
||||||
|
|
||||||
for (int i = 0; i < listRoot->size(); i++) {
|
for (int i = 0; i < listRoot->size(); i++) {
|
||||||
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
||||||
if (!currentZone)
|
if (!currentZone)
|
||||||
continue;
|
continue;
|
||||||
if (currentZone->getName() == zoneName) {
|
if (currentZone->getName() == zoneName) {
|
||||||
for (int j = 0; j < currentZone->size(); j++) {
|
for (int j = 0; j < currentZone->size(); j++) {
|
||||||
DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
|
auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
|
||||||
if (!currentCard)
|
if (!currentCard)
|
||||||
continue;
|
continue;
|
||||||
for (int k = 0; k < currentCard->getNumber(); ++k) {
|
for (int k = 0; k < currentCard->getNumber(); ++k) {
|
||||||
|
|
@ -611,7 +611,7 @@ QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
|
||||||
|
|
||||||
QList<QString> *DeckListModel::getZones() const
|
QList<QString> *DeckListModel::getZones() const
|
||||||
{
|
{
|
||||||
QList<QString> *zones = new QList<QString>();
|
auto *zones = new QList<QString>();
|
||||||
DeckList *decklist = getDeckList();
|
DeckList *decklist = getDeckList();
|
||||||
if (!decklist) {
|
if (!decklist) {
|
||||||
return zones;
|
return zones;
|
||||||
|
|
@ -621,7 +621,7 @@ QList<QString> *DeckListModel::getZones() const
|
||||||
return zones;
|
return zones;
|
||||||
|
|
||||||
for (int i = 0; i < listRoot->size(); i++) {
|
for (int i = 0; i < listRoot->size(); i++) {
|
||||||
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
|
||||||
if (!currentZone)
|
if (!currentZone)
|
||||||
continue;
|
continue;
|
||||||
zones->append(currentZone->getName());
|
zones->append(currentZone->getName());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue