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

Replace deprecated APIs in metatype/variant benchmarks

Browse Source 
Fix compiler warnings.

Change-Id: Id09b414f530a0d35c1a79e32112ff59185be2bc3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Volker Hilsheimer 2021-04-14 13:56:37 +02:00
parent 1359238572
commit 1d3fe418e2
4 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
View File

@ -85,9 +85,8 @@ void tst_QMetaType::typeBuiltin_data()
{ {
QTest::addColumn<QByteArray>("typeName"); QTest::addColumn<QByteArray>("typeName");
for (int i = 0; i < QMetaType::User; ++i) { for (int i = 0; i < QMetaType::User; ++i) {
const char *name = QMetaType::typeName(i); if (QMetaType metaType(i); metaType.isValid())
if (name) QTest::newRow(metaType.name()) << QByteArray(metaType.name());
QTest::newRow(name) << QByteArray(name);
} }
} }
@ -98,7 +97,7 @@ void tst_QMetaType::typeBuiltin()
const char *nm = typeName.constData(); const char *nm = typeName.constData();
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) for (int i = 0; i < 100000; ++i)
QMetaType::type(nm); QMetaType::fromName(nm);
} }
} }
@ -113,7 +112,7 @@ void tst_QMetaType::typeBuiltin_QByteArray()
QFETCH(QByteArray, typeName); QFETCH(QByteArray, typeName);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) for (int i = 0; i < 100000; ++i)
QMetaType::type(typeName); QMetaType::fromName(typeName);
} }
} }
@ -121,9 +120,8 @@ void tst_QMetaType::typeBuiltinNotNormalized_data()
{ {
QTest::addColumn<QByteArray>("typeName"); QTest::addColumn<QByteArray>("typeName");
for (int i = 0; i < QMetaType::User; ++i) { for (int i = 0; i < QMetaType::User; ++i) {
const char *name = QMetaType::typeName(i); if (QMetaType metaType(i); metaType.isValid())
if (name) QTest::newRow(metaType.name()) << QByteArray(metaType.name()).append(" ");
QTest::newRow(name) << QByteArray(name).append(" ");
} }
} }
@ -133,7 +131,7 @@ void tst_QMetaType::typeBuiltinNotNormalized()
const char *nm = typeName.constData(); const char *nm = typeName.constData();
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
QMetaType::type(nm); QMetaType::fromName(nm);
} }
} }
@ -144,7 +142,7 @@ void tst_QMetaType::typeCustom()
qRegisterMetaType<Foo>("Foo"); qRegisterMetaType<Foo>("Foo");
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
QMetaType::type("Foo"); QMetaType::fromName("Foo");
} }
} }
@ -153,25 +151,25 @@ void tst_QMetaType::typeCustomNotNormalized()
qRegisterMetaType<Foo>("Foo"); qRegisterMetaType<Foo>("Foo");
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
QMetaType::type("Foo "); QMetaType::fromName("Foo ");
} }
} }
void tst_QMetaType::typeNotRegistered() void tst_QMetaType::typeNotRegistered()
{ {
Q_ASSERT(QMetaType::type("Bar") == 0); Q_ASSERT(!QMetaType::fromName("Bar").isValid());
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
QMetaType::type("Bar"); QMetaType::fromName("Bar");
} }
} }
void tst_QMetaType::typeNotRegisteredNotNormalized() void tst_QMetaType::typeNotRegisteredNotNormalized()
{ {
Q_ASSERT(QMetaType::type("Bar") == 0); Q_ASSERT(!QMetaType::fromName("Bar").isValid());
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
QMetaType::type("Bar "); QMetaType::fromName("Bar ");
} }
} }
@ -179,9 +177,8 @@ void tst_QMetaType::typeNameBuiltin_data()
{ {
QTest::addColumn<int>("type"); QTest::addColumn<int>("type");
for (int i = 0; i < QMetaType::User; ++i) { for (int i = 0; i < QMetaType::User; ++i) {
const char *name = QMetaType::typeName(i); if (QMetaType metaType(i); metaType.isValid())
if (name) QTest::newRow(metaType.name()) << i;
QTest::newRow(name) << i;
} }
} }
@ -190,7 +187,7 @@ void tst_QMetaType::typeNameBuiltin()
QFETCH(int, type); QFETCH(int, type);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 500000; ++i) for (int i = 0; i < 500000; ++i)
QMetaType::typeName(type); QMetaType(type).name();
} }
} }
@ -199,17 +196,17 @@ void tst_QMetaType::typeNameCustom()
int type = qRegisterMetaType<Foo>("Foo"); int type = qRegisterMetaType<Foo>("Foo");
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) for (int i = 0; i < 100000; ++i)
QMetaType::typeName(type); QMetaType(type).name();
} }
} }
void tst_QMetaType::typeNameNotRegistered() void tst_QMetaType::typeNameNotRegistered()
{ {
// We don't care much about this case, but test it anyway. // We don't care much about this case, but test it anyway.
Q_ASSERT(QMetaType::typeName(-1) == 0); Q_ASSERT(QMetaType(-1).name() == nullptr);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 500000; ++i) for (int i = 0; i < 500000; ++i)
QMetaType::typeName(-1); QMetaType(-1).name();
} }
} }
@ -238,7 +235,7 @@ void tst_QMetaType::isRegisteredCustom()
void tst_QMetaType::isRegisteredNotRegistered() void tst_QMetaType::isRegisteredNotRegistered()
{ {
Q_ASSERT(QMetaType::typeName(-1) == 0); Q_ASSERT(QMetaType(-1).name() == nullptr);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) for (int i = 0; i < 100000; ++i)
QMetaType::isRegistered(-1); QMetaType::isRegistered(-1);
@ -249,7 +246,7 @@ void tst_QMetaType::constructInPlace_data()
{ {
QTest::addColumn<int>("typeId"); QTest::addColumn<int>("typeId");
for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) { for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) {
auto name = QMetaType::typeName(i); auto name = QMetaType(i).name();
if (name && i != QMetaType::Void) if (name && i != QMetaType::Void)
QTest::newRow(name) << i; QTest::newRow(name) << i;
} }
@ -261,14 +258,15 @@ void tst_QMetaType::constructInPlace_data()
void tst_QMetaType::constructInPlace() void tst_QMetaType::constructInPlace()
{ {
QFETCH(int, typeId); QFETCH(int, typeId);
int size = QMetaType::sizeOf(typeId); const QMetaType metaType(typeId);
size_t size = metaType.sizeOf();
void *storage = qMallocAligned(size, 2 * sizeof(qlonglong)); void *storage = qMallocAligned(size, 2 * sizeof(qlonglong));
QCOMPARE(QMetaType::construct(typeId, storage, /*copy=*/0), storage); QCOMPARE(metaType.construct(storage, /*copy=*/0), storage);
QMetaType::destruct(typeId, storage); metaType.destruct(storage);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) { for (int i = 0; i < 100000; ++i) {
QMetaType::construct(typeId, storage, /*copy=*/0); metaType.construct(storage, /*copy=*/0);
QMetaType::destruct(typeId, storage); metaType.destruct(storage);
} }
} }
qFreeAligned(storage); qFreeAligned(storage);
@ -282,18 +280,19 @@ void tst_QMetaType::constructInPlaceCopy_data()
void tst_QMetaType::constructInPlaceCopy() void tst_QMetaType::constructInPlaceCopy()
{ {
QFETCH(int, typeId); QFETCH(int, typeId);
int size = QMetaType::sizeOf(typeId); const QMetaType metaType(typeId);
size_t size = metaType.sizeOf();
void *storage = qMallocAligned(size, 2 * sizeof(qlonglong)); void *storage = qMallocAligned(size, 2 * sizeof(qlonglong));
void *other = QMetaType::create(typeId); void *other = metaType.create();
QCOMPARE(QMetaType::construct(typeId, storage, other), storage); QCOMPARE(metaType.construct(storage, other), storage);
QMetaType::destruct(typeId, storage); metaType.destruct(storage);
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 100000; ++i) { for (int i = 0; i < 100000; ++i) {
QMetaType::construct(typeId, storage, other); metaType.construct(storage, other);
QMetaType::destruct(typeId, storage); metaType.destruct(storage);
} }
} }
QMetaType::destroy(typeId, other); metaType.destroy(other);
qFreeAligned(storage); qFreeAligned(storage);
} }
@ -305,19 +304,19 @@ void tst_QMetaType::constructInPlaceCopyStaticLess_data()
void tst_QMetaType::constructInPlaceCopyStaticLess() void tst_QMetaType::constructInPlaceCopyStaticLess()
{ {
QFETCH(int, typeId); QFETCH(int, typeId);
int size = QMetaType::sizeOf(typeId); const QMetaType metaType(typeId);
size_t size = metaType.sizeOf();
void *storage = qMallocAligned(size, 2 * sizeof(qlonglong)); void *storage = qMallocAligned(size, 2 * sizeof(qlonglong));
void *other = QMetaType::create(typeId); void *other = metaType.create();
QCOMPARE(QMetaType::construct(typeId, storage, other), storage); QCOMPARE(metaType.construct(storage, other), storage);
QMetaType::destruct(typeId, storage); metaType.destruct(storage);
QBENCHMARK { QBENCHMARK {
QMetaType type(typeId);
for (int i = 0; i < 100000; ++i) { for (int i = 0; i < 100000; ++i) {
type.construct(storage, other); metaType.construct(storage, other);
type.destruct(storage); metaType.destruct(storage);
} }
} }
QMetaType::destroy(typeId, other); metaType.destroy(other);
qFreeAligned(storage); qFreeAligned(storage);
} }

4
tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -337,8 +337,8 @@ void tst_qvariant::createCoreType_data()
{ {
QTest::addColumn<int>("typeId"); QTest::addColumn<int>("typeId");
for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) { for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) {
if (QMetaType::typeName(i)) // QMetaType(27) does not exist if (QMetaType metaType(i); metaType.isValid()) // QMetaType(27) does not exist
QTest::newRow(QMetaType::typeName(i)) << i; QTest::newRow(metaType.typeName(i)) << i;
} }
} }

5
tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
View File

@ -48,9 +48,8 @@ void tst_QGuiMetaType::constructableGuiTypes()
{ {
QTest::addColumn<int>("typeId"); QTest::addColumn<int>("typeId");
for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) { for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) {
QMetaType metaType(i); if (QMetaType metaType(i); metaType.isValid())
if (metaType.isValid()) QTest::newRow(metaType.name()) << i;
QTest::newRow(QMetaType::typeName(i)) << i;
} }
} }

5
tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp
View File

@ -58,9 +58,8 @@ void tst_QGuiVariant::createGuiType_data()
{ {
QTest::addColumn<int>("typeId"); QTest::addColumn<int>("typeId");
for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) { for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) {
QMetaType metaType(i); if (QMetaType metaType(i); metaType.isValid())
if (metaType.isValid()) QTest::newRow(metaType.name()) << i;
QTest::newRow(QMetaType::typeName(i)) << i;
} }
} }