jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 16:02:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add missing override and explicit specifiers to all classes in src/game (#5511)

Browse source
This commit is contained in:
RickyRister 2025-01-22 04:57:56 -08:00 • committed by GitHub
parent af161f00b7
commit 66e2e7a473
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 140 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/cards/abstract_card_drag_item.h
View file

@ -26,7 +26,7 @@ public:
return Type;
}
AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
~AbstractCardDragItem();
~AbstractCardDragItem() override;
QRectF boundingRect() const override
{
return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);

12
cockatrice/src/game/cards/abstract_card_item.h
View file

@ -48,12 +48,12 @@ public:
{
return Type;
}
AbstractCardItem(QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(),
Player *_owner = nullptr,
int _id = -1);
~AbstractCardItem();
explicit AbstractCardItem(QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(),
Player *_owner = nullptr,
int _id = -1);
~AbstractCardItem() override;
QRectF boundingRect() const override;
QPainterPath shape() const override;
QSizeF getTranslatedSize(QPainter *painter) const;

6
cockatrice/src/game/cards/card_drag_item.h
View file

@ -28,11 +28,11 @@ public:
{
return faceDown;
}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
void updatePosition(const QPointF &cursorScenePos);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void updatePosition(const QPointF &cursorScenePos) override;
protected:
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
};
#endif

28
cockatrice/src/game/cards/card_item.h
View file

@ -46,25 +46,25 @@ public:
{
Type = typeCard
};
int type() const
int type() const override
{
return Type;
}
CardItem(Player *_owner,
QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(),
int _cardid = -1,
bool revealedCard = false,
CardZone *_zone = nullptr);
~CardItem();
explicit CardItem(Player *_owner,
QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(),
int _cardid = -1,
bool revealedCard = false,
CardZone *_zone = nullptr);
~CardItem() override;
void retranslateUi();
CardZone *getZone() const
{
return zone;
}
void setZone(CardZone *_zone);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPoint getGridPoint() const
{
return gridPoint;
@ -163,10 +163,10 @@ public:
void playCard(bool faceDown);
protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
};
#endif

2
cockatrice/src/game/cards/card_list.h
View file

@ -34,7 +34,7 @@ public:
SortBySet,
SortByPrinting
};
CardList(bool _contentsKnown);
explicit CardList(bool _contentsKnown);
CardItem *findCard(const int cardId) const;
bool getContentsKnown() const
{