diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-02-20 16:13:12 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2018-02-20 19:16:01 +0000 |
| commit | 5c8416f270e3e3eeeb84f714992646e17a7f7351 (patch) | |
| tree | 5f4af422be29a978f9df506ebafbc843cc756806 /src/runtime/q3dsanimationmanager.cpp | |
| parent | 0e509d468cd7c6daf7325edb84e5d5623c645d91 (diff) | |
Q3DSUipPresentation: unify to constref from constptr return values
since other parts (e.g. effects, custom materials) already do this.
In practice the calling code gets nicer usually since the dereferencing
can be dropped.
Task-number: QT3DS-1175
Change-Id: I81e678db13057989f81273cfd3566310d93c5911
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/runtime/q3dsanimationmanager.cpp')
| -rw-r--r-- | src/runtime/q3dsanimationmanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/runtime/q3dsanimationmanager.cpp b/src/runtime/q3dsanimationmanager.cpp index ad7cc97..9dac47c 100644 --- a/src/runtime/q3dsanimationmanager.cpp +++ b/src/runtime/q3dsanimationmanager.cpp @@ -318,7 +318,7 @@ void Q3DSAnimationManager::updateAnimationHelper(const AnimationTrackListMap<T * ChannelComponents &c(channelData[animMeta->name]); c.meta = *animMeta; - for (const Q3DSAnimationTrack::KeyFrame &kf : *animTrack->keyFrames()) { + for (const Q3DSAnimationTrack::KeyFrame &kf : animTrack->keyFrames()) { Qt3DAnimation::QKeyFrame qkf; #if 0 // ### not supported yet, fix Qt3D first switch (animTrack->type()) { @@ -442,15 +442,15 @@ void Q3DSAnimationManager::clearAnimations(Q3DSSlide *slide) Q3DSSlide *masterSlide = static_cast<Q3DSSlide *>(slide->parent()); - const bool hasAnimationData = !slide->animations()->isEmpty() - || !(masterSlide && masterSlide->animations()->isEmpty()); + const bool hasAnimationData = !slide->animations().isEmpty() + || !(masterSlide && masterSlide->animations().isEmpty()); if (!hasAnimationData) return; - const auto clearAndRollback = [this](const QVector<Q3DSAnimationTrack> *anims, Q3DSSlide *slide) { + const auto clearAndRollback = [this](const QVector<Q3DSAnimationTrack> &anims, Q3DSSlide *slide) { // Rollback properties - for (const Q3DSAnimationTrack &track : *anims) { + for (const Q3DSAnimationTrack &track : anims) { Q3DSGraphObjectAttached *data = track.target()->attached(); Q3DSGraphObjectAttached::AnimationData *animationData = data->animationDataMap.value(slide); if (animationData) { @@ -507,7 +507,7 @@ static void buildClipAnimator(Q3DSSlide *slide) float startTime = 0.0f; float endTime = 0.0f; bool found = false; - for (Q3DSGraphObject *obj : slide->propertyChanges()->keys()) { + for (Q3DSGraphObject *obj : slide->propertyChanges().keys()) { if (obj->type() == Q3DSGraphObject::Layer) { if (startTime < obj->startTime()) { found = true; @@ -582,8 +582,8 @@ void Q3DSAnimationManager::updateAnimations(Q3DSSlide *slide) Q3DSSlide *masterSlide = static_cast<Q3DSSlide *>(slide->parent()); - const bool hasAnimationData = !slide->animations()->isEmpty() - || !(masterSlide && masterSlide->animations()->isEmpty()); + const bool hasAnimationData = !slide->animations().isEmpty() + || !(masterSlide && masterSlide->animations().isEmpty()); if (!hasAnimationData) return; @@ -606,7 +606,7 @@ void Q3DSAnimationManager::updateAnimations(Q3DSSlide *slide) if (!slide) return; - const QVector<Q3DSAnimationTrack> &anims = *slide->animations(); + const QVector<Q3DSAnimationTrack> &anims = slide->animations(); for (const Q3DSAnimationTrack &animTrack : anims) { Q3DSGraphObject *target = animTrack.target(); switch (target->type()) { |