Rename QMetaSequence's "elements" to "values"

This is so that they are in line with the "value_type" usually found in
containers. Associative containers have "key_type" and "mapped_type" and
we will use those names for access to elements in QMetaAssociation.
Using "value" as name for sequential containers improves consistency.

Change-Id: I628b7e1446bb2d56843b843bca72d279a6b247e6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 45 insertions, 45 deletions

diff --git a/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp b/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
index 84343c4a14..69f8cf0169 100644
--- a/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
+++ b/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
@@ -258,15 +258,15 @@ void tst_QMetaContainer::testSequence()
     QFETCH(bool, canEraseAtIterator);
     QFETCH(bool, isOrdered);
 
-    QVERIFY(metaSequence.canAddElement());
+    QVERIFY(metaSequence.canAddValue());
     QCOMPARE(metaSequence.hasSize(), hasSize);
-    QCOMPARE(metaSequence.canGetElementAtIndex(), isIndexed);
-    QCOMPARE(metaSequence.canSetElementAtIndex(), isIndexed);
-    QCOMPARE(metaSequence.canRemoveElement(), canRemove);
+    QCOMPARE(metaSequence.canGetValueAtIndex(), isIndexed);
+    QCOMPARE(metaSequence.canSetValueAtIndex(), isIndexed);
+    QCOMPARE(metaSequence.canRemoveValue(), canRemove);
     QCOMPARE(metaSequence.hasBidirectionalIterator(), hasBidirectionalIterator);
     QCOMPARE(metaSequence.hasRandomAccessIterator(), hasRandomAccessIterator);
-    QCOMPARE(metaSequence.canInsertElementAtIterator(), canInsertAtIterator);
-    QCOMPARE(metaSequence.canEraseElementAtIterator(), canEraseAtIterator);
+    QCOMPARE(metaSequence.canInsertValueAtIterator(), canInsertAtIterator);
+    QCOMPARE(metaSequence.canEraseValueAtIterator(), canEraseAtIterator);
     QCOMPARE(metaSequence.isOrdered(), isOrdered);
 
     QVariant var1(metaType);
@@ -277,40 +277,40 @@ void tst_QMetaContainer::testSequence()
         const qsizetype size = metaSequence.size(container);
 
         // var1 is invalid, and our sets do not contain an invalid value so far.
-        metaSequence.addElement(container, var1.constData());
+        metaSequence.addValue(container, var1.constData());
         QCOMPARE(metaSequence.size(container), size + 1);
         if (canRemove) {
-            metaSequence.removeElement(container);
+            metaSequence.removeValue(container);
             QCOMPARE(metaSequence.size(container), size);
         }
     } else {
-        metaSequence.addElement(container, var1.constData());
+        metaSequence.addValue(container, var1.constData());
         if (canRemove)
-            metaSequence.removeElement(container);
+            metaSequence.removeValue(container);
     }
 
     if (isIndexed) {
         QVERIFY(hasSize);
         const qsizetype size = metaSequence.size(container);
         for (qsizetype i = 0; i < size; ++i) {
-            metaSequence.elementAtIndex(container, i, var1.data());
-            metaSequence.elementAtIndex(container, size - i - 1, var2.data());
+            metaSequence.valueAtIndex(container, i, var1.data());
+            metaSequence.valueAtIndex(container, size - i - 1, var2.data());
 
-            metaSequence.setElementAtIndex(container, i, var2.constData());
-            metaSequence.setElementAtIndex(container, size - i - 1, var1.constData());
+            metaSequence.setValueAtIndex(container, i, var2.constData());
+            metaSequence.setValueAtIndex(container, size - i - 1, var1.constData());
 
-            metaSequence.elementAtIndex(container, i, var3.data());
+            metaSequence.valueAtIndex(container, i, var3.data());
             QCOMPARE(var3, var2);
 
-            metaSequence.elementAtIndex(container, size - i - 1, var3.data());
+            metaSequence.valueAtIndex(container, size - i - 1, var3.data());
             QCOMPARE(var3, var1);
         }
     }
 
     QVERIFY(metaSequence.hasIterator());
     QVERIFY(metaSequence.hasConstIterator());
-    QVERIFY(metaSequence.canGetElementAtIterator());
-    QVERIFY(metaSequence.canGetElementAtConstIterator());
+    QVERIFY(metaSequence.canGetValueAtIterator());
+    QVERIFY(metaSequence.canGetValueAtConstIterator());
 
     void *it = metaSequence.begin(container);
     void *end = metaSequence.end(container);
@@ -330,12 +330,12 @@ void tst_QMetaContainer::testSequence()
     qsizetype count = 0;
     for (; !metaSequence.compareIterator(it, end);
          metaSequence.advanceIterator(it, 1), metaSequence.advanceConstIterator(constIt, 1)) {
-        metaSequence.elementAtIterator(it, var1.data());
+        metaSequence.valueAtIterator(it, var1.data());
         if (isIndexed) {
-            metaSequence.elementAtIndex(container, count, var2.data());
+            metaSequence.valueAtIndex(container, count, var2.data());
             QCOMPARE(var1, var2);
         }
-        metaSequence.elementAtConstIterator(constIt, var3.data());
+        metaSequence.valueAtConstIterator(constIt, var3.data());
         QCOMPARE(var3, var1);
         ++count;
     }
@@ -348,16 +348,16 @@ void tst_QMetaContainer::testSequence()
     metaSequence.destroyConstIterator(constIt);
     metaSequence.destroyConstIterator(constEnd);
 
-    if (metaSequence.canSetElementAtIterator()) {
+    if (metaSequence.canSetValueAtIterator()) {
         void *it = metaSequence.begin(container);
         void *end = metaSequence.end(container);
         QVERIFY(it);
         QVERIFY(end);
 
         for (; !metaSequence.compareIterator(it, end); metaSequence.advanceIterator(it, 1)) {
-            metaSequence.elementAtIterator(it, var1.data());
-            metaSequence.setElementAtIterator(it, var2.constData());
-            metaSequence.elementAtIterator(it, var3.data());
+            metaSequence.valueAtIterator(it, var1.data());
+            metaSequence.setValueAtIterator(it, var2.constData());
+            metaSequence.valueAtIterator(it, var3.data());
             QCOMPARE(var2, var3);
             var2 = var1;
         }
@@ -394,12 +394,12 @@ void tst_QMetaContainer::testSequence()
             metaSequence.advanceConstIterator(constIt, -1);
             --count;
 
-            metaSequence.elementAtIterator(it, var1.data());
+            metaSequence.valueAtIterator(it, var1.data());
             if (isIndexed) {
-                metaSequence.elementAtIndex(container, count - size, var2.data());
+                metaSequence.valueAtIndex(container, count - size, var2.data());
                 QCOMPARE(var1, var2);
             }
-            metaSequence.elementAtConstIterator(constIt, var3.data());
+            metaSequence.valueAtConstIterator(constIt, var3.data());
             QCOMPARE(var3, var1);
         } while (!metaSequence.compareIterator(it, end));
 
@@ -419,13 +419,13 @@ void tst_QMetaContainer::testSequence()
         const qsizetype size = metaSequence.diffIterator(end, it);
         metaSequence.destroyIterator(end);
 
-        metaSequence.insertElementAtIterator(container, it, var1.constData());
+        metaSequence.insertValueAtIterator(container, it, var1.constData());
         metaSequence.destroyIterator(it);
         it = metaSequence.begin(container);
-        metaSequence.insertElementAtIterator(container, it, var2.constData());
+        metaSequence.insertValueAtIterator(container, it, var2.constData());
         metaSequence.destroyIterator(it);
         it = metaSequence.begin(container);
-        metaSequence.insertElementAtIterator(container, it, var3.constData());
+        metaSequence.insertValueAtIterator(container, it, var3.constData());
 
         metaSequence.destroyIterator(it);
 
@@ -437,13 +437,13 @@ void tst_QMetaContainer::testSequence()
         if (metaSequence.isOrdered()) {
             QCOMPARE(newSize, size + 3);
             QVariant var4(metaType);
-            metaSequence.elementAtIterator(it, var4.data());
+            metaSequence.valueAtIterator(it, var4.data());
             QCOMPARE(var4, var3);
             metaSequence.advanceIterator(it, 1);
-            metaSequence.elementAtIterator(it, var4.data());
+            metaSequence.valueAtIterator(it, var4.data());
             QCOMPARE(var4, var2);
             metaSequence.advanceIterator(it, 1);
-            metaSequence.elementAtIterator(it, var4.data());
+            metaSequence.valueAtIterator(it, var4.data());
             QCOMPARE(var4, var1);
         } else {
             QVERIFY(newSize >= size);
@@ -453,7 +453,7 @@ void tst_QMetaContainer::testSequence()
             for (int i = 0; i < newSize; ++i) {
                 metaSequence.destroyIterator(it);
                 it = metaSequence.begin(container);
-                metaSequence.eraseElementAtIterator(container, it);
+                metaSequence.eraseValueAtIterator(container, it);
             }
 
             metaSequence.destroyIterator(it);
@@ -462,9 +462,9 @@ void tst_QMetaContainer::testSequence()
             end = metaSequence.end(container);
             QVERIFY(metaSequence.compareIterator(it, end));
 
-            metaSequence.addElement(container, var1.constData());
-            metaSequence.addElement(container, var2.constData());
-            metaSequence.addElement(container, var3.constData());
+            metaSequence.addValue(container, var1.constData());
+            metaSequence.addValue(container, var2.constData());
+            metaSequence.addValue(container, var3.constData());
         }
 
         metaSequence.destroyIterator(end);
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 75a72f0c92..a444a100be 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4538,7 +4538,7 @@ void tst_QVariant::shouldDeleteVariantDataWorksForSequential()
                 [](const void *, QtMetaContainerPrivate::QMetaSequenceInterface::Position) -> void* {
             return nullptr;
         };
-        metaSequence.addElementFn = [](void *, const void *) {};
+        metaSequence.addValueFn = [](void *, const void *) {};
         metaSequence.advanceConstIteratorFn = [](void *, qsizetype) {};
         metaSequence.destroyConstIteratorFn = [](const void *){};
         metaSequence.compareConstIteratorFn = [](const void *, const void *) {
@@ -4548,11 +4548,11 @@ void tst_QVariant::shouldDeleteVariantDataWorksForSequential()
         metaSequence.diffConstIteratorFn = [](const void *, const void *) -> qsizetype  {
             return 0;
         };
-        metaSequence.elementAtIndexFn = [](const void *, qsizetype, void *dataPtr) -> void {
+        metaSequence.valueAtIndexFn = [](const void *, qsizetype, void *dataPtr) -> void {
             MyType mytype {1, "eins"};
             *static_cast<MyType *>(dataPtr) = mytype;
         };
-        metaSequence.elementAtConstIteratorFn = [](const void *, void *dataPtr) -> void {
+        metaSequence.valueAtConstIteratorFn = [](const void *, void *dataPtr) -> void {
             MyType mytype {2, "zwei"};
             *static_cast<MyType *>(dataPtr) = mytype;
         };
@@ -4696,8 +4696,8 @@ void tst_QVariant::sequentialIterableAppend()
         auto asIterable = variant.value<QSequentialIterable>();
         const int i = 3, j = 4;
         void *mutableIterable = const_cast<void *>(asIterable.constIterable());
-        asIterable.metaSequence().addElement(mutableIterable, &i);
-        asIterable.metaSequence().addElement(mutableIterable, &j);
+        asIterable.metaSequence().addValue(mutableIterable, &i);
+        asIterable.metaSequence().addValue(mutableIterable, &j);
         QCOMPARE(variant.value<QList<int>>(), QList<int> ({ 1, 2, 3, 4 }));
     }
     {
@@ -4708,8 +4708,8 @@ void tst_QVariant::sequentialIterableAppend()
         QByteArray qba1 {"goodbye"};
         QByteArray qba2 { "moon" };
         void *mutableIterable = const_cast<void *>(asIterable.constIterable());
-        asIterable.metaSequence().addElement(mutableIterable, &qba1);
-        asIterable.metaSequence().addElement(mutableIterable, &qba2);
+        asIterable.metaSequence().addValue(mutableIterable, &qba1);
+        asIterable.metaSequence().addValue(mutableIterable, &qba2);
         QSet<QByteArray> reference { "hello", "world", "goodbye", "moon" };
         QCOMPARE(variant.value<QSet<QByteArray>>(), reference);
     }