Remove QListModelInterface.

Implement ListModel and XmlListModel using QAbstractListModel
instead.

Task-number: QTBUG-15728

Change-Id: I14e03d90883d341f4b1d89c1e9fc9dc1534fde78
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>

2 files changed, 6 insertions, 198 deletions

diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index f68ca1fd33..63da97b4f8 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -141,148 +141,6 @@ QList<int> QQuickViewTestUtil::adjustIndexesForRemoveDisplaced(const QList<int>
     return result;
 }
 
-
-QQuickViewTestUtil::QmlListModel::QmlListModel(QObject *parent)
-    : QListModelInterface(parent)
-{
-}
-
-QQuickViewTestUtil::QmlListModel::~QmlListModel()
-{
-}
-
-QString QQuickViewTestUtil::QmlListModel::name(int index) const
-{
-    return list.at(index).first;
-}
-
-QString QQuickViewTestUtil::QmlListModel::number(int index) const
-{
-    return list.at(index).second;
-}
-
-int QQuickViewTestUtil::QmlListModel::count() const
-{
-    return list.count();
-}
-
-QList<int> QQuickViewTestUtil::QmlListModel::roles() const
-{
-    return QList<int>() << Name << Number;
-}
-
-QString QQuickViewTestUtil::QmlListModel::toString(int role) const
-{
-    switch (role) {
-    case Name:
-        return "name";
-    case Number:
-        return "number";
-    default:
-        return "";
-    }
-}
-
-QVariant QQuickViewTestUtil::QmlListModel::data(int index, int role) const
-{
-    if (role==0)
-        return list.at(index).first;
-    if (role==1)
-        return list.at(index).second;
-    return QVariant();
-}
-
-QHash<int, QVariant> QQuickViewTestUtil::QmlListModel::data(int index, const QList<int> &roles) const
-{
-    QHash<int,QVariant> returnHash;
-
-    for (int i = 0; i < roles.size(); ++i) {
-        int role = roles.at(i);
-        QVariant info;
-        switch (role) {
-        case Name:
-            info = list.at(index).first;
-            break;
-        case Number:
-            info = list.at(index).second;
-            break;
-        default:
-            break;
-        }
-        returnHash.insert(role, info);
-    }
-    return returnHash;
-}
-
-void QQuickViewTestUtil::QmlListModel::addItem(const QString &name, const QString &number)
-{
-    list.append(QPair<QString,QString>(name, number));
-    emit itemsInserted(list.count()-1, 1);
-}
-
-void QQuickViewTestUtil::QmlListModel::insertItem(int index, const QString &name, const QString &number)
-{
-    list.insert(index, QPair<QString,QString>(name, number));
-    emit itemsInserted(index, 1);
-}
-
-void QQuickViewTestUtil::QmlListModel::insertItems(int index, const QList<QPair<QString, QString> > &items)
-{
-    for (int i=0; i<items.count(); i++)
-        list.insert(index + i, QPair<QString,QString>(items[i].first, items[i].second));
-    emit itemsInserted(index, items.count());
-}
-
-void QQuickViewTestUtil::QmlListModel::removeItem(int index)
-{
-    list.removeAt(index);
-    emit itemsRemoved(index, 1);
-}
-
-void QQuickViewTestUtil::QmlListModel::removeItems(int index, int count)
-{
-    int c = count;
-    while (c--)
-        list.removeAt(index);
-    emit itemsRemoved(index, count);
-}
-
-void QQuickViewTestUtil::QmlListModel::moveItem(int from, int to)
-{
-    list.move(from, to);
-    emit itemsMoved(from, to, 1);
-}
-
-void QQuickViewTestUtil::QmlListModel::moveItems(int from, int to, int count)
-{
-    qquickmodelviewstestutil_move(from, to, count, &list);
-    emit itemsMoved(from, to, count);
-}
-
-void QQuickViewTestUtil::QmlListModel::modifyItem(int index, const QString &name, const QString &number)
-{
-    list[index] = QPair<QString,QString>(name, number);
-    emit itemsChanged(index, 1, roles());
-}
-
-void QQuickViewTestUtil::QmlListModel::clear() {
-    int count = list.count();
-    list.clear();
-    emit itemsRemoved(0, count);
-}
-
-void QQuickViewTestUtil::QmlListModel::matchAgainst(const QList<QPair<QString, QString> > &other, const QString &error1, const QString &error2) {
-    for (int i=0; i<other.count(); i++) {
-        QVERIFY2(list.contains(other[i]),
-                 QTest::toString(other[i].first + " " + other[i].second + " " + error1));
-    }
-    for (int i=0; i<list.count(); i++) {
-        QVERIFY2(other.contains(list[i]),
-                 QTest::toString(list[i].first + " " + list[i].second + " " + error2));
-    }
-}
-
-
 QQuickViewTestUtil::QaimModel::QaimModel(QObject *parent)
     : QAbstractListModel(parent)
 {
@@ -392,9 +250,11 @@ void QQuickViewTestUtil::QaimModel::modifyItem(int idx, const QString &name, con
 void QQuickViewTestUtil::QaimModel::clear()
 {
     int count = list.count();
-    emit beginRemoveRows(QModelIndex(), 0, count-1);
-    list.clear();
-    emit endRemoveRows();
+    if (count > 0) {
+        beginRemoveRows(QModelIndex(), 0, count-1);
+        list.clear();
+        endRemoveRows();
+    }
 }
 
 void QQuickViewTestUtil::QaimModel::reset()
@@ -474,16 +334,6 @@ int QQuickViewTestUtil::ListRange::count() const
     return indexes.count();
 }
 
-QList<QPair<QString,QString> > QQuickViewTestUtil::ListRange::getModelDataValues(const QmlListModel &model)
-{
-    QList<QPair<QString,QString> > data;
-    if (!valid)
-        return data;
-    for (int i=0; i<indexes.count(); i++)
-        data.append(qMakePair(model.name(indexes[i]), model.number(indexes[i])));
-    return data;
-}
-
 QList<QPair<QString,QString> > QQuickViewTestUtil::ListRange::getModelDataValues(const QaimModel &model)
 {
     QList<QPair<QString,QString> > data;
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 3108030406..771be0a890 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -44,7 +44,6 @@
 
 #include <QtQuick/QQuickItem>
 #include <QtQml/QQmlExpression>
-#include <QtQml/private/qlistmodelinterface_p.h>
 #include <QtCore/QAbstractListModel>
 
 QT_FORWARD_DECLARE_CLASS(QQuickView)
@@ -74,46 +73,6 @@ namespace QQuickViewTestUtil
         static ListChange polish() { ListChange c = { Polish, -1, -1, -1, 0.0 }; return c; }
     };
 
-    class QmlListModel : public QListModelInterface
-    {
-        Q_OBJECT
-    public:
-        QmlListModel(QObject *parent = 0);
-        ~QmlListModel();
-
-        enum Roles { Name, Number };
-
-        QString name(int index) const;
-        QString number(int index) const;
-
-        int count() const;
-
-        QList<int> roles() const;
-        QString toString(int role) const;
-
-        QVariant data(int index, int role) const;
-        QHash<int, QVariant> data(int index, const QList<int> &roles) const;
-
-        Q_INVOKABLE void addItem(const QString &name, const QString &number);
-        void insertItem(int index, const QString &name, const QString &number);
-        void insertItems(int index, const QList<QPair<QString, QString> > &items);
-
-        Q_INVOKABLE void removeItem(int index);
-        Q_INVOKABLE void removeItems(int index, int count);
-
-        void moveItem(int from, int to);
-        void moveItems(int from, int to, int count);
-
-        void modifyItem(int index, const QString &name, const QString &number);
-
-        void clear();
-
-        void matchAgainst(const QList<QPair<QString, QString> > &other, const QString &error1, const QString &error2);
-
-    private:
-        QList<QPair<QString,QString> > list;
-    };
-
     class QaimModel : public QAbstractListModel
     {
         Q_OBJECT
@@ -134,7 +93,7 @@ namespace QQuickViewTestUtil
         void insertItem(int index, const QString &name, const QString &number);
         void insertItems(int index, const QList<QPair<QString, QString> > &items);
 
-        void removeItem(int index);
+        Q_INVOKABLE void removeItem(int index);
         void removeItems(int index, int count);
 
         void moveItem(int from, int to);
@@ -168,7 +127,6 @@ namespace QQuickViewTestUtil
         bool isValid() const;
         int count() const;
 
-        QList<QPair<QString,QString> > getModelDataValues(const QmlListModel &model);
         QList<QPair<QString,QString> > getModelDataValues(const QaimModel &model);
 
         QList<int> indexes;