Merge lp:~nik90/ubuntu-clock-app/correct-public-slots into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixes the usage of public slots and Q_INVOKABLE in the Sound and FormatTime class.

Fixes the usage of public slots and Q_INVOKABLE in the Sound and FormatTime class.

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

PASSED: Continuous integration, rev:382
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/839/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/184

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Everything is ok, according to checklist.

review: Approve

=== modified file 'backend/modules/Alarm/sound.h'
--- backend/modules/Alarm/sound.h	2015-08-25 15:41:50 +0000
+++ backend/modules/Alarm/sound.h	2015-09-11 14:05:36 +0000
@@ -36,21 +36,20 @@
 
     QString customAlarmSoundDirectory() const;
 
-public slots:
-    void deleteCustomAlarmSound(const QString &soundName);
+    Q_INVOKABLE void deleteCustomAlarmSound(const QString &soundName);
 
     // Function to delete old alarm file sound according to file name from full path.
     // It will able to replace sound alarm with new version
-    void prepareToAddAlarmSound(const QString &soundPath);
-
-    void createCustomAlarmSoundDirectory();
-
-    bool isAlarmSoundValid(const QString &soundFileName);
-    bool isAlarmSoundValid(const QUrl &soundUrl);
-
-    QString getDefaultAlarmSoundPath(const QString &soundFileName) const;
-
-    QString getSoundName(const QString &soundPath) const;
+    Q_INVOKABLE void prepareToAddAlarmSound(const QString &soundPath);
+
+    Q_INVOKABLE void createCustomAlarmSoundDirectory();
+
+    Q_INVOKABLE bool isAlarmSoundValid(const QString &soundFileName);
+    Q_INVOKABLE bool isAlarmSoundValid(const QUrl &soundUrl);
+
+    Q_INVOKABLE QString getDefaultAlarmSoundPath(const QString &soundFileName) const;
+
+    Q_INVOKABLE QString getSoundName(const QString &soundPath) const;
 
 private:
     QString m_customAlarmDir;

=== modified file 'backend/modules/Stopwatch/formattime.h'
--- backend/modules/Stopwatch/formattime.h	2015-08-26 22:41:34 +0000
+++ backend/modules/Stopwatch/formattime.h	2015-09-11 14:05:36 +0000
@@ -28,11 +28,10 @@
 public:
     FormatTime(QObject *parent=0);
 
-public slots:
-    QString millisToString(int millis) const;
-    QString millisToTimeString(int millis, bool showHours) const;
-    QString addZeroPrefix(QString str, int totalLength) const;
-    QString lapTimeToString(int millis) const;
+    Q_INVOKABLE QString millisToString(int millis) const;
+    Q_INVOKABLE QString millisToTimeString(int millis, bool showHours) const;
+    Q_INVOKABLE QString addZeroPrefix(QString str, int totalLength) const;
+    Q_INVOKABLE QString lapTimeToString(int millis) const;
 };
 
 #endif

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-10 11:10:13 +0000
+++ debian/changelog	2015-09-11 14:05:36 +0000
@@ -6,6 +6,7 @@
   * Added sections headers to separate custom and default alarm sounds (LP: #1487735)
   * Removed ListItemWithActions upstream component and also fixed the user
     world city list count never decreasing to 0. (LP: #1368393)
+  * Fixed incorrect usage of public slots and Q_INVOKABLE in c++ classes (LP: #1494756)
 
   [ Bartosz Kosiorek ]
   * Fix wrong time after changing timezone, when stopwatch is running (LP: #1491024)