Merge lp:~charlesk/indicator-transfer/fix-flint-and-clang-warnings into lp:indicator-transfer/15.04

[Charles Kerr]

Fixes warnings reported by flint++ and clang.

Fixes warnings reported by flint++ and clang.

No feature changes or end-user-visible changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/17/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[Ted Gould (ted)]

review: Approve

=== modified file 'include/transfer/dbus-shared.h'
--- include/transfer/dbus-shared.h	2014-03-29 17:17:09 +0000
+++ include/transfer/dbus-shared.h	2014-11-05 21:51:34 +0000
@@ -17,7 +17,11 @@
  *   Charles Kerr <[e-mail]>
  */
 
+#ifndef INDICATOR_TRANFSFER_DBUS_SHARED_H
+#define INDICATOR_TRANFSFER_DBUS_SHARED_H
+
 #define BUS_NAME "com.canonical.indicator.transfer"
 
 #define BUS_PATH "/com/canonical/indicator/transfer"
 
+#endif /* INDICATOR_TRANFSFER_DBUS_SHARED_H */

=== modified file 'include/transfer/world-dbus.h'
--- include/transfer/world-dbus.h	2014-08-25 20:39:23 +0000
+++ include/transfer/world-dbus.h	2014-11-05 21:51:34 +0000
@@ -36,7 +36,7 @@
 class DBusWorld: public World
 {
 public:
-    DBusWorld(const std::shared_ptr<MutableModel>& model);
+    explicit DBusWorld(const std::shared_ptr<MutableModel>& model);
     ~DBusWorld();
 
     void open(const Transfer::Id& id);

=== modified file 'src/world-dbus.cpp'
--- src/world-dbus.cpp	2014-10-08 20:41:32 +0000
+++ src/world-dbus.cpp	2014-11-05 21:51:34 +0000
@@ -298,10 +298,10 @@
 
   void update_progress()
   {
-    auto tmp_total_size = total_size;
-    auto tmp_progress = progress;
-    auto tmp_seconds_left = seconds_left;
-    auto tmp_speed_Bps = speed_Bps;
+    uint64_t tmp_total_size = 0;
+    float tmp_progress = 0.0f;
+    int tmp_seconds_left = 0;
+    uint64_t tmp_speed_Bps = 0;
 
     if (m_total_size && m_received)
       {
@@ -316,13 +316,6 @@
         tmp_progress = m_received / (float)m_total_size;
         tmp_seconds_left = seconds;
       }
-    else
-      {
-        tmp_total_size = 0;
-        tmp_speed_Bps = 0;
-        tmp_progress = 0.0;
-        tmp_seconds_left = -1;
-      }
 
     bool changed = false;
 

=== modified file 'tests/glib-fixture.h'
--- tests/glib-fixture.h	2014-06-17 01:36:16 +0000
+++ tests/glib-fixture.h	2014-11-05 21:51:34 +0000
@@ -17,6 +17,9 @@
  *   Charles Kerr <[e-mail]>
  */
 
+#ifndef INDICATOR_DATETIME_TESTS_GLIB_FIXTURE_H
+#define INDICATOR_DATETIME_TESTS_GLIB_FIXTURE_H
+
 #include <map>
 
 #include <glib.h>
@@ -29,6 +32,10 @@
 
 class GlibFixture : public ::testing::Test
 {
+  public:
+
+    virtual ~GlibFixture() =default;
+
   private:
 
     GLogFunc realLogHandler;
@@ -139,3 +146,5 @@
 
     GMainLoop * loop;
 };
+
+#endif /* INDICATOR_DATETIME_TESTS_GLIB_FIXTURE_H */

=== modified file 'tests/test-controller.cpp'
--- tests/test-controller.cpp	2014-07-10 15:55:58 +0000
+++ tests/test-controller.cpp	2014-11-05 21:51:34 +0000
@@ -99,7 +99,7 @@
 
   for (const auto& transfer : transfers)
     {
-      std::shared_ptr<Transfer> t(new Transfer);
+      auto t = std::make_shared<Transfer>();
       t->state = transfer.state;
       t->id = transfer.id;
       m_model->add(t);
@@ -142,7 +142,7 @@
 
   for (const auto& transfer : transfers)
     {
-      std::shared_ptr<Transfer> t(new Transfer);
+      auto t = std::make_shared<Transfer>();
       t->state = transfer.state;
       t->id = transfer.id;
       m_model->add(t);
@@ -175,7 +175,7 @@
 
   for (const auto& transfer : transfers)
     {
-      std::shared_ptr<Transfer> t(new Transfer);
+      auto t = std::make_shared<Transfer>();
       t->state = transfer.state;
       t->id = transfer.id;
       m_model->add(t);
@@ -193,7 +193,7 @@
 {
   const Transfer::Id id = "id";
 
-  std::shared_ptr<Transfer> t(new Transfer);
+  auto t = std::make_shared<Transfer>();
   t->state = Transfer::QUEUED;
   t->id = id;
   m_model->add(t);
@@ -266,7 +266,7 @@
 TEST_F(ControllerFixture, Start)
 {
   const Transfer::Id id = "id";
-  std::shared_ptr<Transfer> t(new Transfer);
+  auto t = std::make_shared<Transfer>();
   t->id = id;
   t->state = Transfer::QUEUED;
   m_model->add(t);
@@ -286,7 +286,7 @@
 TEST_F(ControllerFixture, Pause)
 {
   const Transfer::Id id = "id";
-  std::shared_ptr<Transfer> t(new Transfer);
+  auto t = std::make_shared<Transfer>();
   t->id = id;
   t->state = Transfer::QUEUED;
   m_model->add(t);
@@ -306,7 +306,7 @@
 TEST_F(ControllerFixture, Resume)
 {
   const Transfer::Id id = "id";
-  std::shared_ptr<Transfer> t(new Transfer);
+  auto t = std::make_shared<Transfer>();
   t->id = id;
   t->state = Transfer::QUEUED;
   m_model->add(t);
@@ -326,7 +326,7 @@
 TEST_F(ControllerFixture, Cancel)
 {
   const Transfer::Id id = "id";
-  std::shared_ptr<Transfer> t(new Transfer);
+  auto t = std::make_shared<Transfer>();
   t->id = id;
   t->state = Transfer::QUEUED;
   m_model->add(t);