whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of tests/auto/corelib/tools with QT_STRICT_ITERATORS 

Most fixes are simple and quite obvious. The ones more involved are
the ones to QArrayData, which had probably not been compiled with
strict iterators thus far.

Change-Id: Ic4ff84c34fd9a04fd686fecaa98149b1c47c9346
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
bb10
Thiago Macieira 2012-05-31 13:51:36 +02:00 committed by Qt by Nokia
parent c5665a182d
commit 290655c8a2
3 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qarraydataops.h
View File

@ -113,7 +113,7 @@ struct QPodArrayOps
Q_ASSERT(e <= where || b > this->end()); // No overlap
Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
::memmove(where + (e - b), where, (this->end() - where) * sizeof(T));
::memmove(where + (e - b), where, (static_cast<const T*>(this->end()) - where) * sizeof(T));
::memcpy(where, b, (e - b) * sizeof(T));
this->size += (e - b);
}

58
tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
View File

@ -315,11 +315,11 @@ void tst_QArrayData::simpleVector()
QVERIFY(!v1.isSharedWith(v5));
QVERIFY(!v1.isSharedWith(v6));
QCOMPARE((void *)v1.constBegin(), (void *)v1.constEnd());
QCOMPARE((void *)v4.constBegin(), (void *)v4.constEnd());
QCOMPARE((void *)(v6.constBegin() + v6.size()), (void *)v6.constEnd());
QCOMPARE((void *)(v7.constBegin() + v7.size()), (void *)v7.constEnd());
QCOMPARE((void *)(v8.constBegin() + v8.size()), (void *)v8.constEnd());
QCOMPARE(v1.constBegin(), v1.constEnd());
QCOMPARE(v4.constBegin(), v4.constEnd());
QCOMPARE((v6.constBegin() + v6.size()), v6.constEnd());
QCOMPARE((v7.constBegin() + v7.size()), v7.constEnd());
QCOMPARE((v8.constBegin() + v8.size()), v8.constEnd());
QVERIFY(v1 == v2);
QVERIFY(v1 == v3);
@ -370,7 +370,7 @@ void tst_QArrayData::simpleVector()
}
// A single detach should do
QCOMPARE(temp.begin(), tempBegin);
QCOMPARE((const int *)temp.begin(), tempBegin);
}
{
@ -426,6 +426,7 @@ void tst_QArrayData::simpleVector()
v1.clear();
v1.append(array, array + sizeof(array)/sizeof(array[0]));
// v1 is now [0 .. 9]
QCOMPARE(v1.size(), size_t(10));
QVERIFY(v1 == v8);
@ -433,6 +434,7 @@ void tst_QArrayData::simpleVector()
QVERIFY(v1.isSharedWith(v6));
v1.append(array, array + sizeof(array)/sizeof(array[0]));
// v1 is now [0 .. 9, 0 .. 9]
QVERIFY(!v1.isSharedWith(v6));
QCOMPARE(v1.size(), size_t(20));
QCOMPARE(v6.size(), size_t(10));
@ -441,29 +443,49 @@ void tst_QArrayData::simpleVector()
QCOMPARE(v1[i], v6[i % 10]);
v1.insert(0, v6.constBegin(), v6.constEnd());
// v1 is now [ 0 .. 9, 0 .. 9, 0 .. 9]
QCOMPARE(v1.size(), size_t(30));
for (int i = 0; i < 30; ++i)
QCOMPARE(v1[i], v8[i % 10]);
v6 = v1;
QVERIFY(v1.isSharedWith(v6));
v1.insert(10, v6.constBegin(), v6.constEnd());
// v1 is now [ 0..9, <new data>0..9, 0..9, 0..9</new data>, 0..9, 0..9 ]
QVERIFY(!v1.isSharedWith(v6));
QCOMPARE(v1.size(), size_t(60));
QCOMPARE(v6.size(), size_t(30));
for (int i = 0; i < 30; ++i)
QCOMPARE(v6[i], v8[i % 10]);
for (int i = 0; i < 60; ++i)
QCOMPARE(v1[i], v8[i % 10]);
v1.insert(v1.size(), v6.constBegin(), v6.constEnd());
// v1 is now [ 0..9 x 6, <new data>0..9 x 3</new data> ]
QCOMPARE(v1.size(), size_t(90));
for (int i = 0; i < 90; ++i)
QCOMPARE(v1[i], v8[i % 10]);
v1.insert(-1, v8.constBegin(), v8.constEnd());
// v1 is now [ 0..9 x 9, <new data>0..9</new data> ]
QCOMPARE(v1.size(), size_t(100));
for (int i = 0; i < 100; ++i)
QCOMPARE(v1[i], v8[i % 10]);
v1.insert(-11, v8.constBegin(), v8.constEnd());
// v1 is now [ 0..9 x 9, <new data>0..9</new data>, 0..9 ]
QCOMPARE(v1.size(), size_t(110));
for (int i = 0; i < 110; ++i)
QCOMPARE(v1[i], v8[i % 10]);
v1.insert(-200, v8.constBegin(), v8.constEnd());
// v1 is now [ <new data>0..9</new data>, 0..9 x 11 ]
QCOMPARE(v1.size(), size_t(120));
for (int i = 0; i < 120; ++i)
@ -772,7 +794,7 @@ void tst_QArrayData::typedData()
int j = 0;
for (QTypedArrayData<int>::iterator iter = array->begin();
iter != array->end(); ++iter, ++j)
QCOMPARE(iter, data.data + j);
QCOMPARE((const int *)iter, data.data + j);
QCOMPARE(j, 10);
}
@ -785,7 +807,7 @@ void tst_QArrayData::typedData()
int j = 0;
for (QTypedArrayData<int>::const_iterator iter = array->begin();
iter != array->end(); ++iter, ++j)
QCOMPARE(iter, data.data + j);
QCOMPARE((const int *)iter, data.data + j);
QCOMPARE(j, 10);
}
@ -1356,8 +1378,8 @@ void tst_QArrayData::fromRawData()
sizeof(array)/sizeof(array[0]), QArrayData::Default);
QCOMPARE(raw.size(), size_t(11));
QCOMPARE(raw.constBegin(), array);
QCOMPARE((void *)raw.constEnd(), (void *)(array + sizeof(array)/sizeof(array[0])));
QCOMPARE((const int *)raw.constBegin(), array);
QCOMPARE((const int *)raw.constEnd(), (const int *)(array + sizeof(array)/sizeof(array[0])));
QVERIFY(!raw.isShared());
QVERIFY(SimpleVector<int>(raw).isSharedWith(raw));
@ -1365,7 +1387,7 @@ void tst_QArrayData::fromRawData()
// Detach
QCOMPARE(raw.back(), 11);
QVERIFY(raw.constBegin() != array);
QVERIFY((const int *)raw.constBegin() != array);
}
{
@ -1374,8 +1396,8 @@ void tst_QArrayData::fromRawData()
sizeof(array)/sizeof(array[0]), QArrayData::Unsharable);
QCOMPARE(raw.size(), size_t(11));
QCOMPARE(raw.constBegin(), array);
QCOMPARE((void *)raw.constEnd(), (void *)(array + sizeof(array)/sizeof(array[0])));
QCOMPARE((const int *)raw.constBegin(), array);
QCOMPARE((const int *)raw.constEnd(), (const int *)(array + sizeof(array)/sizeof(array[0])));
SimpleVector<int> copy(raw);
QVERIFY(!copy.isSharedWith(raw));
@ -1387,12 +1409,12 @@ void tst_QArrayData::fromRawData()
QCOMPARE(const_(copy)[i], const_(raw)[i]);
QCOMPARE(raw.size(), size_t(11));
QCOMPARE(raw.constBegin(), array);
QCOMPARE((void *)raw.constEnd(), (void *)(array + sizeof(array)/sizeof(array[0])));
QCOMPARE((const int *)raw.constBegin(), array);
QCOMPARE((const int *)raw.constEnd(), (const int *)(array + sizeof(array)/sizeof(array[0])));
// Detach
QCOMPARE(raw.back(), 11);
QVERIFY(raw.constBegin() != array);
QVERIFY((const int *)raw.constBegin() != array);
}
}
@ -1427,7 +1449,7 @@ void tst_QArrayData::literals()
#endif
QVERIFY(v.isSharable());
QCOMPARE((void *)(v.constBegin() + v.size()), (void *)v.constEnd());
QCOMPARE((const char *)(v.constBegin() + v.size()), (const char *)v.constEnd());
for (int i = 0; i < 10; ++i)
QCOMPARE(const_(v)[i], char('A' + i));
@ -1476,7 +1498,7 @@ void tst_QArrayData::variadicLiterals()
QVERIFY(v.isStatic());
QVERIFY(v.isSharable());
QCOMPARE((void *)(v.constBegin() + v.size()), (void *)v.constEnd());
QCOMPARE((const int *)(v.constBegin() + v.size()), (const int *)v.constEnd());
for (int i = 0; i < 7; ++i)
QCOMPARE(const_(v)[i], i);

8
tests/auto/corelib/tools/qhash/tst_qhash.cpp
View File

@ -395,8 +395,8 @@ void tst_QHash::insert1()
QVERIFY(count == 2);
count = 0;
it1 = hash.begin();
while (it1 != hash.end()) {
it1 = hash.constBegin();
while (it1 != hash.constEnd()) {
count++;
++it1;
}
@ -606,9 +606,9 @@ void tst_QHash::find()
map1.insertMulti(4, compareString);
}
QHash<int, QString>::const_iterator it=map1.find(4);
QHash<int, QString>::const_iterator it=map1.constFind(4);
for(i = 9; i > 2 && it != map1.end() && it.key() == 4; --i) {
for(i = 9; i > 2 && it != map1.constEnd() && it.key() == 4; --i) {
compareString = testString.arg(i);
QVERIFY(it.value() == compareString);
++it;