diff options
Diffstat (limited to 'src/declarative/util')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 27059a2f..33ebc4d4 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2719,7 +2719,7 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions, } if (scale != 0) - rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI); + rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI); else { qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under scale of 0"); ok = false; diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index efc51979..e2d5c064 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -91,7 +91,7 @@ int QDeclarativeListAccessor::count() const case VariantList: return qvariant_cast<QVariantList>(d).count(); case ListProperty: - return ((QDeclarativeListReference *)d.constData())->count(); + return ((const QDeclarativeListReference *)d.constData())->count(); case Instance: return 1; case Integer: @@ -111,7 +111,7 @@ QVariant QDeclarativeListAccessor::at(int idx) const case VariantList: return qvariant_cast<QVariantList>(d).at(idx); case ListProperty: - return QVariant::fromValue(((QDeclarativeListReference *)d.constData())->at(idx)); + return QVariant::fromValue(((const QDeclarativeListReference *)d.constData())->at(idx)); case Instance: return d; case Integer: diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 2308433d..9f63c744 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -74,7 +74,7 @@ void qdeclarativelistmodel_move(int from, int to, int n, T *items) QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const { - return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData)); + return (QDeclarativeListModelParser::ListInstruction *)(const_cast<char *>((const char *)this) + sizeof(ListModelData)); } /*! diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 321a2a96..317e3eb2 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -103,7 +103,7 @@ bool QSmoothedAnimation::recalc() return false; } - finalDuration = ceil(tf * qreal(1000.0)); + finalDuration = std::ceil(tf * qreal(1000.0)); if (maximumEasingTime == 0) { a = 0; diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 02ac38e2..02f4622d 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -115,7 +115,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q } if (scale != 0) - rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI); + rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI); else { qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under scale of 0"); ok = false; |