Merge lp:~nik90/ubuntu-clock-app/11-remove-utils into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Removed unnecessary Utils.js library

The Utils.js library was added in the very beginning to neatly enable/disable debugMode using just a variable. In debugMode there would be more console output to help debug an issue. However this wasn't used for several reasons and just collecting dust. Hence I am removing it.

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

FAILED: Continuous integration, rev:105
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/519/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/676
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/676/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/166/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

#blocked on Jenkins. This requires a patch to the Jenkins environment since the xvfb package which is used to run the clock app tests takes input focus away from the clock app when it is launched. This is causing the AP tests to be pass. Francis and Nicholas have been informed. Once jenkins is fixed, we should be good to merge this branch.

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

You forgot a reference to Utils:
https://bazaar.launchpad.net/~nik90/ubuntu-clock-app/11-remove-utils/view/head:/app/alarm/EditAlarmPage.qml#L127

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/11-remove-utils]

106. By Nekhelesh Ramananthan on 2014-10-09

removed the use of Utils library in EditAlarm page

107. By Nekhelesh Ramananthan on 2014-10-09

merged prerequisite branch

108. By Nekhelesh Ramananthan on 2014-10-09

Updated debian changelog

[Riccardo Padovani (rpadovani)]

Now lgtm

review: Approve

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

PASSED: Continuous integration, rev:108
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/539/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/805
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/805/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2014-09-25 11:26:43 +0000
+++ app/alarm/AlarmList.qml	2014-10-09 16:42:05 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
 import "../upstreamcomponents"
-import "../components/Utils.js" as Utils
 
 MultipleSelectionListView {
     id: alarmListView

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-09-26 12:24:11 +0000
+++ app/alarm/AlarmPage.qml	2014-10-09 16:42:05 +0000
@@ -26,7 +26,7 @@
     title: i18n.tr("Alarms")
     objectName: 'AlarmPage'
 
-    Component.onCompleted: console.log("Alarm Page loaded")
+    Component.onCompleted: console.log("[LOG]: Alarm Page loaded")
 
     flickable: null
 

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-09-25 11:26:43 +0000
+++ app/alarm/EditAlarmPage.qml	2014-10-09 16:42:05 +0000
@@ -23,7 +23,6 @@
 import Ubuntu.Components.Pickers 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
-import "../components/Utils.js" as Utils
 
 Page {
     id: _addAlarmPage
@@ -125,7 +124,7 @@
     // Function to validate if the alarm was saved properly
     function validateAlarm(alarmObject) {
         if (alarmObject.error !== Alarm.NoError) {
-            Utils.log(debugMode, "Error saving alarm, code: " + alarmObject.error)
+            console.log("[ERROR]: Error saving alarm, code: " + alarmObject.error)
             return false
         }
         else {
@@ -177,7 +176,7 @@
 
         onErrorChanged: {
             if (error !== Alarm.NoError) {
-                Utils.log(debugMode, "Error saving alarm, code: " + error)
+                console.log("[LOG]: Error saving alarm, code: " + error)
             }
         }
 

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-10-09 16:42:05 +0000
+++ app/clock/ClockPage.qml	2014-10-09 16:42:05 +0000
@@ -36,7 +36,7 @@
     flickable: null
 
     Component.onCompleted: {
-        console.log("[LOG] Clock Page loaded")
+        console.log("[LOG]: Clock Page loaded")
         _clockPage.setBottomEdgePage(Qt.resolvedUrl("../alarm/AlarmPage.qml"), {})
     }
 

=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml	2014-10-09 16:42:05 +0000
+++ app/components/Clock.qml	2014-10-09 16:42:05 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import "Utils.js" as Utils
 
 /*
  Generic clock component which has a digital and analog mode. A flip animation

=== removed file 'app/components/Utils.js'
--- app/components/Utils.js	2014-07-17 12:21:45 +0000
+++ app/components/Utils.js	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This file is part of Ubuntu Clock App
- *
- * Ubuntu Clock App is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Ubuntu Clock App is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-function log (debugMode, message) {
-    if (debugMode) {
-        console.log("[LOG]" + message)
-    }
-}

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2014-10-09 16:42:05 +0000
+++ app/ubuntu-clock-app.qml	2014-10-09 16:42:05 +0000
@@ -23,7 +23,6 @@
 import "clock"
 import "alarm"
 import "components"
-import "components/Utils.js" as Utils
 
 MainView {
     id: clockApp
@@ -31,9 +30,6 @@
     // Property to store the state of an application (active or suspended)
     property bool applicationState: Qt.application.active
 
-    // Property to enable/disable the debug mode to show more console output
-    property bool debugMode: true
-
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "clock"
 
@@ -78,7 +74,7 @@
 
     AlarmModel {
         id: alarmModel
-        Component.onCompleted: Utils.log(debugMode, "Alarm Database loaded")
+        Component.onCompleted: console.log("[LOG]: Alarm Database loaded")
     }
 
     DateTime {

=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml	2014-08-24 12:47:50 +0000
+++ app/worldclock/UserWorldCityList.qml	2014-10-09 16:42:05 +0000
@@ -21,8 +21,6 @@
 import U1db 1.0 as U1db
 import Ubuntu.Components 1.1
 
-import "../components/Utils.js" as Utils
-
 Column {
     id: worldCityColumn
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-09 16:42:05 +0000
+++ debian/changelog	2014-10-09 16:42:05 +0000
@@ -5,6 +5,7 @@
     the bottom edge action. (LP: #1357945)
   * Moved DateTime object to ubuntu-clock-app.qml so that it can be used in multiple
     places and avoid the need to duplicate the object.
+  * Removed Unused Utils library.
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second