aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types/qqmllistmodel_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-15 01:31:13 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-19 05:03:50 +0000
commit4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e (patch)
tree73e9a9ce3ed28b817c77d3d48475c76a7d54c9cf /src/qml/types/qqmllistmodel_p.h
parent7fccfc4663c362d717383493732849237562f0c7 (diff)
Fix performance of ListModel::get()
When called, the function would return a full-fledged QObject that maps the list element addressed. It would contain a _copy_ of all values in the list item and it would create a new meta-object for each list element. This function exists for the JavaScript API, and therefore we now return a much more lightweight object. For compatbility reasons it still has to be a QObject, but the meta-object of it is created on-demand, i.e. only when accessing properties from the C++ side or when connecting to the changed signal of a property. Otherwise the JavaScript wrapper will return the live values from the model without copying them. Change-Id: Iabf3ca22192d2aee06ae9d4b4cfb2fcde2a021b1 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Spencer Schumann <spencer.schumann@echostar.com>
Diffstat (limited to 'src/qml/types/qqmllistmodel_p.h')
-rw-r--r--src/qml/types/qqmllistmodel_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index 75373be47c..b5a5ef3265 100644
--- a/src/qml/types/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
@@ -54,6 +54,10 @@ class QQmlListModelWorkerAgent;
class ListModel;
class ListLayout;
+namespace QV4 {
+struct ModelObject;
+}
+
class Q_QML_PRIVATE_EXPORT QQmlListModel : public QAbstractListModel
{
Q_OBJECT
@@ -94,6 +98,7 @@ private:
friend class QQmlListModelParser;
friend class QQmlListModelWorkerAgent;
friend class ModelObject;
+ friend struct QV4::ModelObject;
friend class ModelNodeMetaObject;
friend class ListModel;
friend class ListElement;