diff options
22 files changed, 50 insertions, 44 deletions
diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h index f6e277f8a7..5db6167dc1 100644 --- a/src/particles/qquickage_p.h +++ b/src/particles/qquickage_p.h @@ -74,7 +74,8 @@ public: } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + Q_SIGNALS: void lifeLeftChanged(int arg); void advancePositionChanged(bool arg); diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index a383b196c2..c1745798c3 100644 --- a/src/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h @@ -69,7 +69,7 @@ class QQuickCustomAffector : public QQuickParticleAffector public: explicit QQuickCustomAffector(QQuickItem *parent = 0); - virtual void affectSystem(qreal dt); + void affectSystem(qreal dt) override; QQuickDirection * position() const { @@ -153,7 +153,8 @@ public Q_SLOTS: protected: bool isAffectConnected(); - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + private: void affectProperties(const QList<QQuickParticleData*> particles, qreal dt); QQuickDirection * m_position; diff --git a/src/particles/qquickcustomparticle_p.h b/src/particles/qquickcustomparticle_p.h index e9d68cbe5c..1d48786a41 100644 --- a/src/particles/qquickcustomparticle_p.h +++ b/src/particles/qquickcustomparticle_p.h @@ -84,18 +84,18 @@ Q_SIGNALS: void vertexShaderChanged(); protected: - virtual void initialize(int gIdx, int pIdx); - virtual void commit(int gIdx, int pIdx); + void initialize(int gIdx, int pIdx) override; + void commit(int gIdx, int pIdx) override; - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; QQuickOpenGLShaderEffectNode *prepareNextFrame(QQuickOpenGLShaderEffectNode *rootNode); - void reset(); + void reset() override; void resize(int oldCount, int newCount); - virtual void componentComplete(); + void componentComplete() override; QQuickOpenGLShaderEffectNode *buildCustomNodes(); - void sceneGraphInvalidated(); - void itemChange(ItemChange change, const ItemChangeData &value); + void sceneGraphInvalidated() override; + void itemChange(ItemChange change, const ItemChangeData &value) override; private Q_SLOTS: void sourceDestroyed(QObject *object); diff --git a/src/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h index 1df7e32c83..0af7f4d94f 100644 --- a/src/particles/qquickellipseextruder_p.h +++ b/src/particles/qquickellipseextruder_p.h @@ -60,8 +60,8 @@ class QQuickEllipseExtruder : public QQuickParticleExtruder Q_PROPERTY(bool fill READ fill WRITE setFill NOTIFY fillChanged)//###Use base class? If it's still box public: explicit QQuickEllipseExtruder(QObject *parent = 0); - virtual QPointF extrude(const QRectF &); - virtual bool contains(const QRectF &bounds, const QPointF &point); + QPointF extrude(const QRectF &) override; + bool contains(const QRectF &bounds, const QPointF &point) override; bool fill() const { diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h index b67de631be..05ae7a38d5 100644 --- a/src/particles/qquickfriction_p.h +++ b/src/particles/qquickfriction_p.h @@ -73,7 +73,7 @@ public: } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; Q_SIGNALS: diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h index 7c071c932d..d3a7f6665c 100644 --- a/src/particles/qquickgravity_p.h +++ b/src/particles/qquickgravity_p.h @@ -72,7 +72,8 @@ public: return m_angle; } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + Q_SIGNALS: void magnitudeChanged(qreal arg); diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h index 0b935fc1d1..9a56ef5cce 100644 --- a/src/particles/qquickgroupgoal_p.h +++ b/src/particles/qquickgroupgoal_p.h @@ -75,7 +75,7 @@ public: } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; Q_SIGNALS: diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 9740b1b9f8..95323c25a6 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -347,15 +347,15 @@ public Q_SLOTS: void setEntryEffect(EntryEffect arg); protected: - void reset(); - virtual void initialize(int gIdx, int pIdx); - virtual void commit(int gIdx, int pIdx); + void reset() override; + void initialize(int gIdx, int pIdx) override; + void commit(int gIdx, int pIdx) override; - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; void prepareNextFrame(QSGNode**); void buildParticleNodes(QSGNode**); - void sceneGraphInvalidated(); + void sceneGraphInvalidated() override; private Q_SLOTS: void createEngine(); //### method invoked by sprite list changing (in engine.h) - pretty nasty diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index 94721a89ab..9e6c7deaea 100644 --- a/src/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h @@ -70,7 +70,7 @@ public: bool fade() const { return m_fade; } - virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; static QQuickItemParticleAttached *qmlAttachedProperties(QObject *object); QQmlComponent* delegate() const @@ -100,9 +100,9 @@ public Q_SLOTS: } protected: - virtual void reset(); - virtual void commit(int gIdx, int pIdx); - virtual void initialize(int gIdx, int pIdx); + void reset() override; + void commit(int gIdx, int pIdx) override; + void initialize(int gIdx, int pIdx) override; void prepareNextFrame(); private: void processDeletables(); diff --git a/src/particles/qquicklineextruder_p.h b/src/particles/qquicklineextruder_p.h index b98317027f..306f3a1dd6 100644 --- a/src/particles/qquicklineextruder_p.h +++ b/src/particles/qquicklineextruder_p.h @@ -60,7 +60,7 @@ class QQuickLineExtruder : public QQuickParticleExtruder public: explicit QQuickLineExtruder(QObject *parent = 0); - virtual QPointF extrude(const QRectF &); + QPointF extrude(const QRectF &) override; bool mirrored() const { return m_mirrored; diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h index 32ace521da..0fc0331db8 100644 --- a/src/particles/qquickmaskextruder_p.h +++ b/src/particles/qquickmaskextruder_p.h @@ -63,8 +63,8 @@ class QQuickMaskExtruder : public QQuickParticleExtruder Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: explicit QQuickMaskExtruder(QObject *parent = 0); - virtual QPointF extrude(const QRectF &); - virtual bool contains(const QRectF &bounds, const QPointF &point); + QPointF extrude(const QRectF &) override; + bool contains(const QRectF &bounds, const QPointF &point) override; QUrl source() const { diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h index 8a84bb7616..5c9652bc32 100644 --- a/src/particles/qquickparticleaffector_p.h +++ b/src/particles/qquickparticleaffector_p.h @@ -185,7 +185,7 @@ protected: bool activeGroup(int g); bool shouldAffect(QQuickParticleData* datum);//Call to do the logic on whether it is affecting that datum void postAffect(QQuickParticleData* datum);//Call to do the post-affect logic on particles which WERE affected(once off, needs reset, affected signal) - virtual void componentComplete(); + void componentComplete() override; bool isAffectedConnected(); static const qreal simulationDelta; static const qreal simulationCutoff; diff --git a/src/particles/qquickparticlegroup_p.h b/src/particles/qquickparticlegroup_p.h index 25cc2130b1..0314234569 100644 --- a/src/particles/qquickparticlegroup_p.h +++ b/src/particles/qquickparticlegroup_p.h @@ -104,8 +104,8 @@ Q_SIGNALS: void systemChanged(QQuickParticleSystem* arg); protected: - virtual void componentComplete(); - virtual void classBegin(){;} + void componentComplete() override; + void classBegin() override {} private: diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index 064ce27fe8..ac14a18103 100644 --- a/src/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h @@ -98,7 +98,7 @@ public: return m_groupIds; } - void itemChange(ItemChange, const ItemChangeData &); + void itemChange(ItemChange, const ItemChangeData &) override; Q_SIGNALS: void countChanged(); @@ -123,7 +123,7 @@ protected: */ virtual void reset(); - virtual void componentComplete(); + void componentComplete() override; virtual void initialize(int gIdx, int pIdx){//Called from main thread Q_UNUSED(gIdx); Q_UNUSED(pIdx); diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h index 99fae300c6..47985b5e82 100644 --- a/src/particles/qquickpointattractor_p.h +++ b/src/particles/qquickpointattractor_p.h @@ -160,7 +160,8 @@ void setProportionalToDistance(Proportion arg) } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + private: qreal m_strength; qreal m_x; diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h index b01dc7ea4e..752254a8d5 100644 --- a/src/particles/qquickpointdirection_p.h +++ b/src/particles/qquickpointdirection_p.h @@ -63,7 +63,7 @@ class QQuickPointDirection : public QQuickDirection Q_PROPERTY(qreal yVariation READ yVariation WRITE setYVariation NOTIFY yVariationChanged) public: explicit QQuickPointDirection(QObject *parent = 0); - virtual const QPointF sample(const QPointF &from); + const QPointF sample(const QPointF &from) override; qreal x() const { return m_x; diff --git a/src/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h index 001031c711..630cf3050d 100644 --- a/src/particles/qquickrectangleextruder_p.h +++ b/src/particles/qquickrectangleextruder_p.h @@ -62,8 +62,8 @@ class QQuickRectangleExtruder : public QQuickParticleExtruder public: explicit QQuickRectangleExtruder(QObject *parent = 0); - virtual QPointF extrude(const QRectF &); - virtual bool contains(const QRectF &bounds, const QPointF &point); + QPointF extrude(const QRectF &) override; + bool contains(const QRectF &bounds, const QPointF &point) override; bool fill() const { return m_fill; diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h index 7174fd2318..2b15d0b8bb 100644 --- a/src/particles/qquickspritegoal_p.h +++ b/src/particles/qquickspritegoal_p.h @@ -81,7 +81,8 @@ public: } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + Q_SIGNALS: void goalStateChanged(const QString &arg); diff --git a/src/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h index 4de5867336..f2e386a2b8 100644 --- a/src/particles/qquicktargetdirection_p.h +++ b/src/particles/qquicktargetdirection_p.h @@ -71,7 +71,7 @@ class QQuickTargetDirection : public QQuickDirection public: explicit QQuickTargetDirection(QObject *parent = 0); - virtual const QPointF sample(const QPointF &from); + const QPointF sample(const QPointF &from) override; qreal targetX() const { diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index b70f34999a..99464436ba 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h @@ -71,8 +71,8 @@ public: }; Q_ENUM(EmitSize) explicit QQuickTrailEmitter(QQuickItem *parent = 0); - virtual void emitWindow(int timeStamp); - virtual void reset(); + void emitWindow(int timeStamp) override; + void reset() override; int particlesPerParticlePerSecond() const { diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h index 7a6be1719e..e73f3ba153 100644 --- a/src/particles/qquickturbulence_p.h +++ b/src/particles/qquickturbulence_p.h @@ -65,7 +65,7 @@ class QQuickTurbulenceAffector : public QQuickParticleAffector public: explicit QQuickTurbulenceAffector(QQuickItem *parent = 0); ~QQuickTurbulenceAffector(); - virtual void affectSystem(qreal dt); + void affectSystem(qreal dt) override; qreal strength() const { @@ -102,8 +102,8 @@ public Q_SLOTS: } protected: - virtual void geometryChanged(const QRectF &newGeometry, - const QRectF &oldGeometry); + void geometryChanged(const QRectF &newGeometry, + const QRectF &oldGeometry) override; private: void ensureInit(); void mapUpdate(); diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h index 6461444cd1..0ad19d4d13 100644 --- a/src/particles/qquickwander_p.h +++ b/src/particles/qquickwander_p.h @@ -105,7 +105,8 @@ public: } protected: - virtual bool affectParticle(QQuickParticleData *d, qreal dt); + bool affectParticle(QQuickParticleData *d, qreal dt) override; + Q_SIGNALS: void xVarianceChanged(qreal arg); |