From 7f380782f57089b97a04125f18d61da05292d2ba Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 16 Dec 2021 13:06:08 +0100 Subject: Fix cppcheck errors/warnings --- src/actions.cpp | 14 +++++++++----- src/engine-eds.cpp | 22 +++++++++++++--------- src/exporter.cpp | 10 ++++++---- src/haptic.cpp | 2 +- src/locations-settings.cpp | 16 +++++++++------- src/menu.cpp | 12 +++++++++--- src/notifications.cpp | 2 +- src/planner-aggregate.cpp | 4 +++- src/wakeup-timer-mainloop.cpp | 4 +++- src/wakeup-timer-powerd.cpp | 4 +++- tests/test-actions.cpp | 4 +--- tests/test-alarm-queue.cpp | 6 ++---- tests/test-dbus-fixture.h | 6 ++++-- tests/test-formatter.cpp | 5 +++-- tests/test-menu-appointments.cpp | 2 +- tests/test-menus.cpp | 4 +--- 16 files changed, 69 insertions(+), 48 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index 315340a..c184aef 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,11 +16,12 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include #include // split_settings_location() - +#include #include #include @@ -50,16 +52,18 @@ DateTime datetime_from_timet_variant(GVariant* v) bool lookup_appointment_by_uid(const std::shared_ptr& state, const gchar* uid, Appointment& setme) { - for(const auto& appt : state->calendar_upcoming->appointments().get()) + bool bRet = false; + + std::for_each(state->calendar_upcoming->appointments().get().begin(), state->calendar_upcoming->appointments().get().end(), [uid, &setme, &bRet](const Appointment& appt) { if (appt.uid == uid) { setme = appt; - return true; + bRet = true; } - } + }); - return false; + return bRet; } void on_appointment_activated (GSimpleAction*, GVariant *vdata, gpointer gself) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 4396d45..b7f4682 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -19,6 +19,10 @@ * Robert Tari */ +#ifndef ALARM_DEFAULT_SOUND +#define ALARM_DEFAULT_SOUND "dummy" +#endif + #include #include #include @@ -48,7 +52,7 @@ class EdsEngine::Impl { public: - Impl(const std::shared_ptr &myself) + explicit Impl(const std::shared_ptr &myself) : m_myself(myself) { auto cancellable_deleter = [](GCancellable * c) { @@ -473,14 +477,14 @@ private: // for each component.. for (auto l=components; l!=nullptr; l=l->next) { - bool changed = false; + bool bChanged = false; // for each alarm... auto component = E_CAL_COMPONENT(l->data); auto auids = e_cal_component_get_alarm_uids(component); - for(auto l=auids; l!=nullptr; l=l->next) + for(auto lAlarms=auids; lAlarms!=nullptr; lAlarms=lAlarms->next) { - auto auid = static_cast(l->data); + auto auid = static_cast(lAlarms->data); auto alarm = e_cal_component_get_alarm(component, auid); if (alarm == nullptr) continue; @@ -490,13 +494,13 @@ private: { e_cal_component_remove_alarm (component, auid); e_cal_component_add_alarm (component, new_alarm); - changed = true; + bChanged = true; g_clear_pointer (&new_alarm, e_cal_component_alarm_free); } } g_slist_free_full (auids, g_free); - if (changed) + if (bChanged) { auto icc = e_cal_component_get_icalcomponent(component); // icc owned by ecc modify_slist = g_slist_prepend(modify_slist, icc); @@ -1127,9 +1131,9 @@ private: alarm.text = get_alarm_text(a); if (alarm.audio_url.empty()) - alarm.audio_url = get_alarm_sound_url(a, (baseline.is_alarm() ? - "file://" ALARM_DEFAULT_SOUND : - "file://" CALENDAR_DEFAULT_SOUND)); + { + alarm.audio_url = get_alarm_sound_url(a, (baseline.is_alarm() ? "file://" ALARM_DEFAULT_SOUND : "file://" CALENDAR_DEFAULT_SOUND)); + } if (!alarm.time.is_set()) alarm.time = trigger_time; diff --git a/src/exporter.cpp b/src/exporter.cpp index ea514c0..41a1583 100644 --- a/src/exporter.cpp +++ b/src/exporter.cpp @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -37,7 +39,7 @@ class Exporter::Impl { public: - Impl(const std::shared_ptr& settings): + explicit Impl(const std::shared_ptr& settings): m_settings(settings), m_alarm_props(datetime_alarm_properties_skeleton_new()) { @@ -190,10 +192,10 @@ private: for(auto& menu : m_menus) { const auto path = std::string(BUS_DATETIME_PATH) + "/" + menu->name(); - const auto id = g_dbus_connection_export_menu_model(m_bus, path.c_str(), menu->menu_model(), &error); - if (id) + const auto nId = g_dbus_connection_export_menu_model(m_bus, path.c_str(), menu->menu_model(), &error); + if (nId) { - m_exported_menu_ids.insert(id); + m_exported_menu_ids.insert(nId); } else { diff --git a/src/haptic.cpp b/src/haptic.cpp index 7e09c24..370f0f9 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -39,7 +39,7 @@ class Haptic::Impl { public: - Impl(bool repeat): + explicit Impl(bool repeat): m_cancellable(g_cancellable_new()), m_repeat(repeat) { diff --git a/src/locations-settings.cpp b/src/locations-settings.cpp index f1e2b42..2673e66 100644 --- a/src/locations-settings.cpp +++ b/src/locations-settings.cpp @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -59,10 +61,10 @@ SettingsLocations::reload() } // add the other detected timezones - for(const auto& zone : m_timezones->timezones.get()) + for(const auto& sZone : m_timezones->timezones.get()) { - gchar * name = get_beautified_timezone_name(zone.c_str(), timezone_name.c_str()); - Location l(zone, name); + gchar * name = get_beautified_timezone_name(sZone.c_str(), timezone_name.c_str()); + Location l(sZone, name); if (std::find(v.begin(), v.end(), l) == v.end()) v.push_back(l); g_free(name); @@ -73,14 +75,14 @@ SettingsLocations::reload() { for(const auto& locstr : m_settings->locations.get()) { - gchar* zone; + gchar* sZone; gchar* name; - split_settings_location(locstr.c_str(), &zone, &name); - Location loc(zone, name); + split_settings_location(locstr.c_str(), &sZone, &name); + Location loc(sZone, name); if (std::find(v.begin(), v.end(), loc) == v.end()) v.push_back(loc); g_free(name); - g_free(zone); + g_free(sZone); } } diff --git a/src/menu.cpp b/src/menu.cpp index 57a0249..1f80cd4 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -550,7 +550,7 @@ protected: update_header(); } - GVariant* create_header_state() + GVariant* create_header_state() override { const auto title = _("Date and Time"); auto label = g_variant_new_string(m_formatter->header.get().c_str()); @@ -593,13 +593,19 @@ protected: update_header(); } - GVariant* create_header_state() + GVariant* create_header_state() override { // are there alarms? bool has_alarms = false; for(const auto& appointment : m_upcoming) - if((has_alarms = appointment.is_alarm())) + { + has_alarms = appointment.is_alarm(); + + if (has_alarms) + { break; + } + } GVariantBuilder b; g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT); diff --git a/src/notifications.cpp b/src/notifications.cpp index e38e5dc..bb0e05c 100644 --- a/src/notifications.cpp +++ b/src/notifications.cpp @@ -165,7 +165,7 @@ class Engine::Impl 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())) diff --git a/src/planner-aggregate.cpp b/src/planner-aggregate.cpp index 23a1230..3b05ea1 100644 --- a/src/planner-aggregate.cpp +++ b/src/planner-aggregate.cpp @@ -1,5 +1,6 @@ /* * Copyright 2014 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -30,7 +32,7 @@ namespace datetime { class AggregatePlanner::Impl { public: - Impl(AggregatePlanner* owner): + explicit Impl(AggregatePlanner* owner): m_owner(owner) { } diff --git a/src/wakeup-timer-mainloop.cpp b/src/wakeup-timer-mainloop.cpp index 56961f2..738306c 100644 --- a/src/wakeup-timer-mainloop.cpp +++ b/src/wakeup-timer-mainloop.cpp @@ -1,5 +1,6 @@ /* * Copyright 2014 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -36,7 +38,7 @@ class MainloopWakeupTimer::Impl public: - Impl(const std::shared_ptr& clock): + explicit Impl(const std::shared_ptr& clock): m_clock(clock) { } diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp index e66c94c..f775999 100644 --- a/src/wakeup-timer-powerd.cpp +++ b/src/wakeup-timer-powerd.cpp @@ -1,5 +1,6 @@ /* * Copyright 2014 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -38,7 +40,7 @@ class PowerdWakeupTimer::Impl { public: - Impl(const std::shared_ptr& clock): + explicit Impl(const std::shared_ptr& clock): m_clock(clock), m_cancellable(g_cancellable_new()) { diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp index 09f3a5d..8316357 100644 --- a/tests/test-actions.cpp +++ b/tests/test-actions.cpp @@ -36,7 +36,6 @@ class ActionsFixture: public StateFixture Appointment a1; // an alarm clock appointment a1.color = "red"; - a1.summary = "Alarm"; a1.summary = "http://www.example.com/"; a1.uid = "example"; a1.type = Appointment::ALARM; @@ -44,10 +43,9 @@ class ActionsFixture: public StateFixture Appointment a2; // a non-alarm appointment a2.color = "green"; - a2.summary = "Other Text"; a2.summary = "http://www.monkey.com/"; a2.uid = "monkey"; - a1.type = Appointment::EVENT; + a2.type = Appointment::EVENT; a2.begin = a2.end = tomorrow; return std::vector({a1, a2}); diff --git a/tests/test-alarm-queue.cpp b/tests/test-alarm-queue.cpp index aad93e9..b2aeb49 100644 --- a/tests/test-alarm-queue.cpp +++ b/tests/test-alarm-queue.cpp @@ -42,7 +42,7 @@ protected: std::shared_ptr m_range_planner; std::shared_ptr m_upcoming; - void SetUp() + void SetUp() override { super::SetUp(); @@ -57,7 +57,7 @@ protected: EXPECT_TRUE(m_triggered.empty()); } - void TearDown() + void TearDown() override { m_triggered.clear(); m_watcher.reset(); @@ -75,7 +75,6 @@ protected: Appointment a1; // an alarm a1.color = "red"; - a1.summary = "Alarm"; a1.summary = "http://www.example.com/"; a1.uid = "example"; a1.type = Appointment::ALARM; @@ -88,7 +87,6 @@ protected: Appointment a2; // something else a2.color = "green"; - a2.summary = "Other Text"; a2.summary = "http://www.monkey.com/"; a2.uid = "monkey"; a2.type = Appointment::EVENT; diff --git a/tests/test-dbus-fixture.h b/tests/test-dbus-fixture.h index 0f19b50..7525e06 100644 --- a/tests/test-dbus-fixture.h +++ b/tests/test-dbus-fixture.h @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #ifndef INDICATOR_DATETIME_TESTS_DBUS_FIXTURE_H @@ -65,8 +67,8 @@ class TestDBusFixture: public GlibFixture protected: - GTestDBus * test_dbus; - GDBusConnection * system_bus; + GTestDBus * test_dbus = NULL; + GDBusConnection * system_bus = NULL; const std::vector service_dirs; virtual void SetUp() override diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp index e63f098..d8c0afb 100644 --- a/tests/test-formatter.cpp +++ b/tests/test-formatter.cpp @@ -1,8 +1,10 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * Authors: * Charles Kerr + * Robert Tari * * 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 @@ -142,10 +144,9 @@ TEST_F(FormatterFixture, DISABLED_TestDesktopHeader) auto now = DateTime::Local(2020, 10, 31, 18, 30, 59); auto clock = std::make_shared(now); - bool locale_set = false; for(const auto& test_case : test_cases) { - test_case.is_12h ? locale_set = Set12hLocale() : locale_set = Set24hLocale(); + bool locale_set = test_case.is_12h ? Set12hLocale() : Set24hLocale(); DesktopFormatter f(clock, m_settings); m_settings->show_day.set(test_case.show_day); diff --git a/tests/test-menu-appointments.cpp b/tests/test-menu-appointments.cpp index cbe6b33..ed02395 100644 --- a/tests/test-menu-appointments.cpp +++ b/tests/test-menu-appointments.cpp @@ -23,7 +23,7 @@ #include #include - +#include #include using MenuAppointmentFixture = GlibFixture; diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index de323d3..1f73193 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -186,7 +186,6 @@ private: Appointment a1; // an alarm clock appointment a1.color = "red"; - a1.summary = "Alarm"; a1.summary = "http://www.example.com/"; a1.uid = "example"; a1.type = Appointment::ALARM; @@ -194,10 +193,9 @@ private: Appointment a2; // a non-alarm appointment a2.color = "green"; - a2.summary = "Other Text"; a2.summary = "http://www.monkey.com/"; a2.uid = "monkey"; - a1.type = Appointment::EVENT; + a2.type = Appointment::EVENT; a2.begin = a2.end = tomorrow; return std::vector({a1, a2}); -- cgit v1.2.3