diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-07 14:49:58 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-10 09:00:17 +0000 |
| commit | e91bd092f26a9a90ea6df57b84d8c1678c76ba4d (patch) | |
| tree | 3f85f41068039f2fe7e8a4f712e99a7f3559f911 /src/particles | |
| parent | 3515521f6946e5a4b517abdc61b79df11067ce5b (diff) | |
Particles: add missing 'override'
... and drop redundant 'virtual'
Change-Id: Id70a0b74724d231bae9b3803fcfe0514adb9f642
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickparticleemitter_p.h | 2 | ||||
| -rw-r--r-- | src/particles/qquickparticlesystem_p.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index b3f96ae3e6..4f7e12da44 100644 --- a/src/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h @@ -133,7 +133,7 @@ public: qreal velocityFromMovement() const { return m_velocity_from_movement; } void setVelocityFromMovement(qreal s); - virtual void componentComplete(); + void componentComplete() override; Q_SIGNALS: void emitParticles(QQmlV4Handle particles); void particlesPerSecondChanged(qreal); diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h index b57d55bd98..de39b436e2 100644 --- a/src/particles/qquickparticlesystem_p.h +++ b/src/particles/qquickparticlesystem_p.h @@ -389,7 +389,7 @@ public Q_SLOTS: protected: //This one only once per frame (effectively) - void componentComplete(); + void componentComplete() override; private Q_SLOTS: void emittersChanged(); @@ -477,12 +477,12 @@ public: : QAbstractAnimation(static_cast<QObject*>(system)), m_system(system) { } protected: - virtual void updateCurrentTime( int t ) + void updateCurrentTime(int t) override { m_system->updateCurrentTime(t); } - virtual int duration() const + int duration() const override { return -1; } |