diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index d776c04f72..8ef6c23d19 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -46,6 +46,8 @@ #include <QtCore/qline.h> #include <QtCore/qmutex.h> +#include <algorithm> + #ifndef QT_NO_ANIMATION QT_BEGIN_NAMESPACE @@ -243,10 +245,10 @@ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/) if (force || (currentInterval.start.first > 0 && progress < currentInterval.start.first) || (currentInterval.end.first < 1 && progress > currentInterval.end.first)) { //let's update currentInterval - QVariantAnimation::KeyValues::const_iterator it = qLowerBound(keyValues.constBegin(), - keyValues.constEnd(), - qMakePair(progress, QVariant()), - animationValueLessThan); + QVariantAnimation::KeyValues::const_iterator it = std::lower_bound(keyValues.constBegin(), + keyValues.constEnd(), + qMakePair(progress, QVariant()), + animationValueLessThan); if (it == keyValues.constBegin()) { //the item pointed to by it is the start element in the range if (it->first == 0 && keyValues.count() > 1) { @@ -321,7 +323,7 @@ void QVariantAnimationPrivate::setValueAt(qreal step, const QVariant &value) QVariantAnimation::KeyValue pair(step, value); - QVariantAnimation::KeyValues::iterator result = qLowerBound(keyValues.begin(), keyValues.end(), pair, animationValueLessThan); + QVariantAnimation::KeyValues::iterator result = std::lower_bound(keyValues.begin(), keyValues.end(), pair, animationValueLessThan); if (result == keyValues.end() || result->first != step) { keyValues.insert(result, pair); } else { diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 60cfae473d..1c0b905398 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -916,7 +916,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \snippet code/src_corelib_tools_qmap.cpp 16 - \sa qLowerBound(), upperBound(), find() + \sa upperBound(), find() */ /*! \fn QMap::const_iterator QMap::lowerBound(const Key &key) const |