From 6d8c4772f6bc8d02a66ecd5201d030d85705315a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=BCbach=2C=20Lukas?= Date: Fri, 28 Nov 2025 22:33:15 +0100 Subject: [PATCH] [Fix-Warnings] Replace types with auto for game/player files --- cockatrice/src/game/player/menu/utility_menu.cpp | 3 +-- cockatrice/src/game/player/player_actions.cpp | 14 +++++++------- .../src/game/player/player_event_handler.cpp | 2 +- cockatrice/src/game/player/player_target.cpp | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cockatrice/src/game/player/menu/utility_menu.cpp b/cockatrice/src/game/player/menu/utility_menu.cpp index 15128defe..09160f000 100644 --- a/cockatrice/src/game/player/menu/utility_menu.cpp +++ b/cockatrice/src/game/player/menu/utility_menu.cpp @@ -62,8 +62,7 @@ void UtilityMenu::populatePredefinedTokensMenu() return; } - InnerDecklistNode *tokenZone = - dynamic_cast(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS)); + auto *tokenZone = dynamic_cast(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS)); if (tokenZone) { if (!tokenZone->empty()) diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index e6efaf854..921c58798 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -73,7 +73,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown) cmd.set_y(0); } else { tableRow = faceDown ? 2 : info.getUiAttributes().tableRow; - QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow)); + auto gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow)); cardToMove->set_face_down(faceDown); if (!faceDown) { cardToMove->set_pt(info.getPowTough().toStdString()); @@ -117,7 +117,7 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown) tableRow = 1; } - QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow)); + auto gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow)); cardToMove->set_face_down(faceDown); if (!faceDown) { cardToMove->set_pt(info.getPowTough().toStdString()); @@ -162,7 +162,7 @@ static QList expandSortOption(CardList::SortOption option) void PlayerActions::actSortHand() { auto *action = qobject_cast(sender()); - CardList::SortOption option = static_cast(action->data().toInt()); + auto option = static_cast(action->data().toInt()); QList sortOptions = expandSortOption(option); @@ -1080,7 +1080,7 @@ void PlayerActions::createCard(const CardItem *sourceCard, // get the target token's location // TODO: Define this QPoint into its own function along with the one below - QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow)); + auto gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow)); // create the token for the related card Command_CreateToken cmd; @@ -1323,7 +1323,7 @@ void PlayerActions::actResetPT() QVariantList PlayerActions::parsePT(const QString &pt) { - QVariantList ptList = QVariantList(); + auto ptList = QVariantList(); if (!pt.isEmpty()) { int sep = pt.indexOf('/'); if (sep == 0) { @@ -1380,7 +1380,7 @@ void PlayerActions::actSetPT() for (const auto &item : sel) { auto *card = static_cast(item); auto *cmd = new Command_SetCardAttr; - QString newpt = QString(); + auto newpt = QString(); if (!empty) { const auto oldpt = parsePT(card->getPT()); int ptIter = 0; @@ -1484,7 +1484,7 @@ void PlayerActions::actSetAnnotation() } player->setDialogSemaphore(true); - AnnotationDialog *dialog = new AnnotationDialog(player->getGame()->getTab()); + auto *dialog = new AnnotationDialog(player->getGame()->getTab()); dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput); dialog->setWindowTitle(tr("Set annotation")); dialog->setLabelText(tr("Please enter the new annotation:")); diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index 972229489..ebd097ad1 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -124,7 +124,7 @@ void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event) } CardRef cardRef = {QString::fromStdString(event.card_name()), QString::fromStdString(event.card_provider_id())}; - CardItem *card = new CardItem(player, nullptr, cardRef, event.card_id()); + auto *card = new CardItem(player, nullptr, cardRef, event.card_id()); // use db PT if not provided in event and not face-down if (!QString::fromStdString(event.pt()).isEmpty()) { card->setPT(QString::fromStdString(event.pt())); diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp index a7a5cc5e7..7378d0da7 100644 --- a/cockatrice/src/game/player/player_target.cpp +++ b/cockatrice/src/game/player/player_target.cpp @@ -120,7 +120,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o painter->drawPixmap(translatedRect, cachedPixmap, cachedPixmap.rect()); painter->restore(); - QRectF nameRect = QRectF(0, boundingRect().height() - 20, 110, 20); + auto nameRect = QRectF(0, boundingRect().height() - 20, 110, 20); painter->fillRect(nameRect, QColor(0, 0, 0, 160)); QRectF translatedNameRect = painter->combinedTransform().mapRect(nameRect);