Universally pass QMetaType by value

... and add Qt7 TODOs where we can't because of BC.

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

4 files changed, 6 insertions, 1 deletions

diff --git a/src/corelib/kernel/qassociativeiterable.h b/src/corelib/kernel/qassociativeiterable.h
index b940f605b8..6fe0ff670c 100644
--- a/src/corelib/kernel/qassociativeiterable.h
+++ b/src/corelib/kernel/qassociativeiterable.h
@@ -122,12 +122,14 @@ public:
     {
     }
 
+    // ### Qt7: Pass QMetaType as value rather than const ref.
     QAssociativeIterable(const QMetaAssociation &metaAssociation, const QMetaType &metaType,
                          void *iterable)
         : QIterable(metaAssociation, metaType.alignOf(), iterable)
     {
     }
 
+    // ### Qt7: Pass QMetaType as value rather than const ref.
     QAssociativeIterable(const QMetaAssociation &metaAssociation, const QMetaType &metaType,
                          const void *iterable)
         : QIterable(metaAssociation, metaType.alignOf(), iterable)
diff --git a/src/corelib/kernel/qiterable_p.h b/src/corelib/kernel/qiterable_p.h
index 979ef49b18..d975a591fb 100644
--- a/src/corelib/kernel/qiterable_p.h
+++ b/src/corelib/kernel/qiterable_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 namespace QIterablePrivate {
 
 template<typename Callback>
-static QVariant retrieveElement(const QMetaType &type, Callback callback)
+static QVariant retrieveElement(QMetaType type, Callback callback)
 {
     QVariant v(type);
     void *dataPtr;
diff --git a/src/corelib/kernel/qsequentialiterable.h b/src/corelib/kernel/qsequentialiterable.h
index 8755b07aec..7b08e2afa3 100644
--- a/src/corelib/kernel/qsequentialiterable.h
+++ b/src/corelib/kernel/qsequentialiterable.h
@@ -115,12 +115,14 @@ public:
     {
     }
 
+    // ### Qt7: Pass QMetaType as value rather than const ref.
     QSequentialIterable(const QMetaSequence &metaSequence, const QMetaType &metaType,
                         void *iterable)
         : QIterable(metaSequence, metaType.alignOf(), iterable)
     {
     }
 
+    // ### Qt7: Pass QMetaType as value rather than const ref.
     QSequentialIterable(const QMetaSequence &metaSequence, const QMetaType &metaType,
                         const void *iterable)
         : QIterable(metaSequence, metaType.alignOf(), iterable)
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 9ebdbc4a18..ae39946cc3 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -666,6 +666,7 @@ namespace QtPrivate {
 class Q_CORE_EXPORT QVariantTypeCoercer
 {
 public:
+    // ### Qt7: Pass QMetaType as value rather than const ref.
     const void *convert(const QVariant &value, const QMetaType &type);
     const void *coerce(const QVariant &value, const QMetaType &type);