From f5a5d3172f053427ca46cc2ecc7fd40e80b8400f Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Thu, 19 Sep 2024 11:45:18 -0400 Subject: [PATCH] comment out some unused variables/constants --- scwx-qt/source/scwx/qt/gl/draw/icons.cpp | 2 +- scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp | 8 ++++---- scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp | 2 +- scwx-qt/source/scwx/qt/map/radar_product_layer.cpp | 4 ++-- scwx-qt/source/scwx/qt/model/layer_model.cpp | 4 ++-- scwx-qt/source/scwx/qt/settings/map_settings.cpp | 4 ++-- scwx-qt/source/scwx/qt/util/time.cpp | 4 ++-- wxdata/source/scwx/provider/warnings_provider.cpp | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scwx-qt/source/scwx/qt/gl/draw/icons.cpp b/scwx-qt/source/scwx/qt/gl/draw/icons.cpp index 473b8a79..408f703f 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/icons.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/icons.cpp @@ -24,7 +24,7 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_); static constexpr std::size_t kNumRectangles = 1; static constexpr std::size_t kNumTriangles = kNumRectangles * 2; static constexpr std::size_t kVerticesPerTriangle = 3; -static constexpr std::size_t kVerticesPerRectangle = kVerticesPerTriangle * 2; +//static constexpr std::size_t kVerticesPerRectangle = kVerticesPerTriangle * 2; static constexpr std::size_t kPointsPerVertex = 10; static constexpr std::size_t kPointsPerTexCoord = 3; static constexpr std::size_t kIconBufferLength = diff --git a/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp b/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp index 8fdce9f1..e51164df 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp @@ -18,13 +18,13 @@ namespace draw static const std::string logPrefix_ = "scwx::qt::gl::draw::placefile_lines"; static const auto logger_ = scwx::util::Logger::Create(logPrefix_); -static constexpr std::size_t kNumRectangles = 1; -static constexpr std::size_t kNumTriangles = kNumRectangles * 2; +//static constexpr std::size_t kNumRectangles = 1; +//static constexpr std::size_t kNumTriangles = kNumRectangles * 2; static constexpr std::size_t kVerticesPerTriangle = 3; static constexpr std::size_t kVerticesPerRectangle = kVerticesPerTriangle * 2; static constexpr std::size_t kPointsPerVertex = 9; -static constexpr std::size_t kBufferLength = - kNumTriangles * kVerticesPerTriangle * kPointsPerVertex; +//static constexpr std::size_t kBufferLength = +// kNumTriangles * kVerticesPerTriangle * kPointsPerVertex; // Threshold, start time, end time static constexpr std::size_t kIntegersPerVertex_ = 3; diff --git a/scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp b/scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp index 2944fa20..2dee9f62 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp @@ -31,7 +31,7 @@ static constexpr std::size_t kIntegersPerVertex_ = 3; static constexpr std::size_t kTessVertexScreenX_ = 0; static constexpr std::size_t kTessVertexScreenY_ = 1; -static constexpr std::size_t kTessVertexScreenZ_ = 2; +//static constexpr std::size_t kTessVertexScreenZ_ = 2; static constexpr std::size_t kTessVertexXOffset_ = 3; static constexpr std::size_t kTessVertexYOffset_ = 4; static constexpr std::size_t kTessVertexR_ = 5; diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp index 79d03ce6..9f6d5e4d 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -31,8 +31,8 @@ namespace qt namespace map { -static constexpr uint32_t MAX_RADIALS = 720; -static constexpr uint32_t MAX_DATA_MOMENT_GATES = 1840; +//static constexpr uint32_t MAX_RADIALS = 720; +//static constexpr uint32_t MAX_DATA_MOMENT_GATES = 1840; static const std::string logPrefix_ = "scwx::qt::map::radar_product_layer"; static const auto logger_ = scwx::util::Logger::Create(logPrefix_); diff --git a/scwx-qt/source/scwx/qt/model/layer_model.cpp b/scwx-qt/source/scwx/qt/model/layer_model.cpp index 35f188a9..3df8c138 100644 --- a/scwx-qt/source/scwx/qt/model/layer_model.cpp +++ b/scwx-qt/source/scwx/qt/model/layer_model.cpp @@ -66,12 +66,12 @@ static const std::vector kImmovableLayers_ { {types::LayerType::Map, types::MapLayer::MapUnderlay, false}, }; -static const std::array kAlertPhenomena_ { +/*static const std::array kAlertPhenomena_ { awips::Phenomenon::Tornado, awips::Phenomenon::SnowSquall, awips::Phenomenon::SevereThunderstorm, awips::Phenomenon::FlashFlood, - awips::Phenomenon::Marine}; + awips::Phenomenon::Marine};*/ class LayerModel::Impl { diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp index 2d8e93b0..366effa6 100644 --- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp @@ -29,8 +29,8 @@ static const std::string kRadarProductGroupName_ {"radar_product_group"}; static const std::string kRadarProductName_ {"radar_product"}; static const std::string kDefaultMapStyle_ {"?"}; -static constexpr common::RadarProductGroup kDefaultRadarProductGroup_ = - common::RadarProductGroup::Level3; +//static constexpr common::RadarProductGroup kDefaultRadarProductGroup_ = +// common::RadarProductGroup::Level3; static const std::string kDefaultRadarProductGroupString_ = "L3"; static const std::array kDefaultRadarProduct_ { "N0B", "N0G", "N0C", "N0X"}; diff --git a/scwx-qt/source/scwx/qt/util/time.cpp b/scwx-qt/source/scwx/qt/util/time.cpp index f34c6ea5..46dbd3b5 100644 --- a/scwx-qt/source/scwx/qt/util/time.cpp +++ b/scwx-qt/source/scwx/qt/util/time.cpp @@ -12,8 +12,8 @@ std::chrono::sys_days SysDays(const QDate& date) using namespace std::chrono; using sys_days = time_point; constexpr auto julianEpoch = sys_days {-4713y / November / 24d}; - constexpr auto unixEpoch = sys_days {1970y / January / 1d}; - constexpr auto offset = std::chrono::days(julianEpoch - unixEpoch); + //constexpr auto unixEpoch = sys_days {1970y / January / 1d}; + //constexpr auto offset = std::chrono::days(julianEpoch - unixEpoch); return std::chrono::sys_days(std::chrono::days(date.toJulianDay()) + julianEpoch); diff --git a/wxdata/source/scwx/provider/warnings_provider.cpp b/wxdata/source/scwx/provider/warnings_provider.cpp index e8a8c3ad..3c030189 100644 --- a/wxdata/source/scwx/provider/warnings_provider.cpp +++ b/wxdata/source/scwx/provider/warnings_provider.cpp @@ -30,7 +30,7 @@ namespace provider static const std::string logPrefix_ = "scwx::provider::warnings_provider"; static const auto logger_ = util::Logger::Create(logPrefix_); -static constexpr std::chrono::seconds kUpdatePeriod_ {15}; +//static constexpr std::chrono::seconds kUpdatePeriod_ {15}; class WarningsProvider::Impl {