Merge lp:~osomon/ubuntu-calendar-app/reload-function-not-signal into lp:ubuntu-calendar-app

[Olivier Tilloy]

Make EventListModel.reload() a function, not a signal.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/40/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/147
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

looks good to me

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/12/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/12

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2013-03-27 23:09:07 +0000
+++ EventListModel.qml	2013-09-02 18:10:47 +0000
@@ -8,15 +8,16 @@
     property var termStart: new Date()
     property var termLength: Date.msPerDay
 
-    signal reload
+    signal reloaded
 
-    onReload: {
+    function reload() {
         var t0 = termStart.getTime()
         var t1 = t0 + termLength
         model.clear()
         DataService.getEvents(t0, t1, model)
         // for (var i = 0; i < model.count; ++i)
         //     DataService.printEvent(model.get(i))
+        reloaded()
     }
     Component.onCompleted: {
         reload()
 
=== modified file 'EventViewBase.qml'
--- EventViewBase.qml	2013-06-02 02:33:33 +0000
+++ EventViewBase.qml	2013-09-02 18:10:47 +0000
@@ -23,7 +23,7 @@
         termStart: dayStart
         termLength: Date.msPerDay
 
-        onReload: {
+        onReloaded: {
             modelRefreshed();
         }
     }
 
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2013-08-27 14:41:12 +0000
+++ TimeLineBase.qml	2013-09-02 18:10:47 +0000
@@ -14,7 +14,7 @@
         termStart: bubbleOverLay.day.midnight()
         termLength: Date.msPerDay
 
-        onReload: {
+        onReloaded: {
             bubbleOverLay.createEvents();
         }
     }