1 files changed, 20 insertions, 40 deletions

diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 69066d1c69..c27c6ac26d 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -42,7 +42,6 @@
 #include <private/qqmlopenmetaobject_p.h>
 #include <private/qqmljsast_p.h>
 #include <private/qqmljsengine_p.h>
-#include <private/qqmlcompiler_p.h>
 
 #include <private/qqmlcustomparser_p.h>
 #include <private/qqmlengine_p.h>
@@ -399,6 +398,8 @@ void ListModel::updateCacheIndices()
 
 QVariant ListModel::getProperty(int elementIndex, int roleIndex, const QQmlListModel *owner, QV4::ExecutionEngine *eng)
 {
+    if (roleIndex >= m_layout->roleCount())
+        return QVariant();
     ListElement *e = elements[elementIndex];
     const ListLayout::Role &r = m_layout->getExistingRole(roleIndex);
     return e->getProperty(r, owner, eng);
@@ -599,11 +600,8 @@ int ListModel::setOrCreateProperty(int elementIndex, const QString &key, const Q
 
             ModelNodeMetaObject *cache = e->objectCache();
 
-            if (roleIndex != -1 && cache) {
-                QVector<int> roles;
-                roles << roleIndex;
-                cache->updateValues(roles);
-            }
+            if (roleIndex != -1 && cache)
+                cache->updateValues(QVector<int>(1, roleIndex));
         }
     }
 
@@ -1301,11 +1299,8 @@ void ModelNodeMetaObject::propertyWritten(int index)
     QV4::ScopedValue v(scope, scope.engine->fromVariant(value));
 
     int roleIndex = m_model->m_listModel->setExistingProperty(m_elementIndex, propName, v, scope.engine);
-    if (roleIndex != -1) {
-        QVector<int> roles;
-        roles << roleIndex;
-        m_model->emitItemsChanged(m_elementIndex, 1, roles);
-    }
+    if (roleIndex != -1)
+        m_model->emitItemsChanged(m_elementIndex, 1, QVector<int>(1, roleIndex));
 }
 
 namespace QV4 {
@@ -1318,11 +1313,8 @@ void ModelObject::put(Managed *m, String *name, const Value &value)
     const int elementIndex = that->d()->m_elementIndex;
     const QString propName = name->toQString();
     int roleIndex = that->d()->m_model->m_listModel->setExistingProperty(elementIndex, propName, value, eng);
-    if (roleIndex != -1) {
-        QVector<int> roles;
-        roles << roleIndex;
-        that->d()->m_model->emitItemsChanged(elementIndex, 1, roles);
-    }
+    if (roleIndex != -1)
+        that->d()->m_model->emitItemsChanged(elementIndex, 1, QVector<int>(1, roleIndex));
 
     ModelNodeMetaObject *mo = ModelNodeMetaObject::get(that->object());
     if (mo->initialized())
@@ -1504,14 +1496,10 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index)
     }
 
     int elementIndex = parentModel->m_modelObjects.indexOf(m_owner);
-    int roleIndex = parentModel->m_roles.indexOf(QString::fromLatin1(name(index).constData()));
-
-    if (elementIndex != -1 && roleIndex != -1) {
-
-        QVector<int> roles;
-        roles << roleIndex;
-
-        parentModel->emitItemsChanged(elementIndex, 1, roles);
+    if (elementIndex != -1) {
+        int roleIndex = parentModel->m_roles.indexOf(QString::fromLatin1(name(index).constData()));
+        if (roleIndex != -1)
+            parentModel->emitItemsChanged(elementIndex, 1, QVector<int>(1, roleIndex));
     }
 }
 
@@ -1880,14 +1868,14 @@ bool QQmlListModel::setData(const QModelIndex &index, const QVariant &value, int
     if (m_dynamicRoles) {
         const QByteArray property = m_roles.at(role).toUtf8();
         if (m_modelObjects[row]->setValue(property, value)) {
-            emitItemsChanged(row, 1, QVector<int>() << role);
+            emitItemsChanged(row, 1, QVector<int>(1, role));
             return true;
         }
     } else {
         const ListLayout::Role &r = m_listModel->getExistingRole(role);
         const int roleIndex = m_listModel->setOrCreateProperty(row, r.name, value);
         if (roleIndex != -1) {
-            emitItemsChanged(row, 1, QVector<int>() << role);
+            emitItemsChanged(row, 1, QVector<int>(1, role));
             return true;
         }
     }
@@ -2355,20 +2343,12 @@ void QQmlListModel::setProperty(int index, const QString& property, const QVaria
             roleIndex = m_roles.count();
             m_roles.append(property);
         }
-        if (m_modelObjects[index]->setValue(property.toUtf8(), value)) {
-            QVector<int> roles;
-            roles << roleIndex;
-            emitItemsChanged(index, 1, roles);
-        }
+        if (m_modelObjects[index]->setValue(property.toUtf8(), value))
+            emitItemsChanged(index, 1, QVector<int>(1, roleIndex));
     } else {
         int roleIndex = m_listModel->setOrCreateProperty(index, property, value);
-        if (roleIndex != -1) {
-
-            QVector<int> roles;
-            roles << roleIndex;
-
-            emitItemsChanged(index, 1, roles);
-        }
+        if (roleIndex != -1)
+            emitItemsChanged(index, 1, QVector<int>(1, roleIndex));
     }
 }
 
@@ -2497,7 +2477,7 @@ void QQmlListModelParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit,
 {
     listElementTypeName = QString(); // unknown
 
-    foreach (const QV4::CompiledData::Binding *binding, bindings) {
+    for (const QV4::CompiledData::Binding *binding : bindings) {
         QString propName = qmlUnit->stringAt(binding->propertyNameIndex);
         if (!propName.isEmpty()) { // isn't default property
             error(binding, QQmlListModel::tr("ListModel: undefined property '%1'").arg(propName));
@@ -2518,7 +2498,7 @@ void QQmlListModelParser::applyBindings(QObject *obj, QV4::CompiledData::Compila
 
     bool setRoles = false;
 
-    foreach (const QV4::CompiledData::Binding *binding, bindings) {
+    for (const QV4::CompiledData::Binding *binding : bindings) {
         if (binding->type != QV4::CompiledData::Binding::Type_Object)
             continue;
         setRoles |= applyProperty(qmlUnit, binding, rv->m_listModel, /*outter element index*/-1);