Merge lp:~aacid/unity/sortfilterproxymodelqml_split into lp:unity/phablet

[Albert Astals Cid]

Split the filterproxymodel in two

Since the limit feature did collide a bit with the rest of the implementation (it even had a qFatal) if you tried to use both

The new QLimitProxyModel inherits from QIdentityProxyModel instead of QSortFilterProxyModel

Adapt the testscases

[Michael Zanetti (mzanetti)]

nitpick alert:
66 +// self
67 +#include "qlimitproxymodelqml.h"
68 +
69 +// Qt
70 +#include <QDebug>

// self & ""
// Qt & <Q*>
seems redundant to me...

157 + m_limit = limit;
158 + Q_EMIT limitChanged();
159 +
160 + if (inserting) {
161 + endInsertRows();
162 + } else if (removing) {
163 + endRemoveRows();
164 + }

I would try to avoid emitting signals in between begin*Rows() and end*Rows(). The reason is that someone using this model might connect to your signal and reading data from this model in between the transition.
This might not be harmful as long as this model is only used with standard Qt Views, but with custom view implementations this could be a potential pitfall.

196 +QLimitProxyModelQML::sourceRowsInserted(const QModelIndex & /*parent*/, int /*start*/, int /*end*/)

I'd prefer Q_UNUSED() (easier to get rid of in case you'll need it at some point), however, not a hard requirement from my side.

119 + if (parent.isValid()) // We are not a tree
120 + return 0;

One of the very rare places (imho) where even a Q_ASSERT() might make sense?

242 + Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel)

Please add NOTIFY signal or make it CONSTANT. Otherwise we'll have those nasty QML warnings "depends on non-notifyable property". As we have WRITE, I'd prefer the NOTIFY signal.

590 +// qDebug() << "hi";
Hi you too :) There's also lots of other commented stuff in the tests...

review: Needs Fixing

[Albert Astals Cid (aacid)]

The nitpicks are about keeping style consistent with the brother class, i can agree to them, but i'd prefer we discuss & change in a future MR

Moved the countChanged signal to after the rows inserted/removed signals

Made the model notifiable

The qDebugs are part of the original modeltest code in Qt, i'd prefer not to change it.

We can't assert there otheriwse modeltest will assert

I prefer commenting out than Q_UNUSED since most times when i start using the variable again, i forget to remove teh Q_UNUSED and then look like a silly person :D

[Michael Zanetti (mzanetti)]

looks good now. Lets wait for CI to approve too before top-approving

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:602
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/563/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/358
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/564/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/563
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/439/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1058

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/563/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/565/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/360
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/566/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/565/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/445/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/565/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:612
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/579/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/374
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/580/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/579/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/455/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/459/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/579/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:613
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/591/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/389
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/592/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/591
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/467/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1093

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/591/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:613
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/608/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/610
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/484
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/484/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1113

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/608/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== modified file 'Components/FilterGrid.qml'
--- Components/FilterGrid.qml	2013-03-18 15:39:21 +0000
+++ Components/FilterGrid.qml	2013-04-17 14:04:25 +0000
@@ -83,7 +83,7 @@
         delegateHeight: units.gu(9.5)
         verticalSpacing: units.gu(2)
 
-        model: SortFilterProxyModel {
+        model: LimitProxyModel {
             model: root.model
             limit: (filter) ? collapsedRowCount * iconTileGrid.columns : -1
         }

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-07 12:18:24 +0000
+++ debian/copyright	2013-04-17 14:04:25 +0000
@@ -19,3 +19,34 @@
  .
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
+
+Files: tests/unittests/plugins/Utils/modeltest.*
+Copyright: 2013 Digia Plc and/or its subsidiary(-ies).
+License: 
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia.  For licensing terms and
+ conditions see http://qt.digia.com/licensing.  For further information
+ use the contact form at http://qt.digia.com/contact-us.
+
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+
+ In addition, as a special exception, Digia gives you certain additional
+ rights.  These rights are described in the Digia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2013-04-12 11:36:33 +0000
+++ plugins/Utils/CMakeLists.txt	2013-04-17 14:04:25 +0000
@@ -5,6 +5,7 @@
 )
 
 set(QMLPLUGIN_SRC
+    qlimitproxymodelqml.cpp
     qsortfilterproxymodelqml.cpp
     ubuntuwindow.cpp
     plugin.cpp

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2013-04-09 14:59:45 +0000
+++ plugins/Utils/plugin.cpp	2013-04-17 14:04:25 +0000
@@ -24,6 +24,7 @@
 #include "plugin.h"
 
 // local
+#include "qlimitproxymodelqml.h"
 #include "qsortfilterproxymodelqml.h"
 #include "ubuntuwindow.h"
 
@@ -31,6 +32,7 @@
 {
     Q_ASSERT(uri == QLatin1String("Utils"));
     qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
     qmlRegisterExtendedType<QQuickWindow, UbuntuWindow>(uri, 0, 1, "Window");
 }

=== added file 'plugins/Utils/qlimitproxymodelqml.cpp'
--- plugins/Utils/qlimitproxymodelqml.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/qlimitproxymodelqml.cpp	2013-04-17 14:04:25 +0000
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2012, 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// self
+#include "qlimitproxymodelqml.h"
+
+// Qt
+#include <QDebug>
+
+QLimitProxyModelQML::QLimitProxyModelQML(QObject *parent)
+    : QIdentityProxyModel(parent)
+    , m_limit(-1)
+    , m_sourceInserting(false)
+    , m_sourceRemoving(false)
+{
+    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
+}
+
+QHash<int, QByteArray> QLimitProxyModelQML::roleNames() const
+{
+    return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
+}
+
+void
+QLimitProxyModelQML::setModel(QAbstractItemModel *itemModel)
+{
+    if (sourceModel() != NULL) {
+        sourceModel()->disconnect(this);
+    }
+
+    if (itemModel != sourceModel()) {
+        setSourceModel(itemModel);
+
+        if (sourceModel() != NULL) {
+            // Disconnect the QIdentityProxyModel handling for rows removed/added...
+            disconnect(sourceModel(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, NULL);
+            disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), this, NULL);
+            disconnect(sourceModel(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, NULL);
+            disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), this, NULL);
+
+            // ... and use our own
+            connect(sourceModel(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+                    this, SLOT(sourceRowsAboutToBeInserted(QModelIndex,int,int)));
+            connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+                    this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
+            connect(sourceModel(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+                    this, SLOT(sourceRowsAboutToBeRemoved(QModelIndex,int,int)));
+            connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+                    this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+        }
+        Q_EMIT modelChanged();
+    }
+}
+
+int
+QLimitProxyModelQML::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) // We are not a tree
+        return 0;
+
+    const int unlimitedCount = QIdentityProxyModel::rowCount(parent);
+    return m_limit < 0 ? unlimitedCount : qMin(m_limit, unlimitedCount);
+}
+
+int
+QLimitProxyModelQML::limit() const
+{
+    return m_limit;
+}
+
+void
+QLimitProxyModelQML::setLimit(int limit)
+{
+    if (limit != m_limit) {
+        bool inserting = false;
+        bool removing = false;
+        const int oldCount = rowCount();
+        const int unlimitedCount = QIdentityProxyModel::rowCount();
+        if (m_limit < 0) {
+            if (limit < oldCount) {
+                removing = true;
+                beginRemoveRows(QModelIndex(), limit, oldCount - 1);
+            }
+        } else if (limit < 0) {
+            if (m_limit < unlimitedCount) {
+                inserting = true;
+                beginInsertRows(QModelIndex(), m_limit, unlimitedCount - 1);
+            }
+        } else {
+            if (limit > m_limit && unlimitedCount > m_limit) {
+                inserting = true;
+                beginInsertRows(QModelIndex(), m_limit, qMin(limit, unlimitedCount) - 1);
+            } else if (limit < m_limit && limit < oldCount) {
+                removing = true;
+                beginRemoveRows(QModelIndex(), limit, oldCount - 1);
+            }
+        }
+
+        m_limit = limit;
+
+        if (inserting) {
+            endInsertRows();
+        } else if (removing) {
+            endRemoveRows();
+        }
+
+        Q_EMIT limitChanged();
+    }
+}
+
+void
+QLimitProxyModelQML::sourceRowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
+{
+    if (m_limit < 0) {
+        beginInsertRows(mapFromSource(parent), start, end);
+        m_sourceInserting = true;
+    } else if (start < m_limit) {
+        beginInsertRows(mapFromSource(parent), start, qMin(m_limit - 1, end));
+        m_sourceInserting = true;
+    }
+}
+
+void
+QLimitProxyModelQML::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+{
+    if (m_limit < 0) {
+        beginRemoveRows(mapFromSource(parent), start, end);
+        m_sourceRemoving = true;
+    } else if (start < m_limit) {
+        beginRemoveRows(mapFromSource(parent), start, qMin(m_limit - 1, end));
+        m_sourceRemoving = true;
+    }
+}
+
+void
+QLimitProxyModelQML::sourceRowsInserted(const QModelIndex & /*parent*/, int /*start*/, int /*end*/)
+{
+    if (m_sourceInserting) {
+        endInsertRows();
+        m_sourceInserting = false;
+    }
+}
+
+void
+QLimitProxyModelQML::sourceRowsRemoved(const QModelIndex & /*parent*/, int /*start*/, int /*end*/)
+{
+    if (m_sourceRemoving) {
+        endRemoveRows();
+        m_sourceRemoving = false;
+    }
+}

=== added file 'plugins/Utils/qlimitproxymodelqml.h'
--- plugins/Utils/qlimitproxymodelqml.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/qlimitproxymodelqml.h	2013-04-17 14:04:25 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012, 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QLIMITPROXYMODELQML_H
+#define QLIMITPROXYMODELQML_H
+
+#include <QIdentityProxyModel>
+
+class QLimitProxyModelQML : public QIdentityProxyModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
+    Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged)
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    explicit QLimitProxyModelQML(QObject *parent = 0);
+
+    /* getters */
+    int limit() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QHash<int, QByteArray> roleNames() const;
+
+    /* setters */
+    void setModel(QAbstractItemModel *model);
+    void setLimit(int limit);
+
+Q_SIGNALS:
+    void limitChanged();
+    void totalCountChanged();
+    void countChanged();
+    void modelChanged();
+
+private Q_SLOTS:
+    void sourceRowsAboutToBeInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+    void sourceRowsInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsRemoved(const QModelIndex &parent, int start, int end);
+
+private:
+    int m_limit;
+    bool m_sourceInserting;
+    bool m_sourceRemoving;
+};
+
+#endif // QLIMITPROXYMODELQML_H

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
--- plugins/Utils/qsortfilterproxymodelqml.cpp	2013-04-15 14:29:04 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.cpp	2013-04-17 14:04:25 +0000
@@ -22,7 +22,6 @@
 
 QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
     : QSortFilterProxyModel(parent)
-    , m_limit(-1)
     , m_invertMatch(false)
 {
     connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
@@ -42,17 +41,20 @@
         return;
     }
 
-    if (sourceModel() != NULL) {
-        sourceModel()->disconnect(this);
+    if (itemModel != sourceModel()) {
+        if (sourceModel() != NULL) {
+            sourceModel()->disconnect(this);
+        }
+
+        setSourceModel(itemModel);
+
+        connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));
+        connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
+        connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
+        Q_EMIT totalCountChanged();
+        Q_EMIT countChanged();
+        Q_EMIT modelChanged();
     }
-
-    setSourceModel(itemModel);
-
-    connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));
-    connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
-    connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
-    Q_EMIT totalCountChanged();
-    Q_EMIT countChanged();
 }
 
 QVariantMap
@@ -88,26 +90,6 @@
     return rowCount();
 }
 
-int
-QSortFilterProxyModelQML::limit() const
-{
-    return m_limit;
-}
-
-void
-QSortFilterProxyModelQML::setLimit(int limit)
-{
-    if (limit != -1 && !filterRegExp().isEmpty()) {
-        qFatal("QSortFilterProxyModel: filterRegExp and limit are both set which is not supported");
-    }
-
-    if (limit != m_limit) {
-        m_limit = limit;
-        invalidateFilter();
-        Q_EMIT limitChanged();
-    }
-}
-
 bool
 QSortFilterProxyModelQML::invertMatch() const
 {
@@ -127,9 +109,6 @@
 QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
                                            const QModelIndex &sourceParent) const
 {
-    if (m_limit != -1 && sourceRow >= m_limit) {
-        return false;
-    }
     // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
     if (filterRegExp().isEmpty()) {
         return true;

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.h'
--- plugins/Utils/qsortfilterproxymodelqml.h	2013-04-12 14:43:25 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.h	2013-04-17 14:04:25 +0000
@@ -23,8 +23,7 @@
 {
     Q_OBJECT
 
-    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel)
-    Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged)
+    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
     Q_PROPERTY(int totalCount READ totalCount NOTIFY totalCountChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
@@ -38,24 +37,21 @@
     virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
     /* getters */
-    int limit() const;
     int totalCount() const;
     bool invertMatch() const;
     QHash<int, QByteArray> roleNames() const;
 
     /* setters */
     void setModel(QAbstractItemModel *model);
-    void setLimit(int limit);
     void setInvertMatch(bool invertMatch);
 
 Q_SIGNALS:
-    void limitChanged();
     void totalCountChanged();
     void countChanged();
     void invertMatchChanged(bool);
+    void modelChanged();
 
 private:
-    int m_limit;
     bool m_invertMatch;
 };
 

=== removed directory 'plugins/Utils/tests'
=== removed directory 'plugins/Utils/tests/CMakeFiles'
=== modified file 'tests/plugins/Utils/CMakeLists.txt'
--- tests/plugins/Utils/CMakeLists.txt	2013-04-16 14:22:23 +0000
+++ tests/plugins/Utils/CMakeLists.txt	2013-04-17 14:04:25 +0000
@@ -12,7 +12,7 @@
               -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
               -o -,txt
             )
-        add_executable(${_test} ${_test}.cpp)
+        add_executable(${_test} ${_test}.cpp modeltest.cpp)
         qt5_use_modules(${_test} Test Core Qml)
         target_link_libraries(${_test}
             Utils-qml
@@ -22,5 +22,6 @@
 endmacro(run_tests)
 
 run_tests(
+    qlimitproxymodeltest
     qsortfilterproxymodeltest
     )

=== added file 'tests/plugins/Utils/modeltest.cpp'
--- tests/plugins/Utils/modeltest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Utils/modeltest.cpp	2013-04-17 14:04:25 +0000
@@ -0,0 +1,605 @@
+/****************************************************************************
+** The full license is below, this is here to make licensecheck happy
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; version 2.1.
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtGui/QtGui>
+
+#include "modeltest.h"
+
+#include <QtTest/QtTest>
+
+/*!
+    Connect to all of the models signals.  Whenever anything happens recheck everything.
+*/
+ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false )
+{
+    if (!model)
+        qFatal("%s: model must not be null", Q_FUNC_INFO);
+
+    connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+
+    // Special checks for changes
+    connect(model, SIGNAL(layoutAboutToBeChanged()),
+            this, SLOT(layoutAboutToBeChanged()) );
+    connect(model, SIGNAL(layoutChanged()),
+            this, SLOT(layoutChanged()) );
+
+    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(rowsInserted(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsRemoved(QModelIndex,int,int)) );
+    connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)) );
+    connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+            this, SLOT(headerDataChanged(Qt::Orientation,int,int)) );
+
+    runAllTests();
+}
+
+void ModelTest::runAllTests()
+{
+    if ( fetchingMore )
+        return;
+    nonDestructiveBasicTest();
+    rowCount();
+    columnCount();
+    hasIndex();
+    index();
+    parent();
+    data();
+}
+
+/*!
+    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
+    to make sure the model doesn't outright segfault, testing the functions that makes sense.
+*/
+void ModelTest::nonDestructiveBasicTest()
+{
+    QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() );
+    model->canFetchMore ( QModelIndex() );
+    QVERIFY( model->columnCount ( QModelIndex() ) >= 0 );
+    QVERIFY( model->data ( QModelIndex() ) == QVariant() );
+    fetchingMore = true;
+    model->fetchMore ( QModelIndex() );
+    fetchingMore = false;
+    Qt::ItemFlags flags = model->flags ( QModelIndex() );
+    QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 );
+    model->hasChildren ( QModelIndex() );
+    model->hasIndex ( 0, 0 );
+    model->headerData ( 0, Qt::Horizontal );
+    model->index ( 0, 0 );
+    model->itemData ( QModelIndex() );
+    QVariant cache;
+    model->match ( QModelIndex(), -1, cache );
+    model->mimeTypes();
+    QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
+    QVERIFY( model->rowCount() >= 0 );
+    QVariant variant;
+    model->setData ( QModelIndex(), variant, -1 );
+    model->setHeaderData ( -1, Qt::Horizontal, QVariant() );
+    model->setHeaderData ( 999999, Qt::Horizontal, QVariant() );
+    QMap<int, QVariant> roles;
+    model->sibling ( 0, 0, QModelIndex() );
+    model->span ( QModelIndex() );
+    model->supportedDropActions();
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren()
+
+    Models that are dynamically populated are not as fully tested here.
+ */
+void ModelTest::rowCount()
+{
+//     qDebug() << "rc";
+    // check top row
+    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
+    int rows = model->rowCount ( topIndex );
+    QVERIFY( rows >= 0 );
+    if ( rows > 0 )
+        QVERIFY( model->hasChildren ( topIndex ) );
+
+    QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex );
+    if ( secondLevelIndex.isValid() ) { // not the top level
+        // check a row count where parent is valid
+        rows = model->rowCount ( secondLevelIndex );
+        QVERIFY( rows >= 0 );
+        if ( rows > 0 )
+            QVERIFY( model->hasChildren ( secondLevelIndex ) );
+    }
+
+    // The models rowCount() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren()
+ */
+void ModelTest::columnCount()
+{
+    // check top row
+    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
+    QVERIFY( model->columnCount ( topIndex ) >= 0 );
+
+    // check a column count where parent is valid
+    QModelIndex childIndex = model->index ( 0, 0, topIndex );
+    if ( childIndex.isValid() )
+        QVERIFY( model->columnCount ( childIndex ) >= 0 );
+
+    // columnCount() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::hasIndex()
+ */
+void ModelTest::hasIndex()
+{
+//     qDebug() << "hi";
+    // Make sure that invalid values returns an invalid index
+    QVERIFY( !model->hasIndex ( -2, -2 ) );
+    QVERIFY( !model->hasIndex ( -2, 0 ) );
+    QVERIFY( !model->hasIndex ( 0, -2 ) );
+
+    int rows = model->rowCount();
+    int columns = model->columnCount();
+
+    // check out of bounds
+    QVERIFY( !model->hasIndex ( rows, columns ) );
+    QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) );
+
+    if ( rows > 0 )
+        QVERIFY( model->hasIndex ( 0, 0 ) );
+
+    // hasIndex() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::index()
+ */
+void ModelTest::index()
+{
+//     qDebug() << "i";
+    // Make sure that invalid values returns an invalid index
+    QVERIFY( model->index ( -2, -2 ) == QModelIndex() );
+    QVERIFY( model->index ( -2, 0 ) == QModelIndex() );
+    QVERIFY( model->index ( 0, -2 ) == QModelIndex() );
+
+    int rows = model->rowCount();
+    int columns = model->columnCount();
+
+    if ( rows == 0 )
+        return;
+
+    // Catch off by one errors
+    QVERIFY( model->index ( rows, columns ) == QModelIndex() );
+    QVERIFY( model->index ( 0, 0 ).isValid() );
+
+    // Make sure that the same index is *always* returned
+    QModelIndex a = model->index ( 0, 0 );
+    QModelIndex b = model->index ( 0, 0 );
+    QVERIFY( a == b );
+
+    // index() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::parent()
+ */
+void ModelTest::parent()
+{
+//     qDebug() << "p";
+    // Make sure the model won't crash and will return an invalid QModelIndex
+    // when asked for the parent of an invalid index.
+    QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
+
+    if ( model->rowCount() == 0 )
+        return;
+
+    // Column 0                | Column 1    |
+    // QModelIndex()           |             |
+    //    \- topIndex          | topIndex1   |
+    //         \- childIndex   | childIndex1 |
+
+    // Common error test #1, make sure that a top level index has a parent
+    // that is a invalid QModelIndex.
+    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
+    QVERIFY( model->parent ( topIndex ) == QModelIndex() );
+
+    // Common error test #2, make sure that a second level index has a parent
+    // that is the first level index.
+    if ( model->rowCount ( topIndex ) > 0 ) {
+        QModelIndex childIndex = model->index ( 0, 0, topIndex );
+        QVERIFY( model->parent ( childIndex ) == topIndex );
+    }
+
+    // Common error test #3, the second column should NOT have the same children
+    // as the first column in a row.
+    // Usually the second column shouldn't have children.
+    QModelIndex topIndex1 = model->index ( 0, 1, QModelIndex() );
+    if ( model->rowCount ( topIndex1 ) > 0 ) {
+        QModelIndex childIndex = model->index ( 0, 0, topIndex );
+        QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 );
+        QVERIFY( childIndex != childIndex1 );
+    }
+
+    // Full test, walk n levels deep through the model making sure that all
+    // parent's children correctly specify their parent.
+    checkChildren ( QModelIndex() );
+}
+
+/*!
+    Called from the parent() test.
+
+    A model that returns an index of parent X should also return X when asking
+    for the parent of the index.
+
+    This recursive function does pretty extensive testing on the whole model in an
+    effort to catch edge cases.
+
+    This function assumes that rowCount(), columnCount() and index() already work.
+    If they have a bug it will point it out, but the above tests should have already
+    found the basic bugs because it is easier to figure out the problem in
+    those tests then this one.
+ */
+void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
+{
+    // First just try walking back up the tree.
+    QModelIndex p = parent;
+    while ( p.isValid() )
+        p = p.parent();
+
+    // For models that are dynamically populated
+    if ( model->canFetchMore ( parent ) ) {
+        fetchingMore = true;
+        model->fetchMore ( parent );
+        fetchingMore = false;
+    }
+
+    int rows = model->rowCount ( parent );
+    int columns = model->columnCount ( parent );
+
+    if ( rows > 0 )
+        QVERIFY( model->hasChildren ( parent ) );
+
+    // Some further testing against rows(), columns(), and hasChildren()
+    QVERIFY( rows >= 0 );
+    QVERIFY( columns >= 0 );
+    if ( rows > 0 )
+        QVERIFY( model->hasChildren ( parent ) );
+
+    //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows
+    //         << "columns:" << columns << "parent column:" << parent.column();
+
+    const QModelIndex topLeftChild = model->index( 0, 0, parent );
+
+    QVERIFY( !model->hasIndex ( rows + 1, 0, parent ) );
+    for ( int r = 0; r < rows; ++r ) {
+        if ( model->canFetchMore ( parent ) ) {
+            fetchingMore = true;
+            model->fetchMore ( parent );
+            fetchingMore = false;
+        }
+        QVERIFY( !model->hasIndex ( r, columns + 1, parent ) );
+        for ( int c = 0; c < columns; ++c ) {
+            QVERIFY( model->hasIndex ( r, c, parent ) );
+            QModelIndex index = model->index ( r, c, parent );
+            // rowCount() and columnCount() said that it existed...
+            QVERIFY( index.isValid() );
+
+            // index() should always return the same index when called twice in a row
+            QModelIndex modifiedIndex = model->index ( r, c, parent );
+            QVERIFY( index == modifiedIndex );
+
+            // Make sure we get the same index if we request it twice in a row
+            QModelIndex a = model->index ( r, c, parent );
+            QModelIndex b = model->index ( r, c, parent );
+            QVERIFY( a == b );
+
+            {
+                const QModelIndex sibling = model->sibling( r, c, topLeftChild );
+                QVERIFY( index == sibling );
+            }
+            {
+                const QModelIndex sibling = topLeftChild.sibling( r, c );
+                QVERIFY( index == sibling );
+            }
+
+            // Some basic checking on the index that is returned
+            QVERIFY( index.model() == model );
+            QCOMPARE( index.row(), r );
+            QCOMPARE( index.column(), c );
+            // While you can technically return a QVariant usually this is a sign
+            // of a bug in data().  Disable if this really is ok in your model.
+//            QVERIFY( model->data ( index, Qt::DisplayRole ).isValid() );
+
+            // If the next test fails here is some somewhat useful debug you play with.
+
+            if (model->parent(index) != parent) {
+                qDebug() << r << c << currentDepth << model->data(index).toString()
+                         << model->data(parent).toString();
+                qDebug() << index << parent << model->parent(index);
+//                 And a view that you can even use to show the model.
+//                 QTreeView view;
+//                 view.setModel(model);
+//                 view.show();
+            }
+
+            // Check that we can get back our real parent.
+            QCOMPARE( model->parent ( index ), parent );
+
+            // recursively go down the children
+            if ( model->hasChildren ( index ) && currentDepth < 10 ) {
+                //qDebug() << r << c << "has children" << model->rowCount(index);
+                checkChildren ( index, ++currentDepth );
+            }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/
+
+            // make sure that after testing the children that the index doesn't change.
+            QModelIndex newerIndex = model->index ( r, c, parent );
+            QVERIFY( index == newerIndex );
+        }
+    }
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::data()
+ */
+void ModelTest::data()
+{
+    // Invalid index should return an invalid qvariant
+    QVERIFY( !model->data ( QModelIndex() ).isValid() );
+
+    if ( model->rowCount() == 0 )
+        return;
+
+    // A valid index should have a valid QVariant data
+    QVERIFY( model->index ( 0, 0 ).isValid() );
+
+    // shouldn't be able to set data on an invalid index
+    QVERIFY( !model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) );
+
+    // General Purpose roles that should return a QString
+    QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole );
+    if ( variant.isValid() ) {
+        QVERIFY( variant.canConvert<QString>() );
+    }
+    variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole );
+    if ( variant.isValid() ) {
+        QVERIFY( variant.canConvert<QString>() );
+    }
+    variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole );
+    if ( variant.isValid() ) {
+        QVERIFY( variant.canConvert<QString>() );
+    }
+
+    // General Purpose roles that should return a QSize
+    variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole );
+    if ( variant.isValid() ) {
+        QVERIFY( variant.canConvert<QSize>() );
+    }
+
+    // General Purpose roles that should return a QFont
+    QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole );
+    if ( fontVariant.isValid() ) {
+        QVERIFY( fontVariant.canConvert<QFont>() );
+    }
+
+    // Check that the alignment is one we know about
+    QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
+    if ( textAlignmentVariant.isValid() ) {
+        int alignment = textAlignmentVariant.toInt();
+        QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
+    }
+
+    // General Purpose roles that should return a QColor
+    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole );
+    if ( colorVariant.isValid() ) {
+        QVERIFY( colorVariant.canConvert<QColor>() );
+    }
+
+    colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole );
+    if ( colorVariant.isValid() ) {
+        QVERIFY( colorVariant.canConvert<QColor>() );
+    }
+
+    // Check that the "check state" is one we know about.
+    QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole );
+    if ( checkStateVariant.isValid() ) {
+        int state = checkStateVariant.toInt();
+        QVERIFY( state == Qt::Unchecked ||
+                 state == Qt::PartiallyChecked ||
+                 state == Qt::Checked );
+    }
+}
+
+/*!
+    Store what is about to be inserted to make sure it actually happens
+
+    \sa rowsInserted()
+ */
+void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */)
+{
+//     Q_UNUSED(end);
+//    qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString()
+//    << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) );
+//     qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) );
+    Changing c;
+    c.parent = parent;
+    c.oldSize = model->rowCount ( parent );
+    c.last = model->data ( model->index ( start - 1, 0, parent ) );
+    c.next = model->data ( model->index ( start, 0, parent ) );
+    insert.push ( c );
+}
+
+/*!
+    Confirm that what was said was going to happen actually did
+
+    \sa rowsAboutToBeInserted()
+ */
+void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end )
+{
+    Changing c = insert.pop();
+    QVERIFY( c.parent == parent );
+//    qDebug() << "rowsInserted"  << "start=" << start << "end=" << end << "oldsize=" << c.oldSize
+//    << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent );
+
+//    for (int ii=start; ii <= end; ii++)
+//    {
+//      qDebug() << "itemWasInserted:" << ii << model->data ( model->index ( ii, 0, parent ));
+//    }
+//    qDebug();
+
+    QVERIFY( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) );
+    QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
+
+    if (c.next != model->data(model->index(end + 1, 0, c.parent))) {
+        qDebug() << start << end;
+        for (int i=0; i < model->rowCount(); ++i)
+            qDebug() << model->index(i, 0).data().toString();
+        qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent));
+    }
+
+    QVERIFY( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) );
+}
+
+void ModelTest::layoutAboutToBeChanged()
+{
+    for ( int i = 0; i < qBound ( 0, model->rowCount(), 100 ); ++i )
+        changing.append ( QPersistentModelIndex ( model->index ( i, 0 ) ) );
+}
+
+void ModelTest::layoutChanged()
+{
+    for ( int i = 0; i < changing.count(); ++i ) {
+        QPersistentModelIndex p = changing[i];
+        QVERIFY( p == model->index ( p.row(), p.column(), p.parent() ) );
+    }
+    changing.clear();
+}
+
+/*!
+    Store what is about to be inserted to make sure it actually happens
+
+    \sa rowsRemoved()
+ */
+void ModelTest::rowsAboutToBeRemoved ( const QModelIndex &parent, int start, int end )
+{
+qDebug() << "ratbr" << parent << start << end;
+    Changing c;
+    c.parent = parent;
+    c.oldSize = model->rowCount ( parent );
+    c.last = model->data ( model->index ( start - 1, 0, parent ) );
+    c.next = model->data ( model->index ( end + 1, 0, parent ) );
+    remove.push ( c );
+}
+
+/*!
+    Confirm that what was said was going to happen actually did
+
+    \sa rowsAboutToBeRemoved()
+ */
+void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end )
+{
+  qDebug() << "rr" << parent << start << end;
+    Changing c = remove.pop();
+    QVERIFY( c.parent == parent );
+    QVERIFY( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) );
+    QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
+    QVERIFY( c.next == model->data ( model->index ( start, 0, c.parent ) ) );
+}
+
+void ModelTest::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+    QVERIFY(topLeft.isValid());
+    QVERIFY(bottomRight.isValid());
+    QModelIndex commonParent = bottomRight.parent();
+    QVERIFY(topLeft.parent() == commonParent);
+    QVERIFY(topLeft.row() <= bottomRight.row());
+    QVERIFY(topLeft.column() <= bottomRight.column());
+    int rowCount = model->rowCount(commonParent);
+    int columnCount = model->columnCount(commonParent);
+    QVERIFY(bottomRight.row() < rowCount);
+    QVERIFY(bottomRight.column() < columnCount);
+}
+
+void ModelTest::headerDataChanged(Qt::Orientation orientation, int start, int end)
+{
+    QVERIFY(start >= 0);
+    QVERIFY(end >= 0);
+    QVERIFY(start <= end);
+    int itemCount = orientation == Qt::Vertical ? model->rowCount() : model->columnCount();
+    QVERIFY(start < itemCount);
+    QVERIFY(end < itemCount);
+}
+

=== added file 'tests/plugins/Utils/modeltest.h'
--- tests/plugins/Utils/modeltest.h	1970-01-01 00:00:00 +0000
+++ tests/plugins/Utils/modeltest.h	2013-04-17 14:04:25 +0000
@@ -0,0 +1,101 @@
+/****************************************************************************
+** The full license is below, this is here to make licensecheck happy
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; version 2.1.
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef MODELTEST_H
+#define MODELTEST_H
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QStack>
+
+class ModelTest : public QObject
+{
+  Q_OBJECT
+
+public:
+  ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
+
+private Q_SLOTS:
+  void nonDestructiveBasicTest();
+  void rowCount();
+  void columnCount();
+  void hasIndex();
+  void index();
+  void parent();
+  void data();
+
+protected Q_SLOTS:
+  void runAllTests();
+  void layoutAboutToBeChanged();
+  void layoutChanged();
+  void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end );
+  void rowsInserted( const QModelIndex & parent, int start, int end );
+  void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end );
+  void rowsRemoved( const QModelIndex & parent, int start, int end );
+  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+  void headerDataChanged(Qt::Orientation orientation, int start, int end);
+
+private:
+  void checkChildren( const QModelIndex &parent, int currentDepth = 0 );
+
+  QAbstractItemModel *model;
+
+  struct Changing {
+    QModelIndex parent;
+    int oldSize;
+    QVariant last;
+    QVariant next;
+  };
+  QStack<Changing> insert;
+  QStack<Changing> remove;
+
+  bool fetchingMore;
+
+  QList<QPersistentModelIndex> changing;
+};
+
+#endif

=== added file 'tests/plugins/Utils/qlimitproxymodeltest.cpp'
--- tests/plugins/Utils/qlimitproxymodeltest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Utils/qlimitproxymodeltest.cpp	2013-04-17 14:04:25 +0000
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) 2011, 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// local
+#include "qlimitproxymodelqml.h"
+#include "modeltest.h"
+
+// Qt
+#include <QTest>
+#include <QSignalSpy>
+#include <QModelIndex>
+#include <QAbstractListModel>
+#include <QDebug>
+
+
+class MockListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    MockListModel(QObject* parent = 0)
+        : QAbstractListModel(parent)
+    {
+    }
+
+    int rowCount(const QModelIndex& /* parent */ = QModelIndex()) const
+    {
+        return m_list.size();
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    {
+        if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size() || role != Qt::DisplayRole) {
+           return QVariant();
+        }
+        return QVariant(m_list[index.row()]);
+    }
+
+    QHash<int, QByteArray> roleNames() const
+    {
+        return m_roles;
+    }
+
+    void setRoles(const QHash<int,QByteArray> &roles) {
+        m_roles = roles;
+    }
+
+    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+        beginInsertRows(parent, row, row+count-1);
+        for (int i=0; i<count; i++) {
+            m_list.insert(i+row, "test"+i);
+        }
+        endInsertRows();
+        return true;
+    }
+
+    bool appendRows(QStringList &rows, const QModelIndex &parent=QModelIndex()) {
+        beginInsertRows(parent, rowCount(), rowCount() + rows.count() - 1);
+        m_list.append(rows);
+        endInsertRows();
+        return true;
+    }
+
+    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+        beginRemoveRows(parent, row, row+count-1);
+        for (int i=0; i<count; i++) {
+            m_list.removeAt(row);
+        }
+        endRemoveRows();
+        return true;
+    }
+
+private:
+    QStringList m_list;
+    QHash<int, QByteArray> m_roles;
+};
+
+class QLimitProxyModelTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase() {
+        qRegisterMetaType<QModelIndex>("QModelIndex");
+    }
+
+    void testRoleNamesSetAfter()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QHash<int, QByteArray> roles;
+
+        proxy.setModel(&model);
+
+        roles[0] = "role0";
+        roles[1] = "role1";
+        model.setRoles(roles);
+        QCOMPARE(model.roleNames(), proxy.roleNames());
+    }
+
+    void testRoleNamesSetBefore()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QHash<int, QByteArray> roles;
+
+        roles[0] = "role0";
+        roles[1] = "role1";
+        model.setRoles(roles);
+
+        proxy.setModel(&model);
+        QCOMPARE(model.roleNames(), proxy.roleNames());
+    }
+
+    void testCountSetAfter()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        model.insertRows(0, 5);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setModel(&model);
+        QCOMPARE(proxy.rowCount(), 5);
+        QVERIFY(spyOnCountChanged.count() >= 1);
+    }
+
+    void testCountInsert()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setModel(&model);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(proxy.rowCount(), 5);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testCountRemove()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        model.insertRows(0, 5);
+
+        proxy.setModel(&model);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.removeRows(0, 3);
+        QCOMPARE(proxy.rowCount(), 2);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testLimitCount()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setModel(&model);
+        proxy.setLimit(3);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(proxy.rowCount(), 3);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testLimitLesserThanCount()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 10);
+
+        proxy.setModel(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(5);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 5);
+        QCOMPARE(arguments.at(2).toInt(), 9);
+        QCOMPARE(proxy.rowCount(), 5);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 5);
+        QCOMPARE(arguments.at(2).toInt(), 6);
+        QCOMPARE(proxy.rowCount(), 7);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 6);
+        QCOMPARE(proxy.rowCount(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitGreaterThanCount()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 5);
+
+        proxy.setModel(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.rowCount(), 5);
+
+        proxy.setLimit(5);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.rowCount(), 5);
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.rowCount(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(4);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 3);
+        QCOMPARE(proxy.rowCount(), 4);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 4);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.rowCount(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitMinusOne()
+    {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 5);
+
+        proxy.setModel(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.rowCount(), 5);
+
+        proxy.setLimit(-1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.rowCount(), 5);
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.rowCount(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(-1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.rowCount(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitInsert() {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+
+        proxy.setModel(&model);
+        proxy.setLimit(7);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 0);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.rowCount(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        model.insertRows(2, 2);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 2);
+        QCOMPARE(arguments.at(2).toInt(), 3);
+        QCOMPARE(proxy.rowCount(), 7);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        model.insertRows(7, 3);
+        QCOMPARE(proxy.rowCount(), 7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+    }
+
+    void testLimitRemove() {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+
+        proxy.setModel(&model);
+        proxy.setLimit(7);
+
+        model.insertRows(0, 12);
+
+        QCOMPARE(proxy.rowCount(), 7);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.removeRows(7, 3);
+        QCOMPARE(proxy.rowCount(), 7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+
+        model.removeRows(2, 2);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 2);
+        QCOMPARE(arguments.at(2).toInt(), 3);
+        QCOMPARE(proxy.rowCount(), 7);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        model.removeRows(0, 7);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 0);
+        QCOMPARE(arguments.at(2).toInt(), 6);
+        QCOMPARE(proxy.rowCount(), 0);
+    }
+
+    void testNestedProxyRoleNames() {
+        QLimitProxyModelQML proxy1, proxy2;
+        MockListModel model;
+        QHash<int, QByteArray> roles;
+        roles[0] = "role0";
+        roles[1] = "role1";
+        model.setRoles(roles);
+
+        proxy1.setModel(&model);
+        proxy2.setModel(&proxy1);
+
+        QCOMPARE(proxy2.roleNames(), model.roleNames());
+    }
+
+    void testModelTest() {
+        QLimitProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setModel(&model);
+        proxy.setLimit(7);
+
+        model.insertRows(0, 12);
+
+        ModelTest t1(&proxy);
+    }
+    void testModelChanged() {
+        QLimitProxyModelQML proxy;
+        MockListModel model, model2;
+
+        QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 1);
+
+        proxy.setModel(&model2);
+        QCOMPARE(spyOnModelChanged.count(), 2);
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 3);
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 3);
+    }
+};
+
+QTEST_MAIN(QLimitProxyModelTest)
+
+#include "qlimitproxymodeltest.moc"
+

=== modified file 'tests/plugins/Utils/qsortfilterproxymodeltest.cpp'
--- tests/plugins/Utils/qsortfilterproxymodeltest.cpp	2013-04-12 07:59:00 +0000
+++ tests/plugins/Utils/qsortfilterproxymodeltest.cpp	2013-04-17 14:04:25 +0000
@@ -19,6 +19,7 @@
 
 // local
 #include "qsortfilterproxymodelqml.h"
+#include "modeltest.h"
 
 // Qt
 #include <QTest>
@@ -45,9 +46,7 @@
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
     {
-        Q_UNUSED(role)
-
-        if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size()) {
+        if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size() || role != Qt::DisplayRole) {
            return QVariant();
         }
         return QVariant(m_list[index.row()]);
@@ -83,7 +82,7 @@
         for (int i=0; i<count; i++) {
             m_list.removeAt(row);
         }
-        endInsertRows();
+        endRemoveRows();
         return true;
     }
 
@@ -164,6 +163,7 @@
         model.insertRows(0, 5);
 
         proxy.setModel(&model);
+        QCOMPARE(proxy.count(), 5);
 
         QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
 
@@ -172,221 +172,6 @@
         QCOMPARE(spyOnCountChanged.count(), 1);
     }
 
-    void testLimitCount()
-    {
-        QSortFilterProxyModelQML proxy;
-        MockListModel model;
-
-        proxy.setModel(&model);
-        proxy.setLimit(3);
-
-        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
-
-        model.insertRows(0, 5);
-        QCOMPARE(proxy.count(), 3);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-    }
-
-    void testLimitLesserThanCount()
-    {
-        QSortFilterProxyModelQML proxy;
-        MockListModel model;
-        QList<QVariant> arguments;
-        model.insertRows(0, 10);
-
-        proxy.setModel(&model);
-
-        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
-        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
-
-        /* FIXME: for some reason the rowsRemoved is not emitted if
-           proxy.rowCount is not called before.
-        */
-        proxy.rowCount();
-        proxy.setLimit(5);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        QCOMPARE(spyOnRowsRemoved.count(), 1);
-        arguments = spyOnRowsRemoved.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 5);
-        QCOMPARE(arguments.at(2).toInt(), 9);
-        QCOMPARE(proxy.count(), 5);
-        spyOnRowsRemoved.clear();
-        spyOnCountChanged.clear();
-
-        proxy.setLimit(7);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 5);
-        QCOMPARE(arguments.at(2).toInt(), 6);
-        QCOMPARE(proxy.count(), 7);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-
-        proxy.setLimit(3);
-        QCOMPARE(spyOnRowsRemoved.count(), 1);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsRemoved.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 3);
-        QCOMPARE(arguments.at(2).toInt(), 6);
-        QCOMPARE(proxy.count(), 3);
-        spyOnRowsRemoved.clear();
-        spyOnCountChanged.clear();
-    }
-
-    void testLimitGreaterThanCount()
-    {
-        QSortFilterProxyModelQML proxy;
-        MockListModel model;
-        QList<QVariant> arguments;
-        model.insertRows(0, 5);
-
-        proxy.setModel(&model);
-
-        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
-        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
-
-        proxy.setLimit(7);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 0);
-        QCOMPARE(proxy.count(), 5);
-
-        proxy.setLimit(5);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 0);
-        QCOMPARE(proxy.count(), 5);
-
-        proxy.setLimit(3);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnRowsRemoved.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsRemoved.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 3);
-        QCOMPARE(arguments.at(2).toInt(), 4);
-        QCOMPARE(proxy.count(), 3);
-        spyOnRowsRemoved.clear();
-        spyOnCountChanged.clear();
-
-        proxy.setLimit(4);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 3);
-        QCOMPARE(arguments.at(2).toInt(), 3);
-        QCOMPARE(proxy.count(), 4);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-
-        proxy.setLimit(7);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 4);
-        QCOMPARE(arguments.at(2).toInt(), 4);
-        QCOMPARE(proxy.count(), 5);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-    }
-
-    void testLimitMinusOne()
-    {
-        QSortFilterProxyModelQML proxy;
-        MockListModel model;
-        QList<QVariant> arguments;
-        model.insertRows(0, 5);
-
-        proxy.setModel(&model);
-
-        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
-        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
-
-        proxy.setLimit(7);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 0);
-        QCOMPARE(proxy.count(), 5);
-
-        proxy.setLimit(-1);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnCountChanged.count(), 0);
-        QCOMPARE(proxy.count(), 5);
-
-        proxy.setLimit(3);
-        QCOMPARE(spyOnRowsInserted.count(), 0);
-        QCOMPARE(spyOnRowsRemoved.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsRemoved.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 3);
-        QCOMPARE(arguments.at(2).toInt(), 4);
-        QCOMPARE(proxy.count(), 3);
-        spyOnRowsRemoved.clear();
-        spyOnCountChanged.clear();
-
-        proxy.setLimit(-1);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 3);
-        QCOMPARE(arguments.at(2).toInt(), 4);
-        QCOMPARE(proxy.count(), 5);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-    }
-
-    void testLimitInsert() {
-        QSortFilterProxyModelQML proxy;
-        MockListModel model;
-        QList<QVariant> arguments;
-
-        proxy.setModel(&model);
-        proxy.setLimit(7);
-
-        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
-        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
-
-        model.insertRows(0, 5);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 0);
-        QCOMPARE(arguments.at(2).toInt(), 4);
-        QCOMPARE(proxy.count(), 5);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-
-        model.insertRows(2, 2);
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        QCOMPARE(spyOnRowsInserted.count(), 1);
-        QCOMPARE(spyOnCountChanged.count(), 1);
-        arguments = spyOnRowsInserted.takeFirst();
-        QCOMPARE(arguments.at(1).toInt(), 2);
-        QCOMPARE(arguments.at(2).toInt(), 3);
-        QCOMPARE(proxy.count(), 7);
-        spyOnRowsInserted.clear();
-        spyOnCountChanged.clear();
-
-        /* FIXME: failing case */
-        model.insertRows(5, 3);
-        //QCOMPARE(proxy.count(), 7); // proxy.count == 9
-        QCOMPARE(spyOnRowsRemoved.count(), 0);
-        //QCOMPARE(spyOnRowsInserted.count(), 0); // spyOnRowsInserted.count == 1
-        //QCOMPARE(spyOnCountChanged.count(), 0); // spyOnCountChanged.count == 1
-    }
-
     void testInvertMatch() {
         QSortFilterProxyModelQML proxy;
         MockListModel model;
@@ -442,6 +227,42 @@
 
         QCOMPARE(proxy2.roleNames(), model.roleNames());
     }
+
+    void testModelTest() {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setModel(&model);
+        proxy.setDynamicSortFilter(true);
+
+        QStringList rows;
+        rows << "a/foobar/b" << "foobar" << "foobarbaz" << "hello";
+        model.appendRows(rows);
+
+        proxy.setInvertMatch(true);
+        proxy.setFilterRegExp("^foobar$");
+
+        ModelTest t1(&proxy);
+    }
+
+    void testModelChanged() {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model, model2;
+
+        QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 1);
+
+        proxy.setModel(&model2);
+        QCOMPARE(spyOnModelChanged.count(), 2);
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 3);
+
+        proxy.setModel(&model);
+        QCOMPARE(spyOnModelChanged.count(), 3);
+    }
 };
 
 QTEST_MAIN(QSortFilterProxyModelTest)