diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 8d01b7ec12..3e98de41f4 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -508,10 +508,10 @@ inline void QVector::remove(int i, int n) template inline void QVector::prepend(const T &t) -{ insert(begin(), 1, t); } +{ insert(0, 1, t); } template void QVector::prepend(rvalue_ref t) -{ insert(begin(), std::move(t)); } +{ insert(0, std::move(t)); } template inline T QVector::value(int i, const T &defaultValue) const @@ -618,8 +618,8 @@ QVector::insert(int i, rvalue_ref t) template typename QVector::iterator QVector::erase(iterator abegin, iterator aend) { - Q_ASSERT_X(isValidIterator(abegin), "QVector::erase", "The specified iterator argument 'abegin' is invalid"); - Q_ASSERT_X(isValidIterator(aend), "QVector::erase", "The specified iterator argument 'aend' is invalid"); + Q_ASSERT_X(isValidIterator(const_iterator(abegin)), "QVector::erase", "The specified iterator argument 'abegin' is invalid"); + Q_ASSERT_X(isValidIterator(const_iterator(aend)), "QVector::erase", "The specified iterator argument 'aend' is invalid"); Q_ASSERT(aend >= abegin); // d.begin() so we don't detach just yet