From e5ce564b1d2f2818c36ffbabbaa558c091512e66 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 6 Oct 2011 13:25:58 +0200 Subject: Rename QMetaType::construct() to create() create() is symmetric with destroy(). Also rename the internal methods and fields to be consistent (qDeleteHelper already had the "right" name, though!). This change will allow us to use construct() and destruct() for something else: Placement new-style allocation (QTBUG-12574). The old construct() is still kept for now, until the other repositories have been updated to use create(). Change-Id: Iceb184af6cffcb0a634359cfc3516c718ba0c2f5 Reviewed-on: http://codereview.qt-project.org/6342 Sanity-Review: Qt Sanity Bot Reviewed-by: Lars Knoll --- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 14 +++++++------- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 14 +++++++------- .../benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- .../gui/kernel/qguimetatype/tst_qguimetatype.cpp | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 3fb60acf57..13d3dede99 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -72,7 +72,7 @@ private slots: void normalizedTypes(); void typeName_data(); void typeName(); - void construct(); + void create(); void typedefs(); void isRegistered_data(); void isRegistered(); @@ -133,15 +133,15 @@ protected: ++failureCount; qWarning() << "Wrong typeName returned for" << tp; } - void *buf = QMetaType::construct(tp, 0); - void *buf2 = QMetaType::construct(tp, buf); + void *buf = QMetaType::create(tp, 0); + void *buf2 = QMetaType::create(tp, buf); if (!buf) { ++failureCount; - qWarning() << "Null buffer returned by QMetaType::construct(tp, 0)"; + qWarning() << "Null buffer returned by QMetaType::create(tp, 0)"; } if (!buf2) { ++failureCount; - qWarning() << "Null buffer returned by QMetaType::construct(tp, buf)"; + qWarning() << "Null buffer returned by QMetaType::create(tp, buf)"; } QMetaType::destroy(tp, buf); QMetaType::destroy(tp, buf2); @@ -268,10 +268,10 @@ void tst_QMetaType::typeName() QCOMPARE(QString::fromLatin1(QMetaType::typeName(aType)), aTypeName); } -void tst_QMetaType::construct() +void tst_QMetaType::create() { QSize x(1, 1); - void *size = QMetaType::construct(QMetaType::QSize, &x); + void *size = QMetaType::create(QMetaType::QSize, &x); QVERIFY(size); QCOMPARE(static_cast(size)->width(), 1); QMetaType::destroy(QMetaType::QSize, size); diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index b1236d2ed6..ec05c88660 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -1298,7 +1298,7 @@ void tst_QVariant::matrix() qVariantSetValue(variant, QMatrix().rotate(90)); QCOMPARE(QMatrix().rotate(90), qVariantValue(variant)); - void *mmatrix = QMetaType::construct(QVariant::Matrix, 0); + void *mmatrix = QMetaType::create(QVariant::Matrix, 0); QVERIFY(mmatrix); QMetaType::destroy(QVariant::Matrix, mmatrix); } @@ -1313,7 +1313,7 @@ void tst_QVariant::matrix4x4() qVariantSetValue(variant, m); QCOMPARE(m, qVariantValue(variant)); - void *mmatrix = QMetaType::construct(QVariant::Matrix4x4, 0); + void *mmatrix = QMetaType::create(QVariant::Matrix4x4, 0); QVERIFY(mmatrix); QMetaType::destroy(QVariant::Matrix4x4, mmatrix); } @@ -1326,7 +1326,7 @@ void tst_QVariant::transform() qVariantSetValue(variant, QTransform().rotate(90)); QCOMPARE(QTransform().rotate(90), qVariantValue(variant)); - void *mmatrix = QMetaType::construct(QVariant::Transform, 0); + void *mmatrix = QMetaType::create(QVariant::Transform, 0); QVERIFY(mmatrix); QMetaType::destroy(QVariant::Transform, mmatrix); } @@ -1340,7 +1340,7 @@ void tst_QVariant::vector2D() qVariantSetValue(variant, QVector2D(0.1, 0.2)); QCOMPARE(QVector2D(0.1, 0.2), qVariantValue(variant)); - void *pvector = QMetaType::construct(QVariant::Vector2D, 0); + void *pvector = QMetaType::create(QVariant::Vector2D, 0); QVERIFY(pvector); QMetaType::destroy(QVariant::Vector2D, pvector); } @@ -1353,7 +1353,7 @@ void tst_QVariant::vector3D() qVariantSetValue(variant, QVector3D(0.1, 0.2, 0.3)); QCOMPARE(QVector3D(0.1, 0.2, 0.3), qVariantValue(variant)); - void *pvector = QMetaType::construct(QVariant::Vector3D, 0); + void *pvector = QMetaType::create(QVariant::Vector3D, 0); QVERIFY(pvector); QMetaType::destroy(QVariant::Vector3D, pvector); } @@ -1366,7 +1366,7 @@ void tst_QVariant::vector4D() qVariantSetValue(variant, QVector4D(0.1, 0.2, 0.3, 0.4)); QCOMPARE(QVector4D(0.1, 0.2, 0.3, 0.4), qVariantValue(variant)); - void *pvector = QMetaType::construct(QVariant::Vector4D, 0); + void *pvector = QMetaType::create(QVariant::Vector4D, 0); QVERIFY(pvector); QMetaType::destroy(QVariant::Vector4D, pvector); } @@ -1379,7 +1379,7 @@ void tst_QVariant::quaternion() qVariantSetValue(variant, QQuaternion(0.1, 0.2, 0.3, 0.4)); QCOMPARE(QQuaternion(0.1, 0.2, 0.3, 0.4), qVariantValue(variant)); - void *pquaternion = QMetaType::construct(QVariant::Quaternion, 0); + void *pquaternion = QMetaType::create(QVariant::Quaternion, 0); QVERIFY(pquaternion); QMetaType::destroy(QVariant::Quaternion, pquaternion); } diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp index 6321fbf83d..413feba2e2 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -253,7 +253,7 @@ void tst_QMetaType::constructCoreType() QFETCH(int, typeId); QBENCHMARK { for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::construct(typeId, (void *)0); + void *data = QMetaType::create(typeId, (void *)0); QMetaType::destroy(typeId, data); } } @@ -275,7 +275,7 @@ void tst_QMetaType::constructCoreTypeCopy() const void *copy = other.constData(); QBENCHMARK { for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::construct(typeId, copy); + void *data = QMetaType::create(typeId, copy); QMetaType::destroy(typeId, data); } } diff --git a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp index 17eb5a3af7..b92c26ad7d 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -81,7 +81,7 @@ void tst_QGuiMetaType::constructGuiType() QFETCH(int, typeId); QBENCHMARK { for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::construct(typeId, (void *)0); + void *data = QMetaType::create(typeId, (void *)0); QMetaType::destroy(typeId, data); } } @@ -103,7 +103,7 @@ void tst_QGuiMetaType::constructGuiTypeCopy() const void *copy = other.constData(); QBENCHMARK { for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::construct(typeId, copy); + void *data = QMetaType::create(typeId, copy); QMetaType::destroy(typeId, data); } } -- cgit v1.2.3