diff options
author | Petr Nejedly <pnejedly@blackberry.com> | 2013-07-24 08:13:18 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-26 14:06:15 +0200 |
commit | 88054e44722c9fd5aab90928ee8052ee054053a3 (patch) | |
tree | af967a4fc80b9772ddc2f2b06b24f6f754c948aa /src/particles | |
parent | 07860794da5863610f38295c9d517fc457c5de95 (diff) |
std:: fixes to make qtdeclarative closer to compilable with QNX NDK.
Math functions come in std:: when #included through <cmath>
Change-Id: I62550e5c23cb6f4464f2c2f5c4188a91b3512d1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/particles')
-rw-r--r-- | src/particles/qquickgravity.cpp | 4 | ||||
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 4 | ||||
-rw-r--r-- | src/particles/qquickpointattractor.cpp | 8 | ||||
-rw-r--r-- | src/particles/qquicktargetdirection.cpp | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp index 34fff57cbc..c7856f30b9 100644 --- a/src/particles/qquickgravity.cpp +++ b/src/particles/qquickgravity.cpp @@ -88,8 +88,8 @@ bool QQuickGravityAffector::affectParticle(QQuickParticleData *d, qreal dt) return false; if (m_needRecalc) { m_needRecalc = false; - m_dx = m_magnitude * cos(m_angle * CONV); - m_dy = m_magnitude * sin(m_angle * CONV); + m_dx = m_magnitude * std::cos(m_angle * CONV); + m_dy = m_magnitude * std::sin(m_angle * CONV); } d->setInstantaneousVX(d->curVX() + m_dx*dt); diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 0145ce4edb..424352d8e8 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -1654,9 +1654,9 @@ void QQuickImageParticle::spritesUpdate(qreal time) qreal frame = (time - datum->animT)/(datum->frameDuration / 1000.0); frame = qBound((qreal)0.0, frame, (qreal)((qreal)datum->frameCount - 1.0));//Stop at count-1 frames until we have between anim interpolation if (m_spritesInterpolate) - progress = modf(frame,&frameAt); + progress = std::modf(frame,&frameAt); else - modf(frame,&frameAt); + std::modf(frame,&frameAt); } else { datum->frameAt++; if (datum->frameAt >= datum->frameCount){ diff --git a/src/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp index 8d8de21837..4d5d5c5247 100644 --- a/src/particles/qquickpointattractor.cpp +++ b/src/particles/qquickpointattractor.cpp @@ -119,8 +119,8 @@ bool QQuickAttractorAffector::affectParticle(QQuickParticleData *d, qreal dt) return false; qreal dx = m_x+m_offset.x() - d->curX(); qreal dy = m_y+m_offset.y() - d->curY(); - qreal r = sqrt((dx*dx) + (dy*dy)); - qreal theta = atan2(dy,dx); + qreal r = std::sqrt((dx*dx) + (dy*dy)); + qreal theta = std::atan2(dy,dx); qreal ds = 0; switch (m_proportionalToDistance){ case InverseQuadratic: @@ -139,8 +139,8 @@ bool QQuickAttractorAffector::affectParticle(QQuickParticleData *d, qreal dt) ds = m_strength; } ds *= dt; - dx = ds * cos(theta); - dy = ds * sin(theta); + dx = ds * std::cos(theta); + dy = ds * std::sin(theta); qreal vx,vy; switch (m_physics){ case Position: diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp index 8a59bcd707..6c44ecccab 100644 --- a/src/particles/qquicktargetdirection.cpp +++ b/src/particles/qquicktargetdirection.cpp @@ -121,12 +121,12 @@ const QPointF QQuickTargetDirection::sample(const QPointF &from) } targetX += 0 - from.x() - m_targetVariation + rand()/(float)RAND_MAX * m_targetVariation*2; targetY += 0 - from.y() - m_targetVariation + rand()/(float)RAND_MAX * m_targetVariation*2; - qreal theta = atan2(targetY, targetX); + qreal theta = std::atan2(targetY, targetX); qreal mag = m_magnitude + rand()/(float)RAND_MAX * m_magnitudeVariation * 2 - m_magnitudeVariation; if (m_proportionalMagnitude) - mag *= sqrt(targetX * targetX + targetY * targetY); - ret.setX(mag * cos(theta)); - ret.setY(mag * sin(theta)); + mag *= std::sqrt(targetX * targetX + targetY * targetY); + ret.setX(mag * std::cos(theta)); + ret.setY(mag * std::sin(theta)); return ret; } |