From b7df5a9578ab32ac3c67fc8e0c0490d8bb286fb1 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 17 Dec 2021 12:58:36 +0100 Subject: src/menu.cpp: Remove redundant code block: Since a_after_today and b_after_today are the same, comparing them is pointless. --- src/menu.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/menu.cpp') diff --git a/src/menu.cpp b/src/menu.cpp index ab0bd71..57a0249 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -107,10 +107,6 @@ Menu::get_display_appointments(const std::vector& appointments_in, if (a_full_day_today != b_full_day_today) return a_full_day_today; - const bool a_after_today = (a.begin > end_of_day) || (a.end > end_of_day); - const bool b_after_today = (a.begin > end_of_day) || (a.end > end_of_day); - if (a_after_today != b_after_today) - return a_after_today; if (a.begin != b.begin) return a.begin < b.begin; if (b.end != b.end) -- cgit v1.2.3 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/menu.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/menu.cpp') 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); -- cgit v1.2.3