From 4719badc5425568d99ef25aff65c25867d29150e Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 3 May 2025 09:27:58 -0500 Subject: [PATCH] clang-tidy fixes --- .../scwx/qt/manager/text_event_manager.cpp | 23 ++++++++++--------- .../source/scwx/qt/types/text_event_key.hpp | 8 ++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/scwx-qt/source/scwx/qt/manager/text_event_manager.cpp b/scwx-qt/source/scwx/qt/manager/text_event_manager.cpp index 6337e97e..c6da90f7 100644 --- a/scwx-qt/source/scwx/qt/manager/text_event_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/text_event_manager.cpp @@ -27,11 +27,7 @@ # include #endif -namespace scwx -{ -namespace qt -{ -namespace manager +namespace scwx::qt::manager { using namespace std::chrono_literals; @@ -115,6 +111,11 @@ public: threadPool_.join(); } + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + Impl(const Impl&&) = delete; + Impl& operator=(const Impl&&) = delete; + void HandleMessage(const std::shared_ptr& message); template @@ -298,9 +299,10 @@ void TextEventManager::Impl::HandleMessage( } // Determine year - std::chrono::year_month_day wmoDate = std::chrono::floor( - message->wmo_header()->GetDateTime()); - std::chrono::year wmoYear = wmoDate.year(); + const std::chrono::year_month_day wmoDate = + std::chrono::floor( + message->wmo_header()->GetDateTime()); + const std::chrono::year wmoYear = wmoDate.year(); std::unique_lock lock(textEventMutex_); @@ -319,6 +321,7 @@ void TextEventManager::Impl::HandleMessage( // The message was on January 1 wmoDate.month() == std::chrono::January && wmoDate.day() == 1d && // This is at least the 10th ETN of the year + // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers): Readability vtecString[0].pVtec_.event_tracking_number() > 10) { // Attempt to find a matching event from last year @@ -635,6 +638,4 @@ std::shared_ptr TextEventManager::Instance() return textEventManager; } -} // namespace manager -} // namespace qt -} // namespace scwx +} // namespace scwx::qt::manager diff --git a/scwx-qt/source/scwx/qt/types/text_event_key.hpp b/scwx-qt/source/scwx/qt/types/text_event_key.hpp index 4cc57dca..15eec31c 100644 --- a/scwx-qt/source/scwx/qt/types/text_event_key.hpp +++ b/scwx-qt/source/scwx/qt/types/text_event_key.hpp @@ -21,14 +21,16 @@ struct TextEventKey { using namespace std::chrono_literals; + static constexpr std::chrono::year kMinYear_ = 1970y; + std::chrono::year_month_day ymd = std::chrono::floor(pvtec.event_begin()); - if (ymd.year() > 1970y) + if (ymd.year() > kMinYear_) { // Prefer the year from the event begin year_ = ymd.year(); } - else if (yearHint > 1970y) + else if (yearHint > kMinYear_) { // Otherwise, use the year hint year_ = yearHint; @@ -49,7 +51,7 @@ struct TextEventKey awips::Phenomenon phenomenon_; awips::Significance significance_; std::int16_t etn_; - std::chrono::year year_; + std::chrono::year year_ {}; }; template