From b3a4d3e328a3d80d4728716f2e5e68817b82cbb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 12 Jan 2012 16:08:54 +0100 Subject: [PATCH] Rename QArrayData::AllocateOption to AllocationOption Change-Id: Id3e7c748b4b40d703ad1785c903c96bdd968390e Reviewed-by: Oswald Buddenhagen --- src/corelib/tools/qarraydata.cpp | 2 +- src/corelib/tools/qarraydata.h | 21 +++++++++++---------- src/corelib/tools/qarraydatapointer.h | 2 +- tests/auto/corelib/tools/qarraydata/simplevector.h | 2 +- .../corelib/tools/qarraydata/tst_qarraydata.cpp | 12 ++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index 8f0a95c..6a5632a 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -49,7 +49,7 @@ static const QArrayData qt_array_empty = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0 static const QArrayData qt_array_unsharable_empty = { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 }; QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, - size_t capacity, AllocateOptions options) + size_t capacity, AllocationOptions options) { // Alignment is a power of two Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData) diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 5a17d71..c022d9f 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -81,7 +81,7 @@ struct Q_CORE_EXPORT QArrayData return alloc != 0; } - enum AllocateOption { + enum AllocationOption { CapacityReserved = 0x1, Unsharable = 0x2, RawData = 0x4, @@ -89,11 +89,11 @@ struct Q_CORE_EXPORT QArrayData Default = 0 }; - Q_DECLARE_FLAGS(AllocateOptions, AllocateOption) + Q_DECLARE_FLAGS(AllocationOptions, AllocationOption) - AllocateOptions detachFlags() const + AllocationOptions detachFlags() const { - AllocateOptions result; + AllocationOptions result; if (!ref.isSharable()) result |= Unsharable; if (capacityReserved) @@ -101,23 +101,24 @@ struct Q_CORE_EXPORT QArrayData return result; } - AllocateOptions cloneFlags() const + AllocationOptions cloneFlags() const { - AllocateOptions result; + AllocationOptions result; if (capacityReserved) result |= CapacityReserved; return result; } static QArrayData *allocate(size_t objectSize, size_t alignment, - size_t capacity, AllocateOptions options = Default) Q_REQUIRED_RESULT; + size_t capacity, AllocationOptions options = Default) + Q_REQUIRED_RESULT; static void deallocate(QArrayData *data, size_t objectSize, size_t alignment); static const QArrayData shared_null; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocateOptions) +Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocationOptions) template struct QTypedArrayData @@ -137,7 +138,7 @@ struct QTypedArrayData class AlignmentDummy { QArrayData header; T data; }; static QTypedArrayData *allocate(size_t capacity, - AllocateOptions options = Default) Q_REQUIRED_RESULT + AllocationOptions options = Default) Q_REQUIRED_RESULT { return static_cast(QArrayData::allocate(sizeof(T), Q_ALIGNOF(AlignmentDummy), capacity, options)); @@ -149,7 +150,7 @@ struct QTypedArrayData } static QTypedArrayData *fromRawData(const T *data, size_t n, - AllocateOptions options = Default) + AllocationOptions options = Default) { QTypedArrayData *result = allocate(0, options | RawData); if (result) { diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index 8b1d2a8..1539b36 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -151,7 +151,7 @@ public: } private: - Data *clone(QArrayData::AllocateOptions options) const Q_REQUIRED_RESULT + Data *clone(QArrayData::AllocationOptions options) const Q_REQUIRED_RESULT { QArrayDataPointer copy(Data::allocate(d->alloc ? d->alloc : d->size, options)); diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h index 3fa7905..d53b90d 100644 --- a/tests/auto/corelib/tools/qarraydata/simplevector.h +++ b/tests/auto/corelib/tools/qarraydata/simplevector.h @@ -275,7 +275,7 @@ public: } static SimpleVector fromRawData(const T *data, size_t size, - QArrayData::AllocateOptions options = Data::Default) + QArrayData::AllocationOptions options = Data::Default) { return SimpleVector(Data::fromRawData(data, size, options)); } diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 4dba02c..4d121a8 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("objectSize"); QTest::addColumn("alignment"); - QTest::addColumn("allocateOptions"); + QTest::addColumn("allocateOptions"); QTest::addColumn("isCapacityReserved"); QTest::addColumn("isSharable"); QTest::addColumn("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); -- 2.7.4