diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-07-17 11:47:05 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-07-17 17:09:38 +0100 |
| commit | 63f3272563fe1bddee183bb15e4e1399303811f8 (patch) | |
| tree | a0148ce921b6b9468fd2933874435f10a273945f /src/animation | |
| parent | 13067bf7313e2e0e9c16e952bc97dd8854695967 (diff) | |
Fix build to change in typeof QList::size()
Change-Id: Ib480a8eef157102df8f89a75983cd4d8d46a9388
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/backend/functionrangefinder.cpp | 4 | ||||
| -rw-r--r-- | src/animation/frontend/qanimationclipdata.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/animation/backend/functionrangefinder.cpp b/src/animation/backend/functionrangefinder.cpp index af695b7c1..ed0ce1bea 100644 --- a/src/animation/backend/functionrangefinder.cpp +++ b/src/animation/backend/functionrangefinder.cpp @@ -104,7 +104,7 @@ int FunctionRangeFinder::locate(float x) const m_correlated = std::abs(jLower - m_previousLowerBound) <= m_correlationThreshold; m_previousLowerBound = jLower; - return std::max(0, std::min(m_x.size() - m_rangeSize, jLower - ((m_rangeSize - 2) >> 1))); + return qMax(0, qMin(m_x.size() - m_rangeSize, jLower - ((m_rangeSize - 2) >> 1))); } /*! @@ -165,7 +165,7 @@ int FunctionRangeFinder::hunt(float x) const m_correlated = std::abs(jLower - m_previousLowerBound) <= m_correlationThreshold; m_previousLowerBound = jLower; - return std::max(0, std::min(m_x.size() - m_rangeSize, jLower - ((m_rangeSize - 2) >> 1))); + return qMax(0, qMin(m_x.size() - m_rangeSize, jLower - ((m_rangeSize - 2) >> 1))); } } // namespace Animation diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h index d0e35527e..9a5d92132 100644 --- a/src/animation/frontend/qanimationclipdata.h +++ b/src/animation/frontend/qanimationclipdata.h @@ -50,6 +50,10 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { class QAnimationClipDataPrivate; +class QAnimationClipData; + +bool Q_3DANIMATIONSHARED_EXPORT operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW; +bool Q_3DANIMATIONSHARED_EXPORT operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW; class Q_3DANIMATIONSHARED_EXPORT QAnimationClipData { |