Merge lp:~zsombi/ubuntu-ui-toolkit/expose-alarmmodel-reset into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Expose refresh() function in revision 1 (Ubuntu.Components 1.1)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1302
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/expose-alarmmodel-reset/+merge/238802/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6060/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/981/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7312/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/expose-alarmmodel-reset]

1303. By Zsombor Egri on 2014-11-20

prereq sync

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1303
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1237/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6576/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1070/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1069/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1069/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7828/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1237/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

modules/Ubuntu/Components/plugin/ucalarmmodel.cpp:233: warning: Unrecognizable QML module/component qualifier for refresh()

It should be \qmlmethod void AlarmModel::refresh()

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/expose-alarmmodel-reset]

1304. By Zsombor Egri on 2014-11-20

prereq sync

1305. By Zsombor Egri on 2014-11-20

prereq sync

1306. By Zsombor Egri on 2014-11-20

prereq sync

[Cris Dywan (kalikiana)]

Nice! (Although I don't "like" the change… it's good for what it does ;-))

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6586/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1078
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1078
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6158/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16053

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1246/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2014-11-18 13:32:37 +0000
+++ components.api	2014-11-20 13:44:49 +0000
@@ -834,6 +834,7 @@
     prototype: "QAbstractListModel"
     exports: ["AlarmModel 0.1", "AlarmModel 1.0"]
     Property { name: "count"; type: "int"; isReadonly: true }
+    Method { name: "refresh"; revision: 1 }
     Method {
     name: "get"
     Parameter { name: "index"; type: "int" }

=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-11-20 13:44:48 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-11-20 13:44:49 +0000
@@ -151,7 +151,7 @@
 void UCAlarmModel::componentComplete()
 {
     // fetch alarms
-    AlarmManager::instance().fetchAlarms();
+    refresh();
 }
 
 int UCAlarmModel::rowCount(const QModelIndex &parent) const
@@ -225,6 +225,17 @@
 }
 
 /*!
+ * \qmlmethod AlarmModel::refresh()
+ * The function refreshes the model by invalidating the alarm cache. Use this
+ * function only if the refresh is absolutely required, otherwise it will cause
+ * performance problems.
+ */
+void UCAlarmModel::refresh()
+{
+    AlarmManager::instance().fetchAlarms();
+}
+
+/*!
  * \internal
  * The slot prepares the model reset.
  */

=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.h'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.h	2014-11-20 13:44:48 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.h	2014-11-20 13:44:49 +0000
@@ -50,6 +50,9 @@
 Q_SIGNALS:
     void countChanged();
 
+public Q_SLOTS:
+    Q_REVISION(1) void refresh();
+
 private Q_SLOTS:
     void refreshStart();
     void refreshEnd();