QMetaSequence: Delete methods instead of immediately deprecating them

These method declarations are only there to tell people what other
methods they should actually be using. They've been introduced as
immediately deprecated.

Amends commit 9adaf8505a9eb9d7acb7fee6aeac5341aa24a074.

Task-number: QTBUG-140181
Change-Id: I5b3f97d6c888056ecb206cbc93003c569e1c9ad8
Reviewed-by: Volker Hilsheimer <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>

1 files changed, 3 insertions, 44 deletions

diff --git a/src/corelib/kernel/qmetasequence.h b/src/corelib/kernel/qmetasequence.h
index e9505054159..e8000439dba 100644
--- a/src/corelib/kernel/qmetasequence.h
+++ b/src/corelib/kernel/qmetasequence.h
@@ -248,55 +248,14 @@ public:
         Unspecified, AtBegin, AtEnd
     };
 
-    QT_DEPRECATED_VERSION_X_6_11("Use append() or prepend() instead.")
     void addValue(const QVariant &value, Position position = Unspecified)
-    {
-        const QMetaSequence meta = metaContainer();
-        QtPrivate::QVariantTypeCoercer coercer;
-        const void *valuePtr = coercer.coerce(value, meta.valueMetaType());
-
-        switch (position) {
-        case AtBegin:
-            if (meta.canAddValueAtBegin())
-                meta.addValueAtBegin(mutableIterable(), valuePtr);
-            break;
-        case AtEnd:
-            if (meta.canAddValueAtEnd())
-                meta.addValueAtEnd(mutableIterable(), valuePtr);
-            break;
-        case Unspecified:
-            if (meta.canAddValue())
-                meta.addValue(mutableIterable(), valuePtr);
-            break;
-        }
-    }
+            Q_DECL_EQ_DELETE_X("Use append() or prepend() instead.");
 
-    QT_DEPRECATED_VERSION_X_6_11("Use removeLast() or removeFirst() instead.")
     void removeValue(Position position = Unspecified)
-    {
-        const QMetaSequence meta = metaContainer();
-
-        switch (position) {
-        case AtBegin:
-            if (meta.canRemoveValueAtBegin())
-                meta.removeValueAtBegin(mutableIterable());
-            break;
-        case AtEnd:
-            if (meta.canRemoveValueAtEnd())
-                meta.removeValueAtEnd(mutableIterable());
-            break;
-        case Unspecified:
-            if (meta.canRemoveValue())
-                meta.removeValue(mutableIterable());
-            break;
-        }
-    }
+            Q_DECL_EQ_DELETE_X("Use removeLast() or removeFirst() instead.");
 
-    QT_DEPRECATED_VERSION_X_6_11("Use QMetaSequence::valueMetaType() instead.")
     QMetaType valueMetaType() const
-    {
-        return metaContainer().valueMetaType();
-    }
+            Q_DECL_EQ_DELETE_X("Use QMetaSequence::valueMetaType() instead.");
 
     QT_WARNING_POP
 #endif // QT_DEPRECATED_SINCE(6, 11)