From 6a717e104432aa501bdec1739394a51be47d06d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=BCbach=2C=20Lukas?= Date: Fri, 28 Nov 2025 22:31:12 +0100 Subject: [PATCH] [Fix-Warnings] Replace types with auto for game/board files --- .../src/game/board/abstract_card_drag_item.cpp | 2 +- cockatrice/src/game/board/abstract_counter.cpp | 4 ++-- cockatrice/src/game/board/arrow_item.cpp | 6 +++--- cockatrice/src/game/board/card_drag_item.cpp | 8 ++++---- cockatrice/src/game/board/card_item.cpp | 18 +++++++++--------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp index c961cbcb6..ef5328c58 100644 --- a/cockatrice/src/game/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -9,7 +9,7 @@ static const float CARD_WIDTH_HALF = CARD_WIDTH / 2; static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2; -const QColor GHOST_MASK = QColor(255, 255, 255, 50); +constexpr auto GHOST_MASK = QColor(255, 255, 255, 50); AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index 985c78ad2..89cbe0265 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -43,7 +43,7 @@ AbstractCounter::AbstractCounter(Player *_player, if (i == 0) { menu->addSeparator(); } else { - QAction *aIncrement = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this); + auto *aIncrement = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this); if (i == -1) aDec = aIncrement; else if (i == 1) @@ -215,7 +215,7 @@ bool AbstractCounterDialog::eventFilter(QObject *obj, QEvent *event) { Q_UNUSED(obj); if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); switch (keyEvent->key()) { case Qt::Key_Up: changeValue(+1); diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index d5d0ebfe0..c81fa62f1 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -217,8 +217,8 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) CardZoneLogic *startZone = static_cast(startItem)->getZone(); // For now, we can safely assume that the start item is always a card. // The target item can be a player as well. - CardItem *startCard = qgraphicsitem_cast(startItem); - CardItem *targetCard = qgraphicsitem_cast(targetItem); + auto *startCard = qgraphicsitem_cast(startItem); + auto *targetCard = qgraphicsitem_cast(targetItem); Command_CreateArrow cmd; cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(color)); @@ -232,7 +232,7 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) cmd.set_target_zone(targetZone->getName().toStdString()); cmd.set_target_card_id(targetCard->getId()); } else { // failed to cast target to card, this means it's a player - PlayerTarget *targetPlayer = qgraphicsitem_cast(targetItem); + auto *targetPlayer = qgraphicsitem_cast(targetItem); cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId()); } diff --git a/cockatrice/src/game/board/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp index 9eadadeda..461abcff5 100644 --- a/cockatrice/src/game/board/card_drag_item.cpp +++ b/cockatrice/src/game/board/card_drag_item.cpp @@ -36,7 +36,7 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) CardZone *cardZone = 0; ZoneViewZone *zoneViewZone = 0; for (int i = colliding.size() - 1; i >= 0; i--) { - CardZone *temp = qgraphicsitem_cast(colliding.at(i)); + auto *temp = qgraphicsitem_cast(colliding.at(i)); if (!cardZone) cardZone = temp; if (!zoneViewZone) @@ -75,7 +75,7 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) // For other zones (where we do display the card under the cursor), we use // the hotspot to feel like the card was dragged at the corresponding // position. - TableZone *tableZone = qobject_cast(cursorZone); + auto *tableZone = qobject_cast(cursorZone); QPointF closestGridPoint; if (tableZone) closestGridPoint = tableZone->closestGridPoint(cursorPosInZone); @@ -90,7 +90,7 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) setPos(newPos); bool newOccupied = false; - TableZone *table = qobject_cast(cursorZone); + auto *table = qobject_cast(cursorZone); if (table) if (table->getCardFromCoords(closestGridPoint)) newOccupied = true; @@ -116,7 +116,7 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } for (int i = 0; i < childDrags.size(); i++) { - CardDragItem *c = static_cast(childDrags[i]); + auto *c = static_cast(childDrags[i]); if (!occupied && !(static_cast(c->item)->getAttachedTo() && (startZone == currentZone->getLogic())) && !c->occupied) { diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index e786b5329..a483fd915 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -283,18 +283,18 @@ void CardItem::drawArrow(const QColor &arrowColor) int currentPhase = game->getGameState()->getCurrentPhase(); phase = Phases::getLastSubphase(currentPhase) + 1; } - ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase); + auto *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase); scene()->addItem(arrow); arrow->grabMouse(); for (const auto &item : scene()->selectedItems()) { - CardItem *card = qgraphicsitem_cast(item); + auto *card = qgraphicsitem_cast(item); if (card == nullptr || card == this) continue; if (card->getZone() != zone) continue; - ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase); + auto *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase); scene()->addItem(childArrow); arrow->addChildArrow(childArrow); } @@ -310,13 +310,13 @@ void CardItem::drawAttachArrow() arrow->grabMouse(); for (const auto &item : scene()->selectedItems()) { - CardItem *card = qgraphicsitem_cast(item); + auto *card = qgraphicsitem_cast(item); if (card == nullptr) continue; if (card->getZone() != zone) continue; - ArrowAttachItem *childArrow = new ArrowAttachItem(card); + auto *childArrow = new ArrowAttachItem(card); scene()->addItem(childArrow); arrow->addChildArrow(childArrow); } @@ -342,7 +342,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < 2 * QApplication::startDragDistance()) return; - if (const ZoneViewZoneLogic *view = qobject_cast(zone)) { + if (const auto *view = qobject_cast(zone)) { if (view->getRevealZone() && !view->getWriteableRevealZone()) return; } else if (!owner->getPlayerInfo()->getLocalOrJudge()) @@ -357,7 +357,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) int childIndex = 0; for (const auto &item : scene()->selectedItems()) { - CardItem *card = static_cast(item); + auto *card = static_cast(item); if ((card == this) || (card->getZone() != zone)) continue; ++childIndex; @@ -366,7 +366,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) childPos = card->pos() - pos(); else childPos = QPointF(childIndex * CARD_WIDTH / 2, 0); - CardDragItem *drag = + auto *drag = new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem); drag->setPos(dragItem->pos() + childPos); scene()->addItem(drag); @@ -381,7 +381,7 @@ void CardItem::playCard(bool faceDown) if (!owner->getPlayerInfo()->getLocalOrJudge()) return; - TableZoneLogic *tz = qobject_cast(zone); + auto *tz = qobject_cast(zone); if (tz) emit tz->toggleTapped(); else {