From 40d70b0a13eb8d3f2799ae14fca23f60a71c8264 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 27 Sep 2024 09:13:45 -0500 Subject: [PATCH] Don't use braces around scalar initializers --- .../qt/settings/alert_palette_settings.cpp | 32 +++++++++---------- .../scwx/awips/impact_based_warnings.cpp | 6 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp index 96bed7f9..c684e1ed 100644 --- a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp @@ -41,25 +41,25 @@ static const boost::unordered_flat_map {awips::ibw::ThreatCategory::Considerable, {.highlightColor_ {0, 255, 0, 255}, .lineColor_ {kColorBlack_}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}, + .highlightWidth_ = 1, + .lineWidth_ = 1}}, {awips::ibw::ThreatCategory::Catastrophic, {.highlightColor_ {0, 255, 0, 255}, .lineColor_ {255, 0, 0, 255}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}}}, + .highlightWidth_ = 1, + .lineWidth_ = 1}}}}, {awips::Phenomenon::SevereThunderstorm, {{awips::ibw::ThreatCategory::Base, {.lineColor_ {255, 255, 0, 255}}}, {awips::ibw::ThreatCategory::Considerable, {.highlightColor_ {255, 255, 0, 255}, .lineColor_ {255, 0, 0, 255}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}, + .highlightWidth_ = 1, + .lineWidth_ = 1}}, {awips::ibw::ThreatCategory::Destructive, {.highlightColor_ {255, 255, 0, 255}, .lineColor_ {255, 0, 0, 255}, - .highlightWidth_ {1}, - .lineWidth_ {2}}}}}, + .highlightWidth_ = 1, + .lineWidth_ = 2}}}}, {awips::Phenomenon::SnowSquall, {{awips::ibw::ThreatCategory::Base, {.lineColor_ {0, 255, 255, 255}}}}}, {awips::Phenomenon::Tornado, @@ -69,29 +69,29 @@ static const boost::unordered_flat_map {awips::ibw::ThreatCategory::Catastrophic, {.highlightColor_ {255, 0, 255, 255}, .lineColor_ {kColorBlack_}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}}}}; + .highlightWidth_ = 1, + .lineWidth_ = 1}}}}}; static const boost::unordered_flat_map kObservedPalettes_ // {{awips::Phenomenon::Tornado, {.highlightColor_ {255, 0, 0, 255}, .lineColor_ {kColorBlack_}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}}; + .highlightWidth_ = 1, + .lineWidth_ = 1}}}; static const boost::unordered_flat_map kTornadoPossiblePalettes_ // {{awips::Phenomenon::Marine, {.highlightColor_ {255, 127, 0, 255}, .lineColor_ {kColorBlack_}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}, + .highlightWidth_ = 1, + .lineWidth_ = 1}}, {awips::Phenomenon::SevereThunderstorm, {.highlightColor_ {255, 255, 0, 255}, .lineColor_ {kColorBlack_}, - .highlightWidth_ {1}, - .lineWidth_ {1}}}}; + .highlightWidth_ = 1, + .lineWidth_ = 1}}}; static const boost::unordered_flat_map kInactivePalettes_ // diff --git a/wxdata/source/scwx/awips/impact_based_warnings.cpp b/wxdata/source/scwx/awips/impact_based_warnings.cpp index a5e63a76..40a20051 100644 --- a/wxdata/source/scwx/awips/impact_based_warnings.cpp +++ b/wxdata/source/scwx/awips/impact_based_warnings.cpp @@ -18,7 +18,7 @@ static const std::string logPrefix_ = "scwx::awips::ibw::impact_based_warnings"; static const boost::unordered_flat_map impactBasedWarningInfo_ { {Phenomenon::Marine, - ImpactBasedWarningInfo {.hasTornadoPossibleTag_ {true}}}, + ImpactBasedWarningInfo {.hasTornadoPossibleTag_ = true}}, {Phenomenon::FlashFlood, ImpactBasedWarningInfo { .threatCategories_ {ThreatCategory::Base, @@ -26,14 +26,14 @@ static const boost::unordered_flat_map ThreatCategory::Catastrophic}}}, {Phenomenon::SevereThunderstorm, ImpactBasedWarningInfo { - .hasTornadoPossibleTag_ {true}, + .hasTornadoPossibleTag_ = true, .threatCategories_ {ThreatCategory::Base, ThreatCategory::Considerable, ThreatCategory::Destructive}}}, {Phenomenon::SnowSquall, ImpactBasedWarningInfo {}}, {Phenomenon::Tornado, ImpactBasedWarningInfo { - .hasObservedTag_ {true}, + .hasObservedTag_ = true, .threatCategories_ {ThreatCategory::Base, ThreatCategory::Considerable, ThreatCategory::Catastrophic}}},