diff --git a/src/testlib/qtesttostring.h b/src/testlib/qtesttostring.h index 80ac75dd702..0fb9132b54d 100644 --- a/src/testlib/qtesttostring.h +++ b/src/testlib/qtesttostring.h @@ -32,6 +32,7 @@ #include #include +#include QT_BEGIN_NAMESPACE @@ -321,7 +322,7 @@ struct QCborValueFormatter static char *formatTag(QCborTag tag, const QCborValue &taggedValue) { - QScopedArrayPointer hold(format(taggedValue)); + const std::unique_ptr hold(format(taggedValue)); char *buf = new char[BufferLen]; std::snprintf(buf, BufferLen, "QCborValue(QCborTag(%llu), %s)", qToUnderlying(tag), hold.get()); @@ -346,7 +347,7 @@ struct QCborValueFormatter template static char *format(QCborValue::Type type, const T &t) { - QScopedArrayPointer hold(QTest::toString(t)); + const std::unique_ptr hold(QTest::toString(t)); return innerFormat(type, hold.get()); } @@ -360,9 +361,9 @@ struct QCborValueFormatter case QCborValue::String: return format(v.type(), v.toString()); case QCborValue::Array: - return innerFormat(v.type(), QScopedArrayPointer(format(v.toArray())).get()); + return innerFormat(v.type(), std::unique_ptr(format(v.toArray())).get()); case QCborValue::Map: - return innerFormat(v.type(), QScopedArrayPointer(format(v.toMap())).get()); + return innerFormat(v.type(), std::unique_ptr(format(v.toMap())).get()); case QCborValue::Tag: return formatTag(v.tag(), v.taggedValue()); case QCborValue::SimpleType: @@ -397,7 +398,7 @@ struct QCborValueFormatter QByteArray out(1, '['); const char *comma = ""; for (QCborValueConstRef v : a) { - QScopedArrayPointer s(format(v)); + const std::unique_ptr s(format(v)); out += comma; out += s.get(); comma = ", "; @@ -411,8 +412,8 @@ struct QCborValueFormatter QByteArray out(1, '{'); const char *comma = ""; for (auto pair : m) { - QScopedArrayPointer key(format(pair.first)); - QScopedArrayPointer value(format(pair.second)); + const std::unique_ptr key(format(pair.first)); + const std::unique_ptr value(format(pair.second)); out += comma; out += key.get(); out += ": "; @@ -461,9 +462,9 @@ template char *toString(std::chrono::duration inline char *toString(const std::pair &pair) { - const QScopedArrayPointer first(toString(pair.first)); - const QScopedArrayPointer second(toString(pair.second)); - return formatString("std::pair(", ")", 2, first.data(), second.data()); + const std::unique_ptr first(toString(pair.first)); + const std::unique_ptr second(toString(pair.second)); + return formatString("std::pair(", ")", 2, first.get(), second.get()); } template