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>

diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index 34fff57..c7856f3 100644 (file)
--- 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 0145ce4..424352d 100644 (file)
--- 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 8d8de21..4d5d5c5 100644 (file)
--- 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 8a59bcd..6c44ecc 100644 (file)
--- 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;
 }
 

diff --git a/src/qml/qml/v4/qv4codegen.cpp b/src/qml/qml/v4/qv4codegen.cpp
index fb5eb12..d0c43c8 100644 (file)
--- a/src/qml/qml/v4/qv4codegen.cpp
+++ b/src/qml/qml/v4/qv4codegen.cpp
@@ -663,7 +663,7 @@ V4IR::Expr *Codegen::binop(V4IR::AluOp op, V4IR::Expr *left, V4IR::Expr *right)
                 case V4IR::OpLe: return _block->CONST(V4IR::BoolType, c1->value <= c2->value);
                 case V4IR::OpLt: return _block->CONST(V4IR::BoolType, c1->value < c2->value);
                 case V4IR::OpLShift: return _block->CONST(V4IR::NumberType, QV4::Value::toInt32(c1->value) << (QV4::Value::toUInt32(c2->value) & 0x1f));
-                case V4IR::OpMod: return _block->CONST(V4IR::NumberType, ::fmod(c1->value, c2->value));
+                case V4IR::OpMod: return _block->CONST(V4IR::NumberType, std::fmod(c1->value, c2->value));
                 case V4IR::OpMul: return _block->CONST(V4IR::NumberType, c1->value * c2->value);
                 case V4IR::OpOr: return _block->CONST(V4IR::NumberType, c1->value ? c1->value : c2->value);
                 case V4IR::OpRShift: return _block->CONST(V4IR::NumberType, QV4::Value::toInt32(c1->value) >> (QV4::Value::toUInt32(c2->value) & 0x1f));

diff --git a/src/qml/qml/v4/qv4runtime_p.h b/src/qml/qml/v4/qv4runtime_p.h
index b78e9f2..6790005 100644 (file)
--- a/src/qml/qml/v4/qv4runtime_p.h
+++ b/src/qml/qml/v4/qv4runtime_p.h
@@ -474,7 +474,7 @@ inline void __qmljs_mod(QV4::ExecutionContext *, QV4::Value *result, const QV4::
 
     double lval = __qmljs_to_number(left);
     double rval = __qmljs_to_number(right);
-    *result = QV4::Value::fromDouble(fmod(lval, rval));
+    *result = QV4::Value::fromDouble(std::fmod(lval, rval));
 }
 
 inline void __qmljs_shl(QV4::ExecutionContext *, QV4::Value *result, const QV4::Value &left, const QV4::Value &right)