Merge lp:~aacid/dee-qt/behave_better into lp:dee-qt

[Albert Astals Cid]

Be a better behaved QAbstractListModel

That means:
  * decrement/increment the count between the begin/end calls
  * Add a workaround so that data() ignores the not really removed row after endRemoveRows has been called

We still are not good behaved in the fact that we call beginInsertRows
after the model has been internall modified, but luckily it seems
not much people listens to that signal's data

We also rely on the fact that nothing will call data() between us
resetting m_rowBeingRemoved to -1 at the end of DeeListModelPrivate::onRowRemoved
and the internal dee model actually removing the row

[lp:~aacid/dee-qt/behave_better]

82. By Albert Astals Cid on 2013-08-21

move the if inside the if

83. By Albert Astals Cid on 2013-08-21

Actually don't need the if

[Michal Hruby (mhr3)]

Looks reasonable, it certainly isn't ideal, but that's as far as we can go since changes to dee models emit just a single signal, which isn't easy to map to Qt's begin and end change model.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/dee-qt-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-qt-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-qt-saucy-armhf-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dee-qt-ci/9/rebuild

review: Approve (continuous-integration)

=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2013-07-25 14:23:11 +0000
+++ deelistmodel.cpp	2013-08-21 11:03:21 +0000
@@ -49,9 +49,10 @@
     int m_count;
     bool m_listeningSynchronized;
     QHash<int, QByteArray> m_roleNames;
+    int m_rowBeingRemoved;
 };
 
-DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0), m_listeningSynchronized(false)
+DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0), m_listeningSynchronized(false), m_rowBeingRemoved(-1)
 {
 }
 
@@ -180,7 +181,6 @@
         return;
     }
 
-    model->d->m_count++;
     gint position = dee_model_get_position(model->d->m_deeModel, iter);
     /* Force emission of QAbstractItemModel::rowsInserted by calling
        beginInsertRows and endInsertRows. Necessary because according to the
@@ -189,6 +189,7 @@
         cannot be explicitly emitted in subclass code."
     */
     model->beginInsertRows(QModelIndex(), position, position);
+    model->d->m_count++;
     model->endInsertRows();
     Q_EMIT model->countChanged();
 }
@@ -207,7 +208,6 @@
        what one would expect.
        See Dee's dee_sequence_model_remove() method.
     */
-    model->d->m_count--;
     gint position = dee_model_get_position(model->d->m_deeModel, iter);
     /* Force emission of QAbstractItemModel::rowsRemoved by calling
        beginRemoveRows and endRemoveRows. Necessary because according to the
@@ -216,8 +216,11 @@
         cannot be explicitly emitted in subclass code."
     */
     model->beginRemoveRows(QModelIndex(), position, position);
+    model->d->m_rowBeingRemoved = position;
+    model->d->m_count--;
     model->endRemoveRows();
     Q_EMIT model->countChanged();
+    model->d->m_rowBeingRemoved = -1;
 }
 
 void
@@ -316,7 +319,12 @@
     GVariant* gvariant;
     DeeModelIter* iter;
 
-    iter = dee_model_get_iter_at_row(d->m_deeModel, index.row());
+    int row = index.row();
+    if (d->m_rowBeingRemoved >= 0 && row >= d->m_rowBeingRemoved) {
+        row++;
+    }
+
+    iter = dee_model_get_iter_at_row(d->m_deeModel, row);
     gvariant = dee_model_get_value(d->m_deeModel, iter, role);
     QVariant qvariant = QVariantFromGVariant(gvariant);
     g_variant_unref(gvariant);