Merge lp:~charlesk/keeper/fix-armhf-warnings into lp:keeper/devel

[Marcus Tomlinson]

Fix various warnings reported by the armhf build.

Fix various warnings reported by the armhf build at <https://launchpadlibrarian.net/278530803/buildlog_ubuntu-xenial-armhf.keeper_0.0.1-0~92.1~ubuntu16.04.1_BUILDING.txt.gz>

* making some classes final
* making some methods pure
* making some methods const
* adding explicit Metadata dtor
* fix implicit numerical conversion

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:99
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/400/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/406/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:99
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/407/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/413
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/321
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/321
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/321
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/251
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/251/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/251
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/251/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/251/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/251
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/251/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/251/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/251/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/251
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/251/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/251
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/251/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/251/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Xavi Garcia (xavi-garcia-mena)]

Changes look good to me, we have compilation errors but they seem to be related with the changes included in the prerequisite branch.

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-autoland/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/415/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/421
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/328
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/328
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/328
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/258/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/258/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/258/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/258/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/258/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/258/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/258/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/258/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/258
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/258/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'include/helper/backup-helper.h'
--- include/helper/backup-helper.h	2016-08-09 03:58:59 +0000
+++ include/helper/backup-helper.h	2016-08-18 13:09:17 +0000
@@ -31,7 +31,7 @@
 #include <memory>
 
 class BackupHelperPrivate;
-class BackupHelper : public Helper
+class BackupHelper final: public Helper
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(BackupHelper)
 
=== modified file 'include/helper/helper.h'
--- include/helper/helper.h	2016-08-11 02:34:33 +0000
+++ include/helper/helper.h	2016-08-18 13:09:17 +0000
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <util/attributes.h>
+
 #include <QObject>
 #include <QScopedPointer>
 
@@ -38,16 +40,16 @@
     enum class State {NOT_STARTED, STARTED, CANCELLED, FAILED, COMPLETE};
 
     Q_PROPERTY(Helper::State state READ state NOTIFY state_changed)
-    State state() const;
+    State state() const __pure;
 
     // NB: range is [0.0 .. 1.0]
     Q_PROPERTY(float percent_done READ percent_done NOTIFY percent_done_changed)
-    float percent_done() const;
+    float percent_done() const __pure;
 
     // NB: units is bytes_per_second
-    int speed() const;
+    int speed() const __pure;
 
-    qint64 expected_size() const;
+    qint64 expected_size() const __pure;
     void set_expected_size(qint64 n_bytes);
 
     static void registerMetaTypes();
 
=== modified file 'include/helper/metadata.h'
--- include/helper/metadata.h	2016-08-09 01:07:04 +0000
+++ include/helper/metadata.h	2016-08-18 13:09:17 +0000
@@ -31,6 +31,7 @@
 
     Metadata();
     Metadata(QString const& uuid, QString const& display_name);
+    ~Metadata();
 
     // metadata keys
     static QString const TYPE_KEY;
 
=== modified file 'src/helper/helper.cpp'
--- src/helper/helper.cpp	2016-08-12 04:02:53 +0000
+++ src/helper/helper.cpp	2016-08-18 13:09:17 +0000
@@ -182,7 +182,7 @@
         size_ += n_bytes;
         sized_ += double(n_bytes);
 
-        history_.add(clock_(), n_bytes);
+        history_.add(clock_(), size_t(n_bytes));
 
         update_percent_done();
     }
 
=== modified file 'src/helper/metadata.cpp'
--- src/helper/metadata.cpp	2016-08-09 01:07:04 +0000
+++ src/helper/metadata.cpp	2016-08-18 13:09:17 +0000
@@ -52,6 +52,10 @@
 {
 }
 
+Metadata::~Metadata()
+{
+}
+
 bool
 Metadata::get_property(QString const& property_name, QString& setme) const
 {
 
=== modified file 'src/service/backup-choices.cpp'
--- src/service/backup-choices.cpp	2016-08-10 02:27:40 +0000
+++ src/service/backup-choices.cpp	2016-08-18 13:09:17 +0000
@@ -50,7 +50,7 @@
 BackupChoices::~BackupChoices() =default;
 
 QVector<Metadata>
-BackupChoices::get_backups()
+BackupChoices::get_backups() const
 {
     QVector<Metadata> ret;
 
 
=== modified file 'src/service/backup-choices.h'
--- src/service/backup-choices.h	2016-06-26 22:49:06 +0000
+++ src/service/backup-choices.h	2016-08-18 13:09:17 +0000
@@ -29,5 +29,5 @@
 public:
     BackupChoices();
     virtual ~BackupChoices();
-    QVector<Metadata> get_backups() override;
+    QVector<Metadata> get_backups() const override;
 };
 
=== modified file 'src/service/metadata-provider.h'
--- src/service/metadata-provider.h	2016-08-08 04:56:35 +0000
+++ src/service/metadata-provider.h	2016-08-18 13:09:17 +0000
@@ -27,7 +27,7 @@
 {
 public:
     virtual ~MetadataProvider() =0;
-    virtual QVector<Metadata> get_backups() =0;
+    virtual QVector<Metadata> get_backups() const =0;
 
 protected:
     MetadataProvider() =default;
 
=== modified file 'src/service/restore-choices.cpp'
--- src/service/restore-choices.cpp	2016-07-19 10:54:53 +0000
+++ src/service/restore-choices.cpp	2016-08-18 13:09:17 +0000
@@ -89,7 +89,7 @@
 RestoreChoices::~RestoreChoices() =default;
 
 QVector<Metadata>
-RestoreChoices::get_backups()
+RestoreChoices::get_backups() const
 {
     QVector<Metadata> ret;
 
 
=== modified file 'src/service/restore-choices.h'
--- src/service/restore-choices.h	2016-06-28 21:41:31 +0000
+++ src/service/restore-choices.h	2016-08-18 13:09:17 +0000
@@ -33,7 +33,7 @@
 public:
     RestoreChoices();
     virtual ~RestoreChoices();
-    QVector<Metadata> get_backups() override;
+    QVector<Metadata> get_backups() const override;
 
 private:
     unity::storage::qt::client::Runtime::SPtr runtime_;
 
=== modified file 'src/storage-framework/storage_framework_client.h'
--- src/storage-framework/storage_framework_client.h	2016-08-12 04:03:19 +0000
+++ src/storage-framework/storage_framework_client.h	2016-08-18 13:09:17 +0000
@@ -22,7 +22,7 @@
 
 #include <unity/storage/qt/client/client-api.h>
 
-class StorageFrameworkClient : public QObject
+class StorageFrameworkClient final: public QObject
 {
     Q_OBJECT
 public:
 
=== added file 'src/util/attributes.h'
--- src/util/attributes.h	1970-01-01 00:00:00 +0000
+++ src/util/attributes.h	2016-08-18 13:09:17 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#pragma once
+
+#ifdef __GNUC__
+  #define __pure __attribute__((pure))
+#else
+  #define __pure
+#endif
 
=== modified file 'src/util/unix-signal-handler.cpp'
--- src/util/unix-signal-handler.cpp	2016-06-25 20:05:49 +0000
+++ src/util/unix-signal-handler.cpp	2016-08-18 13:09:17 +0000
@@ -54,14 +54,14 @@
 UnixSignalHandler::intSignalHandler(int)
 {
     char a = 1;
-    ::write(sigintFd[0], &a, sizeof(a));
+    (void) ::write(sigintFd[0], &a, sizeof(a));
 }
 
 void
 UnixSignalHandler::termSignalHandler(int)
 {
     char a = 1;
-    ::write(sigtermFd[0], &a, sizeof(a));
+    (void) ::write(sigtermFd[0], &a, sizeof(a));
 }
 
 int
@@ -92,7 +92,7 @@
 {
     m_socketNotifierTerm->setEnabled(false);
     char tmp;
-    ::read(sigtermFd[1], &tmp, sizeof(tmp));
+    (void) ::read(sigtermFd[1], &tmp, sizeof(tmp));
 
     m_func();
 
@@ -104,7 +104,7 @@
 {
     m_socketNotifierInt->setEnabled(false);
     char tmp;
-    ::read(sigintFd[1], &tmp, sizeof(tmp));
+    (void) ::read(sigintFd[1], &tmp, sizeof(tmp));
 
     m_func();