diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-07 14:42:59 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-05-13 20:30:26 +0000 |
| commit | 30aa0a1cc9812bd2a9ead91e3f412808ebe7daff (patch) | |
| tree | 3165986d36f4727bb8ec111b7db22eb45a067867 /src/quick/util | |
| parent | 66be8fcc05f0e51f12c215af3d5ab74d729386ba (diff) | |
QtQuick: Fix const correctness in old style casts
Found with GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c9589afabc7ade
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 4 | ||||
| -rw-r--r-- | src/quick/util/qquicksmoothedanimation.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickspringanimation.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquicktimeline.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index a39d734de3..3a0c19e3d2 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -867,7 +867,7 @@ void QActionAnimation::updateState(State newState, State oldState) void QActionAnimation::debugAnimation(QDebug d) const { - d << "ActionAnimation(" << hex << (void *) this << dec << ")"; + d << "ActionAnimation(" << hex << (const void *) this << dec << ")"; if (animAction) { int indentLevel = 1; @@ -1960,7 +1960,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged() void QQuickBulkValueAnimator::debugAnimation(QDebug d) const { - d << "BulkValueAnimation(" << hex << (void *) this << dec << ")" << "duration:" << duration(); + d << "BulkValueAnimation(" << hex << (const void *) this << dec << ")" << "duration:" << duration(); if (animValue) { int indentLevel = 1; diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp index 71dacfcb1d..6d585d38a7 100644 --- a/src/quick/util/qquicksmoothedanimation.cpp +++ b/src/quick/util/qquicksmoothedanimation.cpp @@ -307,7 +307,7 @@ void QSmoothedAnimation::init() void QSmoothedAnimation::debugAnimation(QDebug d) const { - d << "SmoothedAnimationJob(" << hex << (void *) this << dec << ")" << "duration:" << userDuration + d << "SmoothedAnimationJob(" << hex << (const void *) this << dec << ")" << "duration:" << userDuration << "velocity:" << velocity << "target:" << target.object() << "property:" << target.name() << "to:" << to << "current velocity:" << trackVelocity; } diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp index b68afbecdd..125d6f5ef6 100644 --- a/src/quick/util/qquickspringanimation.cpp +++ b/src/quick/util/qquickspringanimation.cpp @@ -313,7 +313,7 @@ void QSpringAnimation::updateState(QAbstractAnimationJob::State newState, QAbstr void QSpringAnimation::debugAnimation(QDebug d) const { - d << "SpringAnimationJob(" << hex << (void *) this << dec << ")" << "velocity:" << maxVelocity + d << "SpringAnimationJob(" << hex << (const void *) this << dec << ")" << "velocity:" << maxVelocity << "spring:" << spring << "damping:" << damping << "epsilon:" << epsilon << "modulus:" << modulus << "mass:" << mass << "target:" << target.object() << "property:" << target.name() << "to:" << to << "current velocity:" << velocity; diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index 8cd9b349d8..74754a0bfb 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -717,7 +717,7 @@ void QQuickTimeLine::updateCurrentTime(int v) void QQuickTimeLine::debugAnimation(QDebug d) const { - d << "QuickTimeLine(" << hex << (void *) this << dec << ")"; + d << "QuickTimeLine(" << hex << (const void *) this << dec << ")"; } bool operator<(const QPair<int, Update> &lhs, |