1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix comile issues with VS 2017

Browse Source 
'QTypedArrayData<T>::iterator QVector<T>::insert(int,QItemSelectionRange &&)': cannot convert argument 1 from 'QTypedArrayData<T>::iterator' to 'int'
'bool QVector<QItemSelectionRange>::isValidIterator(QTypedArrayData<T>::const_iterator) const': cannot convert argument 1 from 'QTypedArrayData<T>::iterator' to 'QTypedArrayData<T>::const_iterator'

Change-Id: Id43ca5a9cd7b5709d47515ffdab3896feb298087
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Karsten Heimrich 2020-01-07 14:52:53 +01:00
parent 8040f11f1d
commit 84bf4d90b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qvector.h
View File

@ -508,10 +508,10 @@ inline void QVector<T>::remove(int i, int n)
template <typename T>
inline void QVector<T>::prepend(const T &t)
{ insert(begin(), 1, t); }
{ insert(0, 1, t); }
template <typename T>
void QVector<T>::prepend(rvalue_ref t)
{ insert(begin(), std::move(t)); }
{ insert(0, std::move(t)); }
template<typename T>
inline T QVector<T>::value(int i, const T &defaultValue) const
@ -618,8 +618,8 @@ QVector<T>::insert(int i, rvalue_ref t)
template <typename T>
typename QVector<T>::iterator QVector<T>::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