From dc074b0262ed447b64c935a9e527105f4b2dd7ae Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 5 May 2025 21:50:01 -0500 Subject: [PATCH] More clang-tidy fixes --- scwx-qt/source/scwx/qt/map/alert_layer.cpp | 16 ++++++++-------- .../source/scwx/qt/model/alert_proxy_model.cpp | 11 +++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/alert_layer.cpp b/scwx-qt/source/scwx/qt/map/alert_layer.cpp index e1e43965..786d80e0 100644 --- a/scwx-qt/source/scwx/qt/map/alert_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/alert_layer.cpp @@ -461,8 +461,8 @@ void AlertLayerHandler::HandleAlertsRemoved( { for (const auto& segmentRecord : segmentsIt->second) { - auto& segment = segmentRecord->segment_; - bool alertActive = IsAlertActive(segment); + auto& segment = segmentRecord->segment_; + const bool alertActive = IsAlertActive(segment); // Remove from segmentsByType_ auto typeIt = segmentsByType_.find({key.phenomenon_, alertActive}); @@ -624,9 +624,9 @@ void AlertLayer::Impl::AddAlert( // If draw items were added if (drawItems.second) { - const float borderWidth = static_cast(lineData.borderWidth_); - const float highlightWidth = static_cast(lineData.highlightWidth_); - const float lineWidth = static_cast(lineData.lineWidth_); + const auto borderWidth = static_cast(lineData.borderWidth_); + const auto highlightWidth = static_cast(lineData.highlightWidth_); + const auto lineWidth = static_cast(lineData.lineWidth_); const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f); const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f); @@ -812,9 +812,9 @@ void AlertLayer::Impl::UpdateLines() auto& lineData = GetLineData(segment, alertActive); auto& geoLines = geoLines_.at(alertActive); - const float borderWidth = static_cast(lineData.borderWidth_); - const float highlightWidth = static_cast(lineData.highlightWidth_); - const float lineWidth = static_cast(lineData.lineWidth_); + const auto borderWidth = static_cast(lineData.borderWidth_); + const auto highlightWidth = static_cast(lineData.highlightWidth_); + const auto lineWidth = static_cast(lineData.lineWidth_); const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f); const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f); diff --git a/scwx-qt/source/scwx/qt/model/alert_proxy_model.cpp b/scwx-qt/source/scwx/qt/model/alert_proxy_model.cpp index dff55202..fd5ffc69 100644 --- a/scwx-qt/source/scwx/qt/model/alert_proxy_model.cpp +++ b/scwx-qt/source/scwx/qt/model/alert_proxy_model.cpp @@ -88,8 +88,15 @@ AlertProxyModel::Impl::Impl(AlertProxyModel* self) : AlertProxyModel::Impl::~Impl() { - std::unique_lock lock(alertMutex_); - alertUpdateTimer_.cancel(); + try + { + std::unique_lock lock(alertMutex_); + alertUpdateTimer_.cancel(); + } + catch (const std::exception& ex) + { + logger_->error(ex.what()); + } } void AlertProxyModel::Impl::UpdateAlerts()