diff --git a/cockatrice/src/deck/deck_view.cpp b/cockatrice/src/deck/deck_view.cpp index 500b1c210..9b7d77c5c 100644 --- a/cockatrice/src/deck/deck_view.cpp +++ b/cockatrice/src/deck/deck_view.cpp @@ -68,11 +68,11 @@ void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) event->accept(); } -DeckViewCard::DeckViewCard(const QString &_name, +DeckViewCard::DeckViewCard(QGraphicsItem *parent, + const QString &_name, const QString &_providerId, - const QString &_originZone, - QGraphicsItem *parent) - : AbstractCardItem(_name, _providerId, 0, -1, parent), originZone(_originZone), dragItem(0) + const QString &_originZone) + : AbstractCardItem(parent, _name, _providerId, 0, -1), originZone(_originZone), dragItem(0) { setAcceptHoverEvents(true); } @@ -357,8 +357,8 @@ void DeckViewScene::rebuildTree() continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - DeckViewCard *newCard = new DeckViewCard(currentCard->getName(), currentCard->getCardProviderId(), - currentZone->getName(), container); + DeckViewCard *newCard = new DeckViewCard(container, currentCard->getName(), + currentCard->getCardProviderId(), currentZone->getName()); container->addCard(newCard); emit newCardAdded(newCard); } diff --git a/cockatrice/src/deck/deck_view.h b/cockatrice/src/deck/deck_view.h index b7e01af3d..88bbfdf39 100644 --- a/cockatrice/src/deck/deck_view.h +++ b/cockatrice/src/deck/deck_view.h @@ -24,10 +24,10 @@ private: DeckViewCardDragItem *dragItem; public: - DeckViewCard(const QString &_name = QString(), + DeckViewCard(QGraphicsItem *parent = nullptr, + const QString &_name = QString(), const QString &_providerId = QString(), - const QString &_originZone = QString(), - QGraphicsItem *parent = nullptr); + const QString &_originZone = QString()); ~DeckViewCard(); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); const QString &getOriginZone() const diff --git a/cockatrice/src/game/cards/abstract_card_item.cpp b/cockatrice/src/game/cards/abstract_card_item.cpp index 90b7ceea0..80da703a7 100644 --- a/cockatrice/src/game/cards/abstract_card_item.cpp +++ b/cockatrice/src/game/cards/abstract_card_item.cpp @@ -12,13 +12,13 @@ #include #include -AbstractCardItem::AbstractCardItem(const QString &_name, +AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, + const QString &_name, const QString &_providerId, Player *_owner, - int _id, - QGraphicsItem *parent) - : ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false), tapAngle(0), - bgColor(Qt::transparent), isHovered(false), realZValue(0) + int _id) + : ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false), + tapAngle(0), bgColor(Qt::transparent), isHovered(false), realZValue(0) { setCursor(Qt::OpenHandCursor); setFlag(ItemIsSelectable); diff --git a/cockatrice/src/game/cards/abstract_card_item.h b/cockatrice/src/game/cards/abstract_card_item.h index 3fd922284..c7ecd0615 100644 --- a/cockatrice/src/game/cards/abstract_card_item.h +++ b/cockatrice/src/game/cards/abstract_card_item.h @@ -49,11 +49,11 @@ public: { return Type; } - AbstractCardItem(const QString &_name = QString(), + AbstractCardItem(QGraphicsItem *parent = nullptr, + const QString &_name = QString(), const QString &_providerId = QString(), Player *_owner = nullptr, - int _id = -1, - QGraphicsItem *parent = nullptr); + int _id = -1); ~AbstractCardItem(); QRectF boundingRect() const override; QPainterPath shape() const override; diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/cards/card_item.cpp index b98724e5c..f5785e16f 100644 --- a/cockatrice/src/game/cards/card_item.cpp +++ b/cockatrice/src/game/cards/card_item.cpp @@ -24,7 +24,7 @@ CardItem::CardItem(Player *_owner, bool _revealedCard, QGraphicsItem *parent, CardZone *_zone) - : AbstractCardItem(_name, _providerId, _owner, _cardid, parent), zone(_zone), revealedCard(_revealedCard), + : AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), revealedCard(_revealedCard), attacking(false), destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) { owner->addCard(this);