Remove QModelIndexList value type, use Array instead

We implement this by adding QModelIndexList to the
set of sequence types.

Change-Id: If7e0e88ab0c2916c2b65a926f8241549520d7391
Reviewed-by: Stephen Kelly <steveire@gmail.com>

4 files changed, 46 insertions, 25 deletions

diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index a7e3b22cd2..f7adf6eb18 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -41,6 +41,9 @@
 #include <private/qv4scopedvalue_p.h>
 #include "qv4runtime_p.h"
 #include "qv4objectiterator_p.h"
+#include <private/qqmlvaluetypewrapper_p.h>
+#include <private/qqmlmodelindexvaluetype_p.h>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <algorithm>
 
@@ -71,7 +74,8 @@ static void generateWarning(QV4::ExecutionEngine *v4, const QString& description
     F(bool, Bool, QList<bool>, false) \
     F(QString, String, QList<QString>, QString()) \
     F(QString, QString, QStringList, QString()) \
-    F(QUrl, Url, QList<QUrl>, QUrl())
+    F(QUrl, Url, QList<QUrl>, QUrl()) \
+    F(QModelIndex, QModelIndex, QModelIndexList, QModelIndex())
 
 static QV4::ReturnedValue convertElementToValue(QV4::ExecutionEngine *engine, const QString &element)
 {
@@ -88,6 +92,12 @@ static QV4::ReturnedValue convertElementToValue(QV4::ExecutionEngine *engine, co
     return engine->newString(element.toString())->asReturnedValue();
 }
 
+static QV4::ReturnedValue convertElementToValue(QV4::ExecutionEngine *engine, const QModelIndex &element)
+{
+    const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(QMetaType::QModelIndex);
+    return QV4::QQmlValueTypeWrapper::create(engine, QVariant(element), vtmo, QMetaType::QModelIndex);
+}
+
 static QV4::ReturnedValue convertElementToValue(QV4::ExecutionEngine *, qreal element)
 {
     return QV4::Encode(element);
@@ -113,6 +123,11 @@ static QString convertElementToString(const QUrl &element)
     return element.toString();
 }
 
+static QString convertElementToString(const QModelIndex &element)
+{
+    return reinterpret_cast<const QQmlModelIndexValueType *>(&element)->toString();
+}
+
 static QString convertElementToString(qreal element)
 {
     QString qstr;
@@ -145,6 +160,14 @@ template <> QUrl convertValueToElement(const Value &value)
     return QUrl(value.toQString());
 }
 
+template <> QModelIndex convertValueToElement(const Value &value)
+{
+    const QQmlValueTypeWrapper *v = value_cast<QQmlValueTypeWrapper>(value);
+    if (v)
+        return v->toVariant().toModelIndex();
+    return QModelIndex();
+}
+
 template <> qreal convertValueToElement(const Value &value)
 {
     return value.toNumber();
@@ -541,6 +564,9 @@ DEFINE_OBJECT_VTABLE(QQmlIntList);
 typedef QQmlSequence<QList<QUrl> > QQmlUrlList;
 template<>
 DEFINE_OBJECT_VTABLE(QQmlUrlList);
+typedef QQmlSequence<QModelIndexList> QQmlQModelIndexList;
+template<>
+DEFINE_OBJECT_VTABLE(QQmlQModelIndexList);
 typedef QQmlSequence<QList<bool> > QQmlBoolList;
 template<>
 DEFINE_OBJECT_VTABLE(QQmlBoolList);
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 2b3f78b676..6711ad2de9 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -64,7 +64,6 @@ QQmlValueTypeFactoryImpl::QQmlValueTypeFactoryImpl()
         valueTypes[ii] = 0;
 
     // See types wrapped in qqmlmodelindexvaluetype_p.h
-    qRegisterMetaType<QModelIndexList>();
     qRegisterMetaType<QItemSelectionRange>();
     qRegisterMetaType<QItemSelection>();
 }
@@ -112,18 +111,16 @@ const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t)
     case QVariant::PersistentModelIndex:
         return &QQmlPersistentModelIndexValueType::staticMetaObject;
     default:
+        if (t == qMetaTypeId<QItemSelectionRange>())
+            return &QQmlItemSelectionRangeValueType::staticMetaObject;
+        if (t == qMetaTypeId<QItemSelection>())
+            return &QQmlItemSelectionValueType::staticMetaObject;
+
         if (const QMetaObject *mo = QQml_valueTypeProvider()->metaObjectForMetaType(t))
             return mo;
         break;
     }
 
-    if (t == qMetaTypeId<QModelIndexList>())
-        return &QQmlModelIndexListValueType::staticMetaObject;
-    else if (t == qMetaTypeId<QItemSelectionRange>())
-        return &QQmlItemSelectionRangeValueType::staticMetaObject;
-    else if (t == qMetaTypeId<QItemSelection>())
-        return &QQmlItemSelectionValueType::staticMetaObject;
-
     QMetaType metaType(t);
     if (metaType.flags() & QMetaType::IsGadget)
         return metaType.metaObject();
diff --git a/src/qml/types/qqmlitemmodels.qdoc b/src/qml/types/qqmlitemmodels.qdoc
index 25c9321115..70059b07c6 100644
--- a/src/qml/types/qqmlitemmodels.qdoc
+++ b/src/qml/types/qqmlitemmodels.qdoc
@@ -60,6 +60,17 @@
     should not store any QModelIndex. You can, however, store QPersistentModelIndexes
     in a safe way.
 
+    \section1 QModelIndexList
+
+    \l QModelIndexList is exposed in QML as a JavaScript array. Conversions are
+    automatically made from and to C++. In fact, any JavaScript array can be
+    converted back to QModelIndexList, with non-QModelIndex objects replaced by
+    invalid QModelIndexes.
+
+    \note QModelIndex to QPersistentModelIndex conversion happens when accessing
+    the array elements because any QModelIndexList property retains reference
+    semantics when exposed this way.
+
     \section1 \l QItemSelectionRange
 
     \list
@@ -87,10 +98,10 @@
     \li QItemSelectionRange \b{intersected}(QItemSelectionRange other)
     \endlist
 
-    \section1 \l QModelIndexList and \l QItemSelection
+    \section1 QItemSelection
 
-    Both \l QModelIndexList and \l QItemSelection expose the following properties
-    and functions as part of their \l QList API:
+    \l QItemSelection exposes the following properties and functions as part of
+    its \l QList API:
 
     \list
     \li \b length : int
diff --git a/src/qml/types/qqmlmodelindexvaluetype_p.h b/src/qml/types/qqmlmodelindexvaluetype_p.h
index 0e655ab3d7..e36f7a0d1e 100644
--- a/src/qml/types/qqmlmodelindexvaluetype_p.h
+++ b/src/qml/types/qqmlmodelindexvaluetype_p.h
@@ -175,19 +175,6 @@ QString q_listToString(const QList<T> &list, const QLatin1String &typeName)
     Q_INVOKABLE void removeAt(int i) { v.removeAt(i); } \
     int length() const { return v.length(); }
 
-struct QQmlModelIndexListValueType
-{
-    QModelIndexList v;
-
-    Q_GADGET
-
-public:
-    Q_INVOKABLE QString toString()
-    { return q_listToString<QQmlModelIndexValueType>(v, QLatin1String("")); }
-
-    QLISTVALUETYPE_QML_API(QModelIndex)
-};
-
 struct QQmlItemSelectionValueType
 {
     QItemSelection v;