summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/tools/qarraydata/simplevector.h11
-rw-r--r--tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp16
2 files changed, 11 insertions, 16 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h
index 152bf02ce3..1dc9be765c 100644
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@@ -216,15 +216,10 @@ public:
auto requiredSize = qsizetype(last - first);
if (d->needsDetach() || d.freeSpaceAtEnd() < requiredSize) {
- SimpleVector detached(DataPointer::allocateGrow(d, requiredSize, QArrayData::GrowsAtEnd));
-
- if (d->size) {
- const T *const begin = constBegin();
- detached.d->copyAppend(begin, begin + d->size);
- }
- detached.d->copyAppend(first, last);
- detached.swap(*this);
+ DataPointer oldData;
+ d.reallocateAndGrow(QArrayData::GrowsAtEnd, requiredSize, &oldData);
+ d->copyAppend(first, last);
return;
}
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 68e8a26cb2..e5acee6971 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -1632,7 +1632,7 @@ void tst_QArrayData::arrayOpsExtra()
const size_t originalSize = dataPointer.size;
auto copy = cloneArrayDataPointer(dataPointer, dataPointer.size);
- dataPointer->emplace(dataPointer.begin() + pos, value);
+ dataPointer->emplace(pos, value);
QCOMPARE(size_t(dataPointer.size), originalSize + 1);
size_t i = 0;
for (; i < pos; ++i)
@@ -2136,7 +2136,7 @@ struct MyQStringWrapper : public QString
bool movedFrom = false;
MyQStringWrapper() = default;
MyQStringWrapper(QChar c) : QString(c) { }
- MyQStringWrapper(MyQStringWrapper &&other) : QString(std::move(static_cast<QString>(other)))
+ MyQStringWrapper(MyQStringWrapper &&other) : QString(std::move(static_cast<QString &>(other)))
{
movedTo = true;
movedFrom = other.movedFrom;
@@ -2144,7 +2144,7 @@ struct MyQStringWrapper : public QString
}
MyQStringWrapper &operator=(MyQStringWrapper &&other)
{
- QString::operator=(std::move(static_cast<QString>(other)));
+ QString::operator=(std::move(static_cast<QString &>(other)));
movedTo = true;
movedFrom = other.movedFrom;
other.movedFrom = true;
@@ -2216,13 +2216,13 @@ void tst_QArrayData::selfEmplaceBackwards()
QVERIFY(!adp.freeSpaceAtEnd());
QVERIFY(adp.freeSpaceAtBegin());
- adp->emplace(adp.end(), adp.data()[0]);
+ adp->emplace(adp.size, adp.data()[0]);
for (qsizetype i = 0; i < adp.size - 1; ++i) {
QCOMPARE(adp.data()[i], initValues[i]);
}
QCOMPARE(adp.data()[adp.size - 1], initValues[0]);
- adp->emplace(adp.end(), std::move(adp.data()[0]));
+ adp->emplace(adp.size, std::move(adp.data()[0]));
for (qsizetype i = 1; i < adp.size - 2; ++i) {
QCOMPARE(adp.data()[i], initValues[i]);
}
@@ -2259,14 +2259,14 @@ void tst_QArrayData::selfEmplaceForward()
QVERIFY(!adp.freeSpaceAtBegin());
QVERIFY(adp.freeSpaceAtEnd());
- adp->emplace(adp.begin(), adp.data()[adp.size - 1]);
+ adp->emplace(0, adp.data()[adp.size - 1]);
for (qsizetype i = 1; i < adp.size; ++i) {
QCOMPARE(adp.data()[i], initValues[i - 1]);
}
QCOMPARE(adp.data()[0], initValues[spaceAtBegin - 1]);
- adp->emplace(adp.begin(), std::move(adp.data()[adp.size - 1]));
- for (qsizetype i = 2; i < adp.size; ++i) {
+ adp->emplace(0, std::move(adp.data()[adp.size - 1]));
+ for (qsizetype i = 2; i < adp.size - 1; ++i) {
QCOMPARE(adp.data()[i], initValues[i - 2]);
}
QCOMPARE(adp.data()[1], initValues[spaceAtBegin - 1]);