diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-01-12 16:08:54 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 20:40:16 +0100 |
commit | b3a4d3e328a3d80d4728716f2e5e68817b82cbb8 (patch) | |
tree | c27f3597414c24dd327be65fe3f427672dbd5147 /tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | |
parent | f4c1e2c40fcc1285ea24d55ed4eac036d8bbdf1b (diff) |
Rename QArrayData::AllocateOption to AllocationOption
Change-Id: Id3e7c748b4b40d703ad1785c903c96bdd968390e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp')
-rw-r--r-- | tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 4dba02cc70..4d121a823f 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -546,13 +546,13 @@ struct Deallocator }; Q_DECLARE_METATYPE(const QArrayData *) -Q_DECLARE_METATYPE(QArrayData::AllocateOptions) +Q_DECLARE_METATYPE(QArrayData::AllocationOptions) void tst_QArrayData::allocate_data() { QTest::addColumn<size_t>("objectSize"); QTest::addColumn<size_t>("alignment"); - QTest::addColumn<QArrayData::AllocateOptions>("allocateOptions"); + QTest::addColumn<QArrayData::AllocationOptions>("allocateOptions"); QTest::addColumn<bool>("isCapacityReserved"); QTest::addColumn<bool>("isSharable"); QTest::addColumn<const QArrayData *>("commonEmpty"); @@ -575,7 +575,7 @@ void tst_QArrayData::allocate_data() struct { char const *description; - QArrayData::AllocateOptions allocateOptions; + QArrayData::AllocationOptions allocateOptions; bool isCapacityReserved; bool isSharable; const QArrayData *commonEmpty; @@ -603,7 +603,7 @@ void tst_QArrayData::allocate() { QFETCH(size_t, objectSize); QFETCH(size_t, alignment); - QFETCH(QArrayData::AllocateOptions, allocateOptions); + QFETCH(QArrayData::AllocationOptions, allocateOptions); QFETCH(bool, isCapacityReserved); QFETCH(bool, isSharable); QFETCH(const QArrayData *, commonEmpty); @@ -614,14 +614,14 @@ void tst_QArrayData::allocate() // Shared Empty QCOMPARE(QArrayData::allocate(objectSize, minAlignment, 0, - QArrayData::AllocateOptions(allocateOptions)), commonEmpty); + QArrayData::AllocationOptions(allocateOptions)), commonEmpty); Deallocator keeper(objectSize, minAlignment); keeper.headers.reserve(1024); for (int capacity = 1; capacity <= 1024; capacity <<= 1) { QArrayData *data = QArrayData::allocate(objectSize, minAlignment, - capacity, QArrayData::AllocateOptions(allocateOptions)); + capacity, QArrayData::AllocationOptions(allocateOptions)); keeper.headers.append(data); QCOMPARE(data->size, 0); |