summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2019-03-19 10:19:56 +0100
committerAapo Keskimolo <aapo.keskimolo@qt.io>2019-03-20 17:28:45 +0000
commitb7df8c5e2bd9feb1090b649ce5f3daeb9dbd0b75 (patch)
tree4eadfad38fc676c56848e95859b1c679c2237382
parent1204de9281bccedf2c877eaaa4ae06343d69747c (diff)
Add missing override specifiers
[-Werror,-Winconsistent-missing-override] Change-Id: Ibf3ad506649642830cc159a6b2fa06b73f40bafc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/runtime/q3dsslideplayer_p.h46
-rw-r--r--src/runtime/slideplayerng/q3dsslideplayerng_p.h46
2 files changed, 46 insertions, 46 deletions
diff --git a/src/runtime/q3dsslideplayer_p.h b/src/runtime/q3dsslideplayer_p.h
index e3f0b82..1de9d91 100644
--- a/src/runtime/q3dsslideplayer_p.h
+++ b/src/runtime/q3dsslideplayer_p.h
@@ -61,36 +61,36 @@ class Q3DSV_PRIVATE_EXPORT Q3DSSlidePlayer : public Q3DSAbstractSlidePlayer
public:
Q3DSSlidePlayer(Q3DSSceneManager *sceneManager,
Q3DSAbstractSlidePlayer *parent = nullptr);
- ~Q3DSSlidePlayer();
+ ~Q3DSSlidePlayer() override;
- Q3DSSlideDeck *slideDeck() const;
- void advanceFrame(float);
- void sceneReady();
+ Q3DSSlideDeck *slideDeck() const override;
+ void advanceFrame(float) override;
+ void sceneReady() override;
- float duration() const;
- float position() const;
- PlayerState state() const { return m_data.state; }
+ float duration() const override;
+ float position() const override;
+ PlayerState state() const override { return m_data.state; }
- void setMode(PlayerMode mode);
- PlayerMode mode() const { return m_mode; }
+ void setMode(PlayerMode mode) override;
+ PlayerMode mode() const override { return m_mode; }
- void objectAboutToBeAddedToScene(Q3DSGraphObject *obj);
- void objectAboutToBeRemovedFromScene(Q3DSGraphObject *obj);
+ void objectAboutToBeAddedToScene(Q3DSGraphObject *obj) override;
+ void objectAboutToBeRemovedFromScene(Q3DSGraphObject *obj) override;
- void objectAddedToSlide(Q3DSGraphObject *obj, Q3DSSlide *slide);
- void objectRemovedFromSlide(Q3DSGraphObject *obj, Q3DSSlide *slide);
+ void objectAddedToSlide(Q3DSGraphObject *obj, Q3DSSlide *slide) override;
+ void objectRemovedFromSlide(Q3DSGraphObject *obj, Q3DSSlide *slide) override;
public Q_SLOTS:
- void play();
- void stop();
- void pause();
- void seek(float);
- void setSlideDeck(Q3DSSlideDeck *slideDeck);
- void setPlaybackRate(float rate);
- void nextSlide();
- void previousSlide();
- void precedingSlide();
- void reload();
+ void play() override;
+ void stop() override;
+ void pause() override;
+ void seek(float) override;
+ void setSlideDeck(Q3DSSlideDeck *slideDeck) override;
+ void setPlaybackRate(float rate) override;
+ void nextSlide() override;
+ void previousSlide() override;
+ void precedingSlide() override;
+ void reload() override;
private:
Q3DSSlidePlayer(QSharedPointer<Q3DSAnimationManager> animationManager,
diff --git a/src/runtime/slideplayerng/q3dsslideplayerng_p.h b/src/runtime/slideplayerng/q3dsslideplayerng_p.h
index b17991c..ec0d04f 100644
--- a/src/runtime/slideplayerng/q3dsslideplayerng_p.h
+++ b/src/runtime/slideplayerng/q3dsslideplayerng_p.h
@@ -58,36 +58,36 @@ class Q3DSV_PRIVATE_EXPORT Q3DSSlidePlayerNg : public Q3DSAbstractSlidePlayer
public:
Q3DSSlidePlayerNg(Q3DSSceneManager *sceneManager,
Q3DSAbstractSlidePlayer *parent = nullptr);
- ~Q3DSSlidePlayerNg();
+ ~Q3DSSlidePlayerNg() override;
- Q3DSSlideDeck *slideDeck() const;
- void advanceFrame(float dt);
- void sceneReady();
+ Q3DSSlideDeck *slideDeck() const override;
+ void advanceFrame(float dt) override;
+ void sceneReady() override;
- float duration() const;
- float position() const;
- PlayerState state() const { return m_data.state; }
+ float duration() const override;
+ float position() const override;
+ PlayerState state() const override { return m_data.state; }
- void setMode(PlayerMode mode);
- PlayerMode mode() const { return m_mode; }
+ void setMode(PlayerMode mode) override;
+ PlayerMode mode() const override { return m_mode; }
- void objectAboutToBeAddedToScene(Q3DSGraphObject *obj);
- void objectAboutToBeRemovedFromScene(Q3DSGraphObject *obj);
+ void objectAboutToBeAddedToScene(Q3DSGraphObject *obj) override;
+ void objectAboutToBeRemovedFromScene(Q3DSGraphObject *obj) override;
- void objectAddedToSlide(Q3DSGraphObject *obj, Q3DSSlide *slide);
- void objectRemovedFromSlide(Q3DSGraphObject *obj, Q3DSSlide *slide);
+ void objectAddedToSlide(Q3DSGraphObject *obj, Q3DSSlide *slide) override;
+ void objectRemovedFromSlide(Q3DSGraphObject *obj, Q3DSSlide *slide) override;
public Q_SLOTS:
- void play();
- void stop();
- void pause();
- void seek(float);
- void setSlideDeck(Q3DSSlideDeck *slideDeck);
- void setPlaybackRate(float rate);
- void nextSlide();
- void previousSlide();
- void precedingSlide();
- void reload();
+ void play() override;
+ void stop() override;
+ void pause() override;
+ void seek(float) override;
+ void setSlideDeck(Q3DSSlideDeck *slideDeck) override;
+ void setPlaybackRate(float rate) override;
+ void nextSlide() override;
+ void previousSlide() override;
+ void precedingSlide() override;
+ void reload() override;
private:
Q3DSSlidePlayerNg(Q3DSSceneManager *sceneManager,