From 47ca3f78139ad51a5018dcdad27fa5caf817f08d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 5 Jul 2015 22:43:08 +0200
Subject: [PATCH] bearer plugins: fix uses of inefficient QLists

These types are larger than a void*, so holding them in QLists
is needlessly inefficient. Worse, the code could come to depend
on the fragile property of (inefficient) QLists that references
to elements therein never are invalidated.

Fix by marking them movable, and holding in a QVector instead.

Change-Id: I78774fc78d787241aaadc4f819b6d229e6200f46
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/plugins/bearer/connman/qconnmanservice_linux_p.h    | 5 +++--
 src/plugins/bearer/linux_common/qofonoservice_linux_p.h | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index 9a2bf4eb34..e773db9b20 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -82,8 +82,9 @@ struct ConnmanMap {
     QDBusObjectPath objectPath;
     QVariantMap propertyMap;
 };
-
-typedef QList< ConnmanMap > ConnmanMapList;
+Q_DECLARE_TYPEINFO(ConnmanMap, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, but cannot be
+                                                // marked as such until Qt 6
+typedef QVector<ConnmanMap> ConnmanMapList;
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
index 43b9570c99..35614a20f2 100644
--- a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
+++ b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
@@ -83,7 +83,12 @@ struct ObjectPathProperties
     QDBusObjectPath path;
     QVariantMap properties;
 };
-typedef QList<ObjectPathProperties> PathPropertiesList;
+QT_BEGIN_NAMESPACE
+Q_DECLARE_TYPEINFO(ObjectPathProperties, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, but cannot be
+                                                          // marked as such until Qt 6
+QT_END_NAMESPACE
+
+typedef QVector<ObjectPathProperties> PathPropertiesList;
 Q_DECLARE_METATYPE(ObjectPathProperties)
 Q_DECLARE_METATYPE (PathPropertiesList)