From 01f76d21d184a0561707815df8f15bd2f7e84191 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 9 Sep 2011 12:09:42 +1000 Subject: [PATCH] Reduce compile warnings Also change QSGDirection::sample to pass by value. Change-Id: I878649158b78da22afdf77b5f3ce3263ce1070cd Reviewed-on: http://codereview.qt-project.org/4497 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- src/declarative/particles/qsgangledirection.cpp | 11 ++++++----- src/declarative/particles/qsgangledirection_p.h | 2 +- src/declarative/particles/qsgcumulativedirection.cpp | 2 +- src/declarative/particles/qsgcumulativedirection_p.h | 2 +- src/declarative/particles/qsgcustomparticle.cpp | 1 + src/declarative/particles/qsgdirection.cpp | 5 +++-- src/declarative/particles/qsgdirection_p.h | 3 +-- src/declarative/particles/qsgimageparticle.cpp | 4 ++-- src/declarative/particles/qsgparticleaffector.cpp | 2 +- src/declarative/particles/qsgparticleemitter.cpp | 4 ++-- src/declarative/particles/qsgpointdirection.cpp | 9 +++++---- src/declarative/particles/qsgpointdirection_p.h | 2 +- src/declarative/particles/qsgtargetdirection.cpp | 15 ++++++++------- src/declarative/particles/qsgtargetdirection_p.h | 2 +- src/declarative/particles/qsgtrailemitter.cpp | 4 ++-- 15 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/declarative/particles/qsgangledirection.cpp b/src/declarative/particles/qsgangledirection.cpp index 10a31bf..b2fb6b2 100644 --- a/src/declarative/particles/qsgangledirection.cpp +++ b/src/declarative/particles/qsgangledirection.cpp @@ -102,14 +102,15 @@ QSGAngleDirection::QSGAngleDirection(QObject *parent) : } -const QPointF &QSGAngleDirection::sample(const QPointF &from) +const QPointF QSGAngleDirection::sample(const QPointF &from) { - //TODO: Faster + Q_UNUSED(from); + QPointF ret; qreal theta = m_angle*CONV - m_angleVariation*CONV + rand()/float(RAND_MAX) * m_angleVariation*CONV * 2; qreal mag = m_magnitude- m_magnitudeVariation + rand()/float(RAND_MAX) * m_magnitudeVariation * 2; - m_ret.setX(mag * cos(theta)); - m_ret.setY(mag * sin(theta)); - return m_ret; + ret.setX(mag * cos(theta)); + ret.setY(mag * sin(theta)); + return ret; } QT_END_NAMESPACE diff --git a/src/declarative/particles/qsgangledirection_p.h b/src/declarative/particles/qsgangledirection_p.h index 870a7eb..b68d751 100644 --- a/src/declarative/particles/qsgangledirection_p.h +++ b/src/declarative/particles/qsgangledirection_p.h @@ -57,7 +57,7 @@ class QSGAngleDirection : public QSGDirection Q_PROPERTY(qreal magnitudeVariation READ magnitudeVariation WRITE setMagnitudeVariation NOTIFY magnitudeVariationChanged) public: explicit QSGAngleDirection(QObject *parent = 0); - const QPointF &sample(const QPointF &from); + const QPointF sample(const QPointF &from); qreal angle() const { return m_angle; diff --git a/src/declarative/particles/qsgcumulativedirection.cpp b/src/declarative/particles/qsgcumulativedirection.cpp index 8e4e6b6..f2bfea3 100644 --- a/src/declarative/particles/qsgcumulativedirection.cpp +++ b/src/declarative/particles/qsgcumulativedirection.cpp @@ -59,7 +59,7 @@ QDeclarativeListProperty QSGCumulativeDirection::directions() return QDeclarativeListProperty(this, m_directions);//TODO: Proper list property } -const QPointF &QSGCumulativeDirection::sample(const QPointF &from) +const QPointF QSGCumulativeDirection::sample(const QPointF &from) { QPointF ret; foreach (QSGDirection* dir, m_directions) diff --git a/src/declarative/particles/qsgcumulativedirection_p.h b/src/declarative/particles/qsgcumulativedirection_p.h index 4f93fed..a77f50f 100644 --- a/src/declarative/particles/qsgcumulativedirection_p.h +++ b/src/declarative/particles/qsgcumulativedirection_p.h @@ -57,7 +57,7 @@ class QSGCumulativeDirection : public QSGDirection public: explicit QSGCumulativeDirection(QObject *parent = 0); QDeclarativeListProperty directions(); - const QPointF &sample(const QPointF &from); + const QPointF sample(const QPointF &from); private: QList m_directions; }; diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index 6c95fe6..ab4cfa0 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -406,6 +406,7 @@ void QSGCustomParticle::lookThroughShaderCode(const QByteArray &code) QSGNode *QSGCustomParticle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { + Q_UNUSED(oldNode); if (m_pleaseReset){ //delete m_material;//Shader effect item doesn't regen material? diff --git a/src/declarative/particles/qsgdirection.cpp b/src/declarative/particles/qsgdirection.cpp index f233a56..eff4b56 100644 --- a/src/declarative/particles/qsgdirection.cpp +++ b/src/declarative/particles/qsgdirection.cpp @@ -55,9 +55,10 @@ QSGDirection::QSGDirection(QObject *parent) : { } -const QPointF &QSGDirection::sample(const QPointF &from) +const QPointF QSGDirection::sample(const QPointF &from) { - return m_ret; + Q_UNUSED(from); + return QPointF(); } QT_END_NAMESPACE diff --git a/src/declarative/particles/qsgdirection_p.h b/src/declarative/particles/qsgdirection_p.h index f64d564..a943145 100644 --- a/src/declarative/particles/qsgdirection_p.h +++ b/src/declarative/particles/qsgdirection_p.h @@ -58,13 +58,12 @@ class QSGDirection : public QObject public: explicit QSGDirection(QObject *parent = 0); - virtual const QPointF &sample(const QPointF &from); + virtual const QPointF sample(const QPointF &from); signals: public slots: protected: - QPointF m_ret; }; QT_END_NAMESPACE diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index 007cfb9..581024d 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -629,11 +629,11 @@ QSGImageParticle::QSGImageParticle(QSGItem* parent) , m_blueVariation(0.0) , m_rotation(0) , m_autoRotation(false) - , m_xVector(0) - , m_yVector(0) , m_rotationVariation(0) , m_rotationSpeed(0) , m_rotationSpeedVariation(0) + , m_xVector(0) + , m_yVector(0) , m_spriteEngine(0) , m_bloat(false) , perfLevel(Unknown) diff --git a/src/declarative/particles/qsgparticleaffector.cpp b/src/declarative/particles/qsgparticleaffector.cpp index f637a17..cff3c29 100644 --- a/src/declarative/particles/qsgparticleaffector.cpp +++ b/src/declarative/particles/qsgparticleaffector.cpp @@ -187,7 +187,7 @@ void QSGParticleAffector::affectSystem(qreal dt) } } -bool QSGParticleAffector::affectParticle(QSGParticleData *d, qreal dt) +bool QSGParticleAffector::affectParticle(QSGParticleData *, qreal ) { return true; } diff --git a/src/declarative/particles/qsgparticleemitter.cpp b/src/declarative/particles/qsgparticleemitter.cpp index d44ad68..13ab3e6 100644 --- a/src/declarative/particles/qsgparticleemitter.cpp +++ b/src/declarative/particles/qsgparticleemitter.cpp @@ -223,13 +223,13 @@ QSGParticleEmitter::QSGParticleEmitter(QSGItem *parent) : , m_particleSize(16) , m_particleEndSize(-1) , m_particleSizeVariation(0) - , m_maxParticleCount(-1) + , m_startTime(0) , m_burstLeft(0) + , m_maxParticleCount(-1) , m_speed_from_movement(0) , m_reset_last(true) , m_last_timestamp(-1) , m_last_emission(0) - , m_startTime(0) , m_overwrite(true) { diff --git a/src/declarative/particles/qsgpointdirection.cpp b/src/declarative/particles/qsgpointdirection.cpp index dc104c1..2b83c27 100644 --- a/src/declarative/particles/qsgpointdirection.cpp +++ b/src/declarative/particles/qsgpointdirection.cpp @@ -74,11 +74,12 @@ QSGPointDirection::QSGPointDirection(QObject *parent) : { } -const QPointF &QSGPointDirection::sample(const QPointF &) +const QPointF QSGPointDirection::sample(const QPointF &) { - m_ret.setX(m_x - m_xVariation + rand() / float(RAND_MAX) * m_xVariation * 2); - m_ret.setY(m_y - m_yVariation + rand() / float(RAND_MAX) * m_yVariation * 2); - return m_ret; + QPointF ret; + ret.setX(m_x - m_xVariation + rand() / float(RAND_MAX) * m_xVariation * 2); + ret.setY(m_y - m_yVariation + rand() / float(RAND_MAX) * m_yVariation * 2); + return ret; } QT_END_NAMESPACE diff --git a/src/declarative/particles/qsgpointdirection_p.h b/src/declarative/particles/qsgpointdirection_p.h index ca00824..0a4c17f 100644 --- a/src/declarative/particles/qsgpointdirection_p.h +++ b/src/declarative/particles/qsgpointdirection_p.h @@ -58,7 +58,7 @@ class QSGPointDirection : public QSGDirection Q_PROPERTY(qreal yVariation READ yVariation WRITE setYVariation NOTIFY yVariationChanged) public: explicit QSGPointDirection(QObject *parent = 0); - virtual const QPointF &sample(const QPointF &from); + virtual const QPointF sample(const QPointF &from); qreal x() const { return m_x; diff --git a/src/declarative/particles/qsgtargetdirection.cpp b/src/declarative/particles/qsgtargetdirection.cpp index d9a3ce5..79ba433 100644 --- a/src/declarative/particles/qsgtargetdirection.cpp +++ b/src/declarative/particles/qsgtargetdirection.cpp @@ -94,9 +94,10 @@ QSGTargetDirection::QSGTargetDirection(QObject *parent) : { } -const QPointF &QSGTargetDirection::sample(const QPointF &from) +const QPointF QSGTargetDirection::sample(const QPointF &from) { //###This approach loses interpolating the last position of the target (like we could with the emitter) is it worthwhile? + QPointF ret; qreal targetX; qreal targetY; if (m_targetItem){ @@ -108,9 +109,9 @@ const QPointF &QSGTargetDirection::sample(const QPointF &from) targetX += m_targetItem->x(); targetY += m_targetItem->y(); }else{ - m_ret = parentEmitter->mapFromItem(m_targetItem, QPointF(targetX, targetY)); - targetX = m_ret.x(); - targetY = m_ret.y(); + ret = parentEmitter->mapFromItem(m_targetItem, QPointF(targetX, targetY)); + targetX = ret.x(); + targetY = ret.y(); } }else{ targetX = m_targetX; @@ -122,9 +123,9 @@ const QPointF &QSGTargetDirection::sample(const QPointF &from) qreal mag = m_magnitude + rand()/(float)RAND_MAX * m_magnitudeVariation * 2 - m_magnitudeVariation; if (m_proportionalMagnitude) mag *= sqrt(targetX * targetX + targetY * targetY); - m_ret.setX(mag * cos(theta)); - m_ret.setY(mag * sin(theta)); - return m_ret; + ret.setX(mag * cos(theta)); + ret.setY(mag * sin(theta)); + return ret; } QT_END_NAMESPACE diff --git a/src/declarative/particles/qsgtargetdirection_p.h b/src/declarative/particles/qsgtargetdirection_p.h index 8f4901a..75c3e08 100644 --- a/src/declarative/particles/qsgtargetdirection_p.h +++ b/src/declarative/particles/qsgtargetdirection_p.h @@ -66,7 +66,7 @@ class QSGTargetDirection : public QSGDirection public: explicit QSGTargetDirection(QObject *parent = 0); - virtual const QPointF &sample(const QPointF &from); + virtual const QPointF sample(const QPointF &from); qreal targetX() const { diff --git a/src/declarative/particles/qsgtrailemitter.cpp b/src/declarative/particles/qsgtrailemitter.cpp index 6bccf3b..427b587 100644 --- a/src/declarative/particles/qsgtrailemitter.cpp +++ b/src/declarative/particles/qsgtrailemitter.cpp @@ -196,7 +196,7 @@ void QSGTrailEmitter::emitWindow(int timeStamp) // Note that burst location doesn't get used for follow emitter qreal followT = pt - d->t; qreal followT2 = followT * followT * 0.5; - qreal sizeOffset = d->size/2;//TODO: Current size? As an option + //qreal sizeOffset = d->size/2;//TODO: Current size? As an option //TODO: Set variations //Subtract offset, because PS expects this in emitter coordinates QRectF boundsRect(d->x - offset.x() + d->vx * followT + d->ax * followT2 - m_emitterXVariation/2, @@ -217,7 +217,7 @@ void QSGTrailEmitter::emitWindow(int timeStamp) const QPointF &speed = m_speed->sample(newPos); datum->vx = speed.x() + m_speed_from_movement * d->vx; - datum->vy = speed.y(); + datum->vy = speed.y() + m_speed_from_movement * d->vy; // Particle acceleration -- 2.7.4