Skip to content

GitLab

Commit 6b3223eb authored by Kevin Funk's avatar Kevin Funk ☕
Browse files

Minor: s/Q_DECL_OVERRIDE/override/

parent 56024079
Pipeline #93587 passed with stage
in 48 seconds
Hide whitespace changes
Inline Side-by-side
ball.h
View file @ 6b3223eb
......@@ -32,7 +32,7 @@ public:
BallState currentState();
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) override;
BallState curState() const { return state; }
void setState(BallState newState);
......@@ -55,12 +55,12 @@ public:
bool forceStillGoing() const { return m_forceStillGoing; }
void setForceStillGoing(bool yes) { m_forceStillGoing = yes; }
void shotStarted() Q_DECL_OVERRIDE { maxBumperBounceSpeed = 8; }
void shotStarted() override { maxBumperBounceSpeed = 8; }
void setDoDetect(bool yes) { m_doDetect = yes; }
bool doDetect() const { return m_doDetect; }
QList<QGraphicsItem*> infoItems() const Q_DECL_OVERRIDE;
QList<QGraphicsItem*> infoItems() const override;
virtual void setName(const QString &);
virtual void setVisible(bool yes);
......@@ -71,8 +71,8 @@ public Q_SLOTS:
void update() { }
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
void endSimulation() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
void endSimulation() override;
private:
BallState state;
......
canvasitem.h
View file @ 6b3223eb
......@@ -175,21 +175,21 @@ class EllipticalCanvasItem : public Tagaro::SpriteObjectItem, public CanvasItem
EllipticalCanvasItem(bool withEllipse, const QString& spriteKey, QGraphicsItem* parent, b2World* world);
QGraphicsEllipseItem* ellipseItem() const { return m_ellipseItem; }
bool contains(const QPointF& point) const Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
bool contains(const QPointF& point) const override;
QPainterPath shape() const override;
QRectF rect() const;
double width() const { return Tagaro::SpriteObjectItem::size().width(); }
double height() const { return Tagaro::SpriteObjectItem::size().height(); }
void setSize(const QSizeF& size) Q_DECL_OVERRIDE;
void setSize(const QSizeF& size) override;
void setSize(qreal width, qreal height) { setSize(QSizeF(width, height)); }
void moveBy(double x, double y) Q_DECL_OVERRIDE;
void moveBy(double x, double y) override;
void saveSize(KConfigGroup* group);
void loadSize(KConfigGroup* group);
QPointF getPosition() const Q_DECL_OVERRIDE { return QGraphicsItem::pos(); }
QPointF getPosition() const override { return QGraphicsItem::pos(); }
private:
QGraphicsEllipseItem* m_ellipseItem;
Kolf::EllipseShape* m_shape;
......
game.cpp
View file @ 6b3223eb
......@@ -60,7 +60,7 @@ inline QString makeStateGroup(int id, const QString &name)
class KolfContactListener : public b2ContactListener
{
public:
void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) Q_DECL_OVERRIDE
void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override
{
Q_UNUSED(oldManifold)
CanvasItem* citemA = static_cast<CanvasItem*>(contact->GetFixtureA()->GetBody()->GetUserData());
......
game.h
View file @ 6b3223eb
......@@ -135,10 +135,10 @@ public:
void saveAngle(Ball *ball) { angleMap[ball] = angle; }
void setAngle(Ball *ball);
void resetAngles() { angleMap.clear(); setZValue(999999); }
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) override;
void setShowGuideLine(bool yes);
QPointF getPosition() const Q_DECL_OVERRIDE { return QGraphicsItem::pos(); }
QPointF getPosition() const override { return QGraphicsItem::pos(); }
private:
QPointF midPoint;
double maxAngle;
......@@ -188,11 +188,11 @@ public:
QString name() const { return m_name; }
QString untranslatedName() const { return m_untranslatedName; }
Config *config(QWidget *parent) Q_DECL_OVERRIDE { return new HoleConfig(this, parent); }
Config *config(QWidget *parent) override { return new HoleConfig(this, parent); }
void borderWallsChanged(bool yes);
bool borderWalls() const { return m_borderWalls; }
QPointF getPosition() const Q_DECL_OVERRIDE { return QPointF(); }
QPointF getPosition() const override { return QPointF(); }
private:
QString m_author;
QString m_name;
......@@ -216,9 +216,9 @@ public:
double thickness() const;
double width() const;
double height() const;
void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE;
QRectF boundingRect() const Q_DECL_OVERRIDE;
bool collidesWithItem(const QGraphicsItem*, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape) const Q_DECL_OVERRIDE;
void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
QRectF boundingRect() const override;
bool collidesWithItem(const QGraphicsItem*, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape) const override;
private:
double dvalue, dmax;
......@@ -333,20 +333,20 @@ private Q_SLOTS:
void emitMax();
protected:
void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *e) override;
void mousePressEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void mouseDoubleClickEvent(QMouseEvent *e) override;
void handleMousePressEvent(QMouseEvent *e);
void handleMouseDoubleClickEvent(QMouseEvent *e);
void handleMouseMoveEvent(QMouseEvent *e);
void handleMouseReleaseEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *e) override;
void keyReleaseEvent(QKeyEvent *e) override;
//resizes view to make sure it is square and calls resizeAllItems
void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *) override;
QPoint viewportToViewport(const QPoint &p);
......
kolf.h
View file @ 6b3223eb
......@@ -48,7 +48,7 @@ public Q_SLOTS:
void updateModified(bool);
protected:
bool queryClose() Q_DECL_OVERRIDE;
bool queryClose() override;
protected Q_SLOTS:
void startNewGame();
......
landscape.h
View file @ 6b3223eb
......@@ -36,17 +36,17 @@ namespace Kolf
bool isBlinkEnabled() const;
int blinkInterval() const;
void advance(int phase) Q_DECL_OVERRIDE;
void advance(int phase) override;
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
Config* config(QWidget* parent) Q_DECL_OVERRIDE;
Config* config(QWidget* parent) override;
public Q_SLOTS:
void setBlinkEnabled(bool blinkEnabled);
void setBlinkInterval(int blinkInterval);
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
private:
bool m_blinkEnabled;
int m_blinkInterval, m_blinkFrame;
......@@ -57,7 +57,7 @@ namespace Kolf
Q_OBJECT
public:
explicit LandscapeOverlay(Kolf::LandscapeItem* item);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveHandle(const QPointF& handleScenePos);
......@@ -80,14 +80,14 @@ namespace Kolf
{
public:
Puddle(QGraphicsItem* parent, b2World* world);
bool collision(Ball* ball) Q_DECL_OVERRIDE;
bool collision(Ball* ball) override;
};
class Sand : public Kolf::LandscapeItem
{
public:
Sand(QGraphicsItem* parent, b2World* world);
bool collision(Ball* ball) Q_DECL_OVERRIDE;
bool collision(Ball* ball) override;
};
enum SlopeType
......@@ -110,25 +110,25 @@ namespace Kolf
Kolf::SlopeType slopeType() const;
bool isStuckOnGround() const;
QPainterPath shape() const Q_DECL_OVERRIDE;
void setSize(const QSizeF& size) Q_DECL_OVERRIDE;
QPointF getPosition() const Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void setSize(const QSizeF& size) override;
QPointF getPosition() const override;
void moveBy(double dx, double dy) override;
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
bool collision(Ball* ball) Q_DECL_OVERRIDE;
bool terrainCollisions() const Q_DECL_OVERRIDE;
QList<QGraphicsItem*> infoItems() const Q_DECL_OVERRIDE;
Config* config(QWidget* parent) Q_DECL_OVERRIDE;
bool collision(Ball* ball) override;
bool terrainCollisions() const override;
QList<QGraphicsItem*> infoItems() const override;
Config* config(QWidget* parent) override;
public Q_SLOTS:
void setGrade(double grade);
void setReversed(bool reversed);
void setSlopeType(int type);
void setStuckOnGround(bool stuckOnGround);
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
private:
void updateAppearance();
void updateInfo();
......@@ -152,7 +152,7 @@ namespace Kolf
Q_OBJECT
public:
explicit SlopeOverlay(Kolf::Slope* slope);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveHandle(const QPointF& handleScenePos);
......
objects.h
View file @ 6b3223eb
......@@ -39,10 +39,10 @@ namespace Kolf
~BlackHole() override;
//FIXME: strutted moving of exit is broken since refactoring.
QList<QGraphicsItem*> infoItems() const Q_DECL_OVERRIDE;
void save(KConfigGroup* cfgGroup) Q_DECL_OVERRIDE;
void load(KConfigGroup* cfgGroup) Q_DECL_OVERRIDE;
Config* config(QWidget* parent) Q_DECL_OVERRIDE;
QList<QGraphicsItem*> infoItems() const override;
void save(KConfigGroup* cfgGroup) override;
void load(KConfigGroup* cfgGroup) override;
Config* config(QWidget* parent) override;
double minSpeed() const;
double maxSpeed() const;
void setMinSpeed(double news);
......@@ -56,15 +56,15 @@ namespace Kolf
void updateInfo();
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) override;
void shotStarted() Q_DECL_OVERRIDE;
bool collision(Ball* ball) Q_DECL_OVERRIDE;
void shotStarted() override;
bool collision(Ball* ball) override;
public Q_SLOTS:
void eject(Ball* ball, double speed);
void halfway();
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
private:
double m_minSpeed, m_maxSpeed;
int m_runs, m_exitDeg;
......@@ -106,7 +106,7 @@ namespace Kolf
Q_OBJECT
public:
explicit BlackHoleOverlay(Kolf::BlackHole* blackHole);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveHandle(const QPointF& handleScenePos);
......@@ -121,8 +121,8 @@ namespace Kolf
public:
Cup(QGraphicsItem* parent, b2World* world);
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
bool collision(Ball* ball) Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
bool collision(Ball* ball) override;
};
}
......
obstacles.h
View file @ 6b3223eb
......@@ -42,9 +42,9 @@ namespace Kolf
public:
Bumper(QGraphicsItem* parent, b2World* world);
bool collision(Ball* ball) Q_DECL_OVERRIDE;
bool collision(Ball* ball) override;
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
public Q_SLOTS:
void turnBumperOff();
};
......@@ -54,15 +54,15 @@ namespace Kolf
public:
Wall(QGraphicsItem* parent, b2World* world);
void load(KConfigGroup* cfgGroup) Q_DECL_OVERRIDE;
void save(KConfigGroup* cfgGroup) Q_DECL_OVERRIDE;
void load(KConfigGroup* cfgGroup) override;
void save(KConfigGroup* cfgGroup) override;
void setVisible(bool visible);
virtual void setLine(const QLineF& line);
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
QPointF getPosition() const Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) override;
QPointF getPosition() const override;
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
private:
Kolf::LineShape* m_shape;
};
......@@ -72,7 +72,7 @@ namespace Kolf
Q_OBJECT
public:
explicit WallOverlay(Kolf::Wall* wall);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveHandle(const QPointF& handleScenePos);
......@@ -101,21 +101,21 @@ namespace Kolf
bool isWallAllowed(Kolf::WallIndex index) const;
void setWall(Kolf::WallIndex index, bool hasWall);
void setWallAllowed(Kolf::WallIndex index, bool wallAllowed);
void setSize(const QSizeF& size) Q_DECL_OVERRIDE;
QPointF getPosition() const Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void setSize(const QSizeF& size) override;
QPointF getPosition() const override;
void moveBy(double dx, double dy) override;
void setWallColor(const QColor& color);
void applyWallStyle(Kolf::Wall* wall, bool adjustPainting = true);
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
Config* config(QWidget* parent) Q_DECL_OVERRIDE;
Config* config(QWidget* parent) override;
Q_SIGNALS:
void wallChanged(Kolf::WallIndex index, bool hasWall, bool wallAllowed);
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
virtual void updateWallPosition();
private:
QPen m_wallPen;
......@@ -129,7 +129,7 @@ namespace Kolf
Q_OBJECT
public:
explicit RectangleOverlay(Kolf::RectangleItem* item);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveHandle(const QPointF& handleScenePos);
......@@ -155,7 +155,7 @@ namespace Kolf
{
public:
Bridge(QGraphicsItem* parent, b2World* world);
bool collision(Ball* ball) Q_DECL_OVERRIDE;
bool collision(Ball* ball) override;
};
class Floater : public Kolf::RectangleItem
......@@ -163,20 +163,20 @@ namespace Kolf
Q_OBJECT
public:
Floater(QGraphicsItem* parent, b2World* world);
void editModeChanged(bool changed) Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void editModeChanged(bool changed) override;
void moveBy(double dx, double dy) override;
QLineF motionLine() const;
void setMotionLine(const QLineF& motionLine);
int speed() const;
void advance(int phase) Q_DECL_OVERRIDE;
void advance(int phase) override;
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
public Q_SLOTS:
void setSpeed(int speed);
protected:
Kolf::Overlay* createOverlay() Q_DECL_OVERRIDE;
Kolf::Overlay* createOverlay() override;
private:
void setMlPosition(qreal position);
......@@ -192,7 +192,7 @@ namespace Kolf
Q_OBJECT
public:
explicit FloaterOverlay(Kolf::Floater* floater);
void update() Q_DECL_OVERRIDE;
void update() override;
private Q_SLOTS:
//interface to handles
void moveMotionLineHandle(const QPointF& handleScenePos);
......@@ -209,10 +209,10 @@ namespace Kolf
Sign(QGraphicsItem* parent, b2World* world);
QString text() const;
void setSize(const QSizeF& size) Q_DECL_OVERRIDE;
void setSize(const QSizeF& size) override;
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
public Q_SLOTS:
void setText(const QString& text);
private:
......@@ -229,16 +229,16 @@ namespace Kolf
bool guardAtTop() const;
int speed() const;
void advance(int phase) Q_DECL_OVERRIDE;
void moveBy(double dx, double dy) Q_DECL_OVERRIDE;
void advance(int phase) override;
void moveBy(double dx, double dy) override;
void load(KConfigGroup* group) Q_DECL_OVERRIDE;
void save(KConfigGroup* group) Q_DECL_OVERRIDE;
void load(KConfigGroup* group) override;
void save(KConfigGroup* group) override;
public Q_SLOTS:
void setGuardAtTop(bool guardAtTop);
void setSpeed(int speed);
protected:
void updateWallPosition() Q_DECL_OVERRIDE;
void updateWallPosition() override;
private:
Kolf::Wall* m_leftWall;
Kolf::Wall* m_rightWall;
......
overlay.h
View file @ 6b3223eb
......@@ -48,11 +48,11 @@ namespace Kolf
void moveRequest(const QPointF& targetScenePos);
void moveEnded();
protected:
void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override;
void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override;
};
//This is used by Kolf::Overlay to paint the various outlines of an item.
......@@ -75,11 +75,11 @@ namespace Kolf
void hoverEntered();
void hoverLeft();
protected:
void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override;
void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override;
private:
Features m_features;
};
......@@ -124,8 +124,8 @@ namespace Kolf
///Overlays should not allow to decrease an object's dimensions below this level, for the sake of usability.
static const qreal MinimumObjectDimension;
QRectF boundingRect() const Q_DECL_OVERRIDE;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) Q_DECL_OVERRIDE;
QRectF boundingRect() const override;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
Q_SIGNALS:
///This signal is emitted if the overlay's state changes.
void stateChanged();
......
shape.h
View file @ 6b3223eb
......@@ -110,8 +110,8 @@ namespace Kolf
QRectF rect() const;
void setRect(const QRectF& rect);
protected:
b2Shape* createShape() Q_DECL_OVERRIDE;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) Q_DECL_OVERRIDE;
b2Shape* createShape() override;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) override;
private:
QRectF m_rect;
};
......@@ -124,8 +124,8 @@ namespace Kolf
QRectF rect() const;
void setRect(const QRectF& rect);
protected:
b2Shape* createShape() Q_DECL_OVERRIDE;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) Q_DECL_OVERRIDE;
b2Shape* createShape() override;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) override;
private:
QRectF m_rect;
};
......@@ -138,8 +138,8 @@ namespace Kolf
QLineF line() const;
void setLine(const QLineF& line);
protected:
b2Shape* createShape() Q_DECL_OVERRIDE;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) Q_DECL_OVERRIDE;
b2Shape* createShape() override;
void createOutlines(QPainterPath& activationOutline, QPainterPath& interactionOutline) override;
private:
QLineF m_line;
};
......
tagaro/board.h
View file @ 6b3223eb
......@@ -93,11 +93,11 @@ class Board : public QGraphicsObject
///@note The flag Qt::AlignJustify is not interpreted.
void setAlignment(Qt::Alignment alignment);
QRectF boundingRect() const Q_DECL_OVERRIDE;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) Q_DECL_OVERRIDE;
QRectF boundingRect() const override;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
protected:
QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant& value) Q_DECL_OVERRIDE;
void timerEvent(QTimerEvent* event) Q_DECL_OVERRIDE;
QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant& value) override;
void timerEvent(QTimerEvent* event) override;
private:
struct Private;
Private* const d;
......
tagaro/scene.h
View file @ 6b3223eb
......@@ -79,7 +79,7 @@ class Scene : public QGraphicsScene
///size from the sceneRect().
void setBackgroundBrushRenderSize(const QSize& size);
protected:
bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
bool eventFilter(QObject* watched, QEvent* event) override;
private:
struct Private;
Private* const d;
......
tagaro/scene_p.h
View file @ 6b3223eb
......@@ -37,7 +37,7 @@ struct Tagaro::Scene::Private : public KGameRendererClient
QSize m_renderSize;
bool m_adjustingSceneRect;
protected:
void receivePixmap(const QPixmap& pixmap) Q_DECL_OVERRIDE;
void receivePixmap(const QPixmap& pixmap) override;
};
#endif // TAGARO_SCENE_P_H
tagaro/spriteobjectitem.cpp
View file @ 6b3223eb
......@@ -44,10 +44,10 @@ class Tagaro::SpriteObjectItem::Private : public QGraphicsPixmapItem
inline void updateTransform();
//QGraphicsItem reimplementations (see comment below for why we need all of this)
bool contains(const QPointF& point) const Q_DECL_OVERRIDE;
bool isObscuredBy(const QGraphicsItem* item) const Q_DECL_OVERRIDE;
QPainterPath opaqueArea() const Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
bool contains(const QPointF& point) const override;
bool isObscuredBy(const QGraphicsItem* item) const override;
QPainterPath opaqueArea() const override;
QPainterPath shape() const override;
};
Tagaro::SpriteObjectItem::Private::Private(QGraphicsItem* parent)
......
tagaro/spriteobjectitem.h
View file @ 6b3223eb
......@@ -75,18 +75,18 @@ class SpriteObjectItem : public QGraphicsObject, public KGameRendererClient
inline void setSize(qreal width, qreal height);
//QGraphicsItem reimplementations (see comment in source file for why we need all of this)
QRectF boundingRect() const Q_DECL_OVERRIDE;
bool contains(const QPointF& point) const Q_DECL_OVERRIDE;
bool isObscuredBy(const QGraphicsItem* item) const Q_DECL_OVERRIDE;
QPainterPath opaqueArea() const Q_DECL_OVERRIDE;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
QRectF boundingRect() const override;
bool contains(const QPointF& point) const override;
bool isObscuredBy(const QGraphicsItem* item) const override;
QPainterPath opaqueArea() const override;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
QPainterPath shape() const override;
Q_SIGNALS:
///This signal is emitted when the size of the item's bounding rect
///changes.
void sizeChanged(const QSizeF& size);
protected:
void receivePixmap(const QPixmap& pixmap) Q_DECL_OVERRIDE;
void receivePixmap(const QPixmap& pixmap) override;
private:
class Private;
Private* const d;
......