diff --git a/scwx-qt/source/scwx/qt/config/radar_site.cpp b/scwx-qt/source/scwx/qt/config/radar_site.cpp index 6feadde9..e3d466e8 100644 --- a/scwx-qt/source/scwx/qt/config/radar_site.cpp +++ b/scwx-qt/source/scwx/qt/config/radar_site.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include @@ -118,18 +117,18 @@ std::string RadarSite::location_name() const if (p->country_ == "USA") { - locationName = std::format("{}, {}", p->place_, p->state_); + locationName = fmt::format("{}, {}", p->place_, p->state_); } else if (std::all_of(p->state_.cbegin(), p->state_.cend(), [](char c) { return std::isdigit(c); })) { - locationName = std::format("{}, {}", p->place_, p->country_); + locationName = fmt::format("{}, {}", p->place_, p->country_); } else { locationName = - std::format("{}, {}, {}", p->place_, p->state_, p->country_); + fmt::format("{}, {}, {}", p->place_, p->state_, p->country_); } return locationName; diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp index 293e69d5..8e064f7a 100644 --- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp @@ -254,14 +254,14 @@ std::string ProviderManager::name() const if (group_ == common::RadarProductGroup::Level3) { - name = std::format("{}, {}, {}", + name = fmt::format("{}, {}, {}", radarId_, common::GetRadarProductGroupName(group_), product_); } else { - name = std::format( + name = fmt::format( "{}, {}", radarId_, common::GetRadarProductGroupName(group_)); } diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index 0b4d56ba..e3376ac7 100644 --- a/scwx-qt/source/scwx/qt/map/map_widget.cpp +++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -89,7 +90,7 @@ public: // Create ImGui Context static size_t currentMapId_ {0u}; - imGuiContextName_ = std::format("Map {}", ++currentMapId_); + imGuiContextName_ = fmt::format("Map {}", ++currentMapId_); imGuiContext_ = model::ImGuiContextModel::Instance().CreateContext(imGuiContextName_); diff --git a/scwx-qt/source/scwx/qt/model/radar_site_model.cpp b/scwx-qt/source/scwx/qt/model/radar_site_model.cpp index bc059953..1993c75a 100644 --- a/scwx-qt/source/scwx/qt/model/radar_site_model.cpp +++ b/scwx-qt/source/scwx/qt/model/radar_site_model.cpp @@ -5,8 +5,6 @@ #include #include -#include - namespace scwx { namespace qt diff --git a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp index d25c7236..711792c2 100644 --- a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp @@ -2,10 +2,10 @@ #include #include -#include #include #include +#include namespace scwx { @@ -74,8 +74,8 @@ public: for (auto& alert : kAlertColors_) { std::string phenomenonCode = awips::GetPhenomenonCode(alert.first); - std::string activeName = std::format("{}-active", phenomenonCode); - std::string inactiveName = std::format("{}-inactive", phenomenonCode); + std::string activeName = fmt::format("{}-active", phenomenonCode); + std::string inactiveName = fmt::format("{}-inactive", phenomenonCode); auto activeResult = activeAlertColor_.emplace( alert.first, SettingsVariable {activeName}); diff --git a/scwx-qt/source/scwx/qt/types/text_event_key.cpp b/scwx-qt/source/scwx/qt/types/text_event_key.cpp index f9ac29dc..bebf6f63 100644 --- a/scwx-qt/source/scwx/qt/types/text_event_key.cpp +++ b/scwx-qt/source/scwx/qt/types/text_event_key.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include namespace scwx { @@ -15,7 +14,7 @@ static const std::string logPrefix_ = "scwx::qt::types::text_event_key"; std::string TextEventKey::ToFullString() const { - return std::format("{} {} {} {:04}", + return fmt::format("{} {} {} {:04}", officeId_, awips::GetPhenomenonText(phenomenon_), awips::GetSignificanceText(significance_), @@ -24,7 +23,7 @@ std::string TextEventKey::ToFullString() const std::string TextEventKey::ToString() const { - return std::format("{}.{}.{}.{:04}", + return fmt::format("{}.{}.{}.{:04}", officeId_, awips::GetPhenomenonCode(phenomenon_), awips::GetSignificanceCode(significance_), diff --git a/scwx-qt/source/scwx/qt/ui/imgui_debug_widget.cpp b/scwx-qt/source/scwx/qt/ui/imgui_debug_widget.cpp index 066ba59d..18011b7f 100644 --- a/scwx-qt/source/scwx/qt/ui/imgui_debug_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/imgui_debug_widget.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace scwx { @@ -23,7 +24,7 @@ public: { // Create ImGui Context static size_t currentIndex_ {0u}; - contextName_ = std::format("ImGui Debug {}", ++currentIndex_); + contextName_ = fmt::format("ImGui Debug {}", ++currentIndex_); context_ = model::ImGuiContextModel::Instance().CreateContext(contextName_); currentContext_ = context_; diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp index 5a16f508..5eb9cceb 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp @@ -12,8 +12,7 @@ #include #include -#include - +#include #include #include #include @@ -622,7 +621,7 @@ void SettingsDialogImpl::SetBackgroundColor(const std::string& value, QFrame* frame) { frame->setStyleSheet( - QString::fromStdString(std::format("background-color: {}", value))); + QString::fromStdString(fmt::format("background-color: {}", value))); } void SettingsDialogImpl::UpdateRadarDialogLocation(const std::string& id) @@ -676,7 +675,7 @@ void SettingsDialogImpl::ResetToDefault() std::string SettingsDialogImpl::RadarSiteLabel( std::shared_ptr& radarSite) { - return std::format("{} ({})", radarSite->id(), radarSite->location_name()); + return fmt::format("{} ({})", radarSite->id(), radarSite->location_name()); } } // namespace ui diff --git a/scwx-qt/source/scwx/qt/util/color.cpp b/scwx-qt/source/scwx/qt/util/color.cpp index e7729663..c1246843 100644 --- a/scwx-qt/source/scwx/qt/util/color.cpp +++ b/scwx-qt/source/scwx/qt/util/color.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include namespace scwx @@ -16,7 +16,7 @@ static const std::string logPrefix_ = "scwx::qt::util::color"; std::string ToArgbString(const boost::gil::rgba8_pixel_t& color) { - return std::format( + return fmt::format( "#{:02x}{:02x}{:02x}{:02x}", color[3], color[0], color[1], color[2]); } diff --git a/scwx-qt/source/scwx/qt/util/font.cpp b/scwx-qt/source/scwx/qt/util/font.cpp index 25ccc27d..0a94c8a0 100644 --- a/scwx-qt/source/scwx/qt/util/font.cpp +++ b/scwx-qt/source/scwx/qt/util/font.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -273,7 +274,7 @@ void FontImpl::CreateImGuiFont(QFile& fontFile, // Assign name to font strncpy(fontConfig.Name, - std::format("{}:{}", fileInfo.fileName().toStdString(), fontSize) + fmt::format("{}:{}", fileInfo.fileName().toStdString(), fontSize) .c_str(), sizeof(fontConfig.Name)); fontConfig.Name[sizeof(fontConfig.Name) - 1] = 0; diff --git a/wxdata/source/scwx/awips/ugc.cpp b/wxdata/source/scwx/awips/ugc.cpp index f49ea36a..124e13b4 100644 --- a/wxdata/source/scwx/awips/ugc.cpp +++ b/wxdata/source/scwx/awips/ugc.cpp @@ -84,7 +84,7 @@ std::vector Ugc::fips_ids() const { for (auto& id : fipsIdList.second) { - fipsIds.push_back(std::format("{}{}{:03}", + fipsIds.push_back(fmt::format("{}{}{:03}", fipsIdList.first, ugcFormatMap_.left.at(p->format_), id)); diff --git a/wxdata/source/scwx/common/geographic.cpp b/wxdata/source/scwx/common/geographic.cpp index 651cae13..bf7d1a2c 100644 --- a/wxdata/source/scwx/common/geographic.cpp +++ b/wxdata/source/scwx/common/geographic.cpp @@ -1,9 +1,10 @@ #include #include -#include #include +#include + namespace scwx { namespace common @@ -95,7 +96,7 @@ static std::string GetDegreeString(double degrees, { case DegreeStringType::Decimal: degreeString = - std::format("{:.6f}{}{}", degrees, Unicode::kDegree, suffix); + fmt::format("{:.6f}{}{}", degrees, Unicode::kDegree, suffix); break; case DegreeStringType::DegreesMinutesSeconds: { @@ -103,7 +104,7 @@ static std::string GetDegreeString(double degrees, degrees = (degrees - dd) * 60.0; uint32_t mm = static_cast(degrees); double ss = (degrees - mm) * 60.0; - degreeString = std::format( + degreeString = fmt::format( "{}{} {}' {:.2f}\"{}", dd, Unicode::kDegree, mm, ss, suffix); break; }