Merge lp:~tiagosh/history-service/fix-qt52 into lp:history-service

[Tiago Salem Herrmann]

Check if the model is already empty before removing items in order to avoid an assert() in qt 5.2.

Check if the model is already empty before removing items in order to avoid an assert() in qt 5.2.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/history-service-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/history-service-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-trusty-i386-ci/26

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telepathy-ofono/telepathy-ofono-groupchat/+merge/204321

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/history-service) on device or emulator?
Yes.

If you changed the UI, was the change specified/approved by design?
No UI changes.

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
No packaging changes.

[Tiago Salem Herrmann (tiagosh)]

> Are there any related MPs required for this MP to build/function as expected?
> Please list.
> https://code.launchpad.net/~tiagosh/telepathy-ofono/telepathy-ofono-
> groupchat/+merge/204321
>

Actually, there are no dependencies. Please, ignore the link above.

[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 you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/history-service) 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/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2013-12-09 21:18:14 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2014-02-04 16:25:58 +0000
@@ -194,11 +194,11 @@
     qDebug() << "Got events:" << events.count();
     if (events.isEmpty()) {
         mCanFetchMore = false;
+    } else {
+        beginInsertRows(QModelIndex(), mEvents.count(), mEvents.count() + events.count() - 1);
+        mEvents << events;
+        endInsertRows();
     }
-
-    beginInsertRows(QModelIndex(), mEvents.count(), mEvents.count() + events.count() - 1);
-    mEvents << events;
-    endInsertRows();
 }
 
 QHash<int, QByteArray> HistoryEventModel::roleNames() const
@@ -307,9 +307,11 @@
 void HistoryEventModel::updateQuery()
 {
     // remove all events from the model
-    beginRemoveRows(QModelIndex(), 0, mEvents.count() - 1);
-    mEvents.clear();
-    endRemoveRows();
+    if (!mEvents.isEmpty()) {
+        beginRemoveRows(QModelIndex(), 0, mEvents.count() - 1);
+        mEvents.clear();
+        endRemoveRows();
+    }
 
     // and create the view again
     History::Filter queryFilter;

=== modified file 'Ubuntu/History/historythreadmodel.cpp'
--- Ubuntu/History/historythreadmodel.cpp	2013-12-09 21:18:14 +0000
+++ Ubuntu/History/historythreadmodel.cpp	2014-02-04 16:25:58 +0000
@@ -211,11 +211,11 @@
     History::Threads threads = mThreadView->nextPage();
     if (threads.isEmpty()) {
         mCanFetchMore = false;
+    } else {
+        beginInsertRows(QModelIndex(), mThreads.count(), mThreads.count() + threads.count() - 1);
+        mThreads << threads;
+        endInsertRows();
     }
-
-    beginInsertRows(QModelIndex(), mThreads.count(), mThreads.count() + threads.count() - 1);
-    mThreads << threads;
-    endInsertRows();
 }
 
 QHash<int, QByteArray> HistoryThreadModel::roleNames() const
@@ -308,10 +308,12 @@
 void HistoryThreadModel::updateQuery()
 {
     // remove all events from the model
-    beginRemoveRows(QModelIndex(), 0, mThreads.count() - 1);
-    mThreads.clear();
-    endRemoveRows();
-
+    if (!mThreads.isEmpty()) {
+        beginRemoveRows(QModelIndex(), 0, mThreads.count() - 1);
+        mThreads.clear();
+        endRemoveRows();
+    }
+ 
     // and fetch again
     mCanFetchMore = true;