Merge lp:~renatofilho/history-service/export-qml-sortproxymodel into lp:history-service

[Renato Araujo Oliveira Filho]

Added "count" property for sortproxymodel;
Added "get" function for sortproxymodel;

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/history-service-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/132/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'Ubuntu/History/sortproxymodel.cpp'
--- Ubuntu/History/sortproxymodel.cpp	2013-07-23 22:58:42 +0000
+++ Ubuntu/History/sortproxymodel.cpp	2014-08-06 14:36:58 +0000
@@ -27,6 +27,10 @@
 {
     setDynamicSortFilter(true);
     updateSorting();
+
+    connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
 }
 
 bool SortProxyModel::ascending() const
@@ -43,6 +47,21 @@
     }
 }
 
+QVariant SortProxyModel::get(int row) const
+{
+    QVariantMap data;
+    QModelIndex sourceIndex = mapToSource(index(row, 0));
+    if (sourceIndex.isValid()) {
+        QAbstractItemModel *source = sourceModel();
+        QHash<int, QByteArray> roles = source->roleNames();
+        Q_FOREACH(int role, roles.keys()) {
+            data.insert(roles[role], source->data(sourceIndex, role));
+        }
+    }
+
+    return data;
+}
+
 void SortProxyModel::updateSorting()
 {
     sort(0, mAscending ? Qt::AscendingOrder : Qt::DescendingOrder);

=== modified file 'Ubuntu/History/sortproxymodel.h'
--- Ubuntu/History/sortproxymodel.h	2013-07-24 12:07:07 +0000
+++ Ubuntu/History/sortproxymodel.h	2014-08-06 14:36:58 +0000
@@ -31,6 +31,7 @@
                READ ascending
                WRITE setAscending
                NOTIFY ascendingChanged)
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
 public:
     explicit SortProxyModel(QObject *parent = 0);
@@ -38,11 +39,14 @@
     bool ascending() const;
     void setAscending(bool value);
 
+    Q_INVOKABLE QVariant get(int row) const;
+
 private Q_SLOTS:
     void updateSorting();
 
 Q_SIGNALS:
     void ascendingChanged();
+    void countChanged();
 
 private:
     bool mAscending;