Merge lp:~charlesk/indicator-datetime/add-cppcheck into lp:indicator-datetime/15.10

[Charles Kerr]

Add a cppcheck pass to the tests run by ctest.

Add a cppcheck pass to the tests run by ctest.

Various minor fixes spotted by cpptest; e.g. adding 'explicit' where applicable to single-argument ctors, removing dead stores

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:425
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/324/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~charlesk/indicator-datetime/add-cppcheck]

426. By Charles Kerr on 2015-09-10

sync with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/24/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

426. By Charles Kerr on 2015-09-10

sync with trunk

425. By Charles Kerr on 2015-07-29

suppress false pureVirtualCall cppcheck failure. Lambda code blocks in menu's ctor invokes a pure virtual function, but the lambda's not invoked until later after the ctor is finished

424. By Charles Kerr on 2015-07-29

fix dead store (cppcheck)

423. By Charles Kerr on 2015-07-29

fix unnecesssary c_str() call (cppcheck)

422. By Charles Kerr on 2015-07-29

fix dead store due to missing test condition (cppcheck)

421. By Charles Kerr on 2015-07-29

in the DBus test fixture, ensure the bus fields are initialized to nullptr when the fixture is constructed. (cppcheck)

420. By Charles Kerr on 2015-07-29

fix possible nullptr dereference (cppcheck)

419. By Charles Kerr on 2015-07-29

add 'explicit' keyword to single-argument ctors (cppcheck)

418. By Charles Kerr on 2015-07-29

add cppcheck to the standard 'make test' invocation

=== modified file 'debian/control'
--- debian/control	2015-07-28 08:42:25 +0000
+++ debian/control	2015-09-10 14:07:25 +0000
@@ -19,6 +19,7 @@
                libdbustest1-dev,
                dbus-test-runner,
                python3-dbusmock,
+               cppcheck,
 # for 12h/24h locale unit tests:
                locales,
                language-pack-touch-en | language-pack-en-base,
 
=== modified file 'include/datetime/clock.h'
--- include/datetime/clock.h	2015-04-03 17:36:46 +0000
+++ include/datetime/clock.h	2015-09-10 14:07:25 +0000
@@ -74,7 +74,7 @@
 class LiveClock: public Clock
 {
 public:
-    LiveClock (const std::shared_ptr<const Timezone>& zones);
+    explicit LiveClock(const std::shared_ptr<const Timezone>& zones);
     virtual ~LiveClock();
     virtual DateTime localtime() const override;
 
 
=== modified file 'include/datetime/timezone-file.h'
--- include/datetime/timezone-file.h	2014-09-13 20:45:23 +0000
+++ include/datetime/timezone-file.h	2015-09-10 14:07:25 +0000
@@ -34,7 +34,7 @@
 class FileTimezone: public Timezone
 {
 public:
-    FileTimezone(const std::string& filename);
+    explicit FileTimezone(const std::string& filename);
     ~FileTimezone();
 
 private:
 
=== modified file 'src/awake.cpp'
--- src/awake.cpp	2015-03-31 18:54:26 +0000
+++ src/awake.cpp	2015-09-10 14:07:25 +0000
@@ -36,7 +36,7 @@
 {
 public:
 
-    Impl(const std::string& app_name):
+    explicit Impl(const std::string& app_name):
         m_app_name(app_name),
         m_cancellable(g_cancellable_new())
     {
 
=== modified file 'src/clock.cpp'
--- src/clock.cpp	2014-09-15 14:56:52 +0000
+++ src/clock.cpp	2015-09-10 14:07:25 +0000
@@ -40,7 +40,7 @@
 {
 public:
 
-    Impl(Clock& owner):
+    explicit Impl(Clock& owner):
         m_owner(owner),
         m_cancellable(g_cancellable_new())
     {
 
=== modified file 'src/exporter.cpp'
--- src/exporter.cpp	2014-09-02 15:37:03 +0000
+++ src/exporter.cpp	2015-09-10 14:07:25 +0000
@@ -37,7 +37,7 @@
 {
 public:
 
-    Impl(const std::shared_ptr<Settings>& settings):
+    explicit Impl(const std::shared_ptr<Settings>& settings):
         m_settings(settings),
         m_alarm_props(datetime_alarm_properties_skeleton_new())
     {
 
=== modified file 'src/formatter-desktop.cpp'
--- src/formatter-desktop.cpp	2014-03-28 00:25:34 +0000
+++ src/formatter-desktop.cpp	2015-09-10 14:07:25 +0000
@@ -46,7 +46,7 @@
     {
         str = date_string;
     }
-    else // time_string
+    else if (time_string)
     {
         str = time_string;
     }
 
=== modified file 'src/haptic.cpp'
--- src/haptic.cpp	2014-08-01 00:52:42 +0000
+++ src/haptic.cpp	2015-09-10 14:07:25 +0000
@@ -37,7 +37,7 @@
 {
 public:
 
-    Impl(const Mode& mode):
+    explicit Impl(const Mode& mode):
         m_mode(mode),
         m_cancellable(g_cancellable_new())
     {
 
=== modified file 'src/notifications.cpp'
--- src/notifications.cpp	2014-09-17 17:08:01 +0000
+++ src/notifications.cpp	2015-09-10 14:07:25 +0000
@@ -115,7 +115,7 @@
 
 public:
 
-    Impl(const std::string& app_name):
+    explicit Impl(const std::string& app_name):
         m_app_name(app_name)
     {
         if (!notify_init(app_name.c_str()))
 
=== modified file 'src/planner-aggregate.cpp'
--- src/planner-aggregate.cpp	2014-09-02 15:35:27 +0000
+++ src/planner-aggregate.cpp	2015-09-10 14:07:25 +0000
@@ -30,7 +30,7 @@
 class AggregatePlanner::Impl
 {
 public:
-    Impl(AggregatePlanner* owner):
+    explicit Impl(AggregatePlanner* owner):
         m_owner(owner)
     {
     }
 
=== modified file 'src/timezone-geoclue.cpp'
--- src/timezone-geoclue.cpp	2014-09-13 20:45:23 +0000
+++ src/timezone-geoclue.cpp	2015-09-10 14:07:25 +0000
@@ -36,7 +36,7 @@
 
 public:
 
-    Impl(GeoclueTimezone& owner):
+    explicit Impl(GeoclueTimezone& owner):
         m_owner(owner),
         m_cancellable(g_cancellable_new())
     {
 
=== modified file 'src/wakeup-timer-mainloop.cpp'
--- src/wakeup-timer-mainloop.cpp	2014-06-10 14:00:14 +0000
+++ src/wakeup-timer-mainloop.cpp	2015-09-10 14:07:25 +0000
@@ -36,7 +36,7 @@
 
 public:
 
-    Impl(const std::shared_ptr<Clock>& clock):
+    explicit Impl(const std::shared_ptr<Clock>& clock):
         m_clock(clock)
     {
     }
 
=== modified file 'src/wakeup-timer-powerd.cpp'
--- src/wakeup-timer-powerd.cpp	2014-11-04 18:27:27 +0000
+++ src/wakeup-timer-powerd.cpp	2015-09-10 14:07:25 +0000
@@ -38,7 +38,7 @@
 {
 public:
 
-    Impl(const std::shared_ptr<Clock>& clock):
+    explicit Impl(const std::shared_ptr<Clock>& clock):
         m_clock(clock),
         m_cancellable(g_cancellable_new())
     {
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-07-22 12:00:11 +0000
+++ tests/CMakeLists.txt	2015-09-10 14:07:25 +0000
@@ -36,6 +36,14 @@
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
 include_directories (${DBUSTEST_INCLUDE_DIRS})
 
+add_test(cppcheck cppcheck
+         --quiet
+         --enable=all
+         --error-exitcode=2
+         --suppress=pureVirtualCall
+         -I${CMAKE_SOURCE_DIR}/include
+         ${CMAKE_SOURCE_DIR}/src
+         ${CMAKE_SOURCE_DIR}/tests)
 
 add_definitions (-DSANDBOX="${CMAKE_CURRENT_BINARY_DIR}")
 
 
=== modified file 'tests/geoclue-fixture.h'
--- tests/geoclue-fixture.h	2014-09-17 16:51:51 +0000
+++ tests/geoclue-fixture.h	2015-09-10 14:07:25 +0000
@@ -146,7 +146,7 @@
 
     void setGeoclueTimezoneOnIdle (const std::string& newZone)
     {
-        g_timeout_add (50, emit_address_changed_idle, new EmitAddressChangedData(mock, obj_geo_addr, newZone.c_str()));
+        g_timeout_add (50, emit_address_changed_idle, new EmitAddressChangedData(mock, obj_geo_addr, newZone));
     }
 
 };
 
=== modified file 'tests/test-dbus-fixture.h'
--- tests/test-dbus-fixture.h	2014-09-17 16:51:51 +0000
+++ tests/test-dbus-fixture.h	2015-09-10 14:07:25 +0000
@@ -65,8 +65,8 @@
 
   protected:
 
-    GTestDBus * test_dbus;
-    GDBusConnection * system_bus;
+    GTestDBus * test_dbus = nullptr;
+    GDBusConnection * system_bus = nullptr;
     const std::vector<std::string> service_dirs;
 
     virtual void SetUp() override
 
=== modified file 'tests/test-timezone-geoclue.cpp'
--- tests/test-timezone-geoclue.cpp	2014-01-31 00:40:13 +0000
+++ tests/test-timezone-geoclue.cpp	2015-09-10 14:07:25 +0000
@@ -44,5 +44,6 @@
   const std::string timezone_2 = "America/Chicago";
   setGeoclueTimezoneOnIdle(timezone_2);
   g_main_loop_run(loop);
+  EXPECT_TRUE(changed);
   EXPECT_EQ(timezone_2, tz.timezone.get());
 }
 
=== modified file 'tests/test-timezones.cpp'
--- tests/test-timezones.cpp	2014-09-17 16:51:51 +0000
+++ tests/test-timezones.cpp	2015-09-10 14:07:25 +0000
@@ -90,7 +90,6 @@
   EXPECT_EQ(2, zones.size());
   EXPECT_EQ(1, zones.count(timezone_file));
   EXPECT_EQ(1, zones.count(timezone_geo));
-  zones_changed = false;
 
   // now tweak the geoclue value... the geoclue-detected timezone should change,
   // causing the 'timezones' property to change