Merge lp:~mihirsoni/telegram-app/addedGetFunction into lp:telegram-app/dev

[Mihir Soni]

- Added getFunction in SortProxyModel to get data based on index.

- Added getFunction in SortProxyModel to get data based on index.

[Michał Karnicki (karni)]

review: Needs Information

[lp:~mihirsoni/telegram-app/addedGetFunction]

77. By Mihir Soni on 2014-10-08

addressed review comments

78. By Mihir Soni on 2014-10-08

resolve typo

79. By Mihir Soni on 2014-10-08

appropriate var names

[Michał Karnicki (karni)]

This looks good. I'd like to top-approve once the QML counterpart is ready to test this with :)

review: Approve

=== modified file 'qmlplugin/models/sortproxymodel.cpp'
--- qmlplugin/models/sortproxymodel.cpp	2014-09-12 08:15:27 +0000
+++ qmlplugin/models/sortproxymodel.cpp	2014-10-08 18:22:28 +0000
@@ -59,6 +59,19 @@
     }
 }
 
+QVariant SortProxyModel::get(int rowIndex) const {
+    QVariantMap data;
+    QModelIndex sourceIndex = mapToSource(index(rowIndex, 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 'qmlplugin/models/sortproxymodel.h'
--- qmlplugin/models/sortproxymodel.h	2014-08-13 20:17:27 +0000
+++ qmlplugin/models/sortproxymodel.h	2014-10-08 18:22:28 +0000
@@ -28,6 +28,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool ascending READ ascending WRITE setAscending NOTIFY ascendingChanged)
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
     Q_PROPERTY(QString searchTerm READ searchTerm WRITE setSearchTerm NOTIFY searchTermChanged)
 
 public:
@@ -35,6 +36,7 @@
 
     bool ascending() const;
     void setAscending(bool value);
+    Q_INVOKABLE QVariant get(int rowIndex) const;
 
     QString searchTerm() const;
     void setSearchTerm(QString searchTerm);
@@ -45,6 +47,7 @@
 Q_SIGNALS:
     void ascendingChanged();
     void searchTermChanged();
+    void countChanged();
 
 private:
     bool mAscending;