From 17af5e27acc0f9d1dec9d85f27dd6799741d512c Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 11 Jul 2025 23:04:31 -0500 Subject: [PATCH] Another round of clang-tidy fixes --- .../source/scwx/qt/gl/draw/placefile_text.cpp | 23 ++++++-------- scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp | 23 +++++++------- scwx-qt/source/scwx/qt/gl/shader_program.cpp | 30 ++++++++----------- .../source/scwx/qt/map/color_table_layer.cpp | 24 +++++++++++++-- .../scwx/qt/map/radar_product_layer.cpp | 12 ++++++-- 5 files changed, 62 insertions(+), 50 deletions(-) diff --git a/scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp b/scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp index e133f98a..832a1292 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp @@ -10,13 +10,7 @@ #include #include -namespace scwx -{ -namespace qt -{ -namespace gl -{ -namespace draw +namespace scwx::qt::gl::draw { static const std::string logPrefix_ = "scwx::qt::gl::draw::placefile_text"; @@ -25,12 +19,16 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_); class PlacefileText::Impl { public: - explicit Impl(const std::string& placefileName) : - placefileName_ {placefileName} + explicit Impl(std::string placefileName) : + placefileName_ {std::move(placefileName)} { } + ~Impl() = default; - ~Impl() {} + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + Impl(const Impl&&) = delete; + Impl& operator=(const Impl&&) = delete; void RenderTextDrawItem( const QMapLibre::CustomLayerRenderParameters& params, @@ -306,7 +304,4 @@ void PlacefileText::FinishText() p->newFonts_.clear(); } -} // namespace draw -} // namespace gl -} // namespace qt -} // namespace scwx +} // namespace scwx::qt::gl::draw diff --git a/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp b/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp index 616917a4..d86ba163 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp @@ -3,13 +3,7 @@ #include -namespace scwx -{ -namespace qt -{ -namespace gl -{ -namespace draw +namespace scwx::qt::gl::draw { static const std::string logPrefix_ = "scwx::qt::gl::draw::rectangle"; @@ -27,7 +21,7 @@ class Rectangle::Impl { public: explicit Impl(std::shared_ptr context) : - context_ {context}, + context_ {std::move(context)}, dirty_ {false}, visible_ {true}, x_ {0.0f}, @@ -44,8 +38,12 @@ public: vbo_ {GL_INVALID_INDEX} { } + ~Impl() = default; - ~Impl() {} + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + Impl(const Impl&&) = delete; + Impl& operator=(const Impl&&) = delete; std::shared_ptr context_; @@ -101,6 +99,7 @@ void Rectangle::Initialize() glBufferData( GL_ARRAY_BUFFER, sizeof(float) * BUFFER_LENGTH, nullptr, GL_DYNAMIC_DRAW); + // NOLINTBEGIN(modernize-use-nullptr) // NOLINTBEGIN(performance-no-int-to-ptr) glVertexAttribPointer(0, @@ -120,6 +119,7 @@ void Rectangle::Initialize() glEnableVertexAttribArray(1); // NOLINTEND(performance-no-int-to-ptr) + // NOLINTEND(modernize-use-nullptr) p->dirty_ = true; } @@ -296,7 +296,4 @@ void Rectangle::Impl::Update() } } -} // namespace draw -} // namespace gl -} // namespace qt -} // namespace scwx +} // namespace scwx::qt::gl::draw diff --git a/scwx-qt/source/scwx/qt/gl/shader_program.cpp b/scwx-qt/source/scwx/qt/gl/shader_program.cpp index ec96c23e..61808ad0 100644 --- a/scwx-qt/source/scwx/qt/gl/shader_program.cpp +++ b/scwx-qt/source/scwx/qt/gl/shader_program.cpp @@ -4,11 +4,7 @@ #include #include -namespace scwx -{ -namespace qt -{ -namespace gl +namespace scwx::qt::gl { static const std::string logPrefix_ = "scwx::qt::gl::shader_program"; @@ -24,11 +20,7 @@ static const std::unordered_map kShaderNames_ { class ShaderProgram::Impl { public: - explicit Impl() : id_ {GL_INVALID_INDEX} - { - // Create shader program - id_ = glCreateProgram(); - } + explicit Impl() : id_ {glCreateProgram()} {} ~Impl() { @@ -36,6 +28,11 @@ public: glDeleteProgram(id_); } + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + Impl(const Impl&&) = delete; + Impl& operator=(const Impl&&) = delete; + static std::string ShaderName(GLenum type); GLuint id_; @@ -54,7 +51,7 @@ GLuint ShaderProgram::id() const GLint ShaderProgram::GetUniformLocation(const std::string& name) { - GLint location = glGetUniformLocation(p->id_, name.c_str()); + const GLint location = glGetUniformLocation(p->id_, name.c_str()); if (location == -1) { logger_->warn("Could not find {}", name); @@ -114,16 +111,17 @@ bool ShaderProgram::Load( const char* shaderSourceC = shaderSource.c_str(); // Create a shader - GLuint shaderId = glCreateShader(shader.first); + const GLuint shaderId = glCreateShader(shader.first); shaderIds.push_back(shaderId); // Attach the shader source code and compile the shader - glShaderSource(shaderId, 1, &shaderSourceC, NULL); + glShaderSource(shaderId, 1, &shaderSourceC, nullptr); glCompileShader(shaderId); // Check for errors glGetShaderiv(shaderId, GL_COMPILE_STATUS, &glSuccess); - glGetShaderInfoLog(shaderId, kInfoLogBufSize, &logLength, infoLog); + glGetShaderInfoLog( + shaderId, kInfoLogBufSize, &logLength, static_cast(infoLog)); if (!glSuccess) { logger_->error("Shader compilation failed: {}", infoLog); @@ -172,6 +170,4 @@ void ShaderProgram::Use() const glUseProgram(p->id_); } -} // namespace gl -} // namespace qt -} // namespace scwx +} // namespace scwx::qt::gl diff --git a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp index 7585334c..f55bd94a 100644 --- a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp @@ -78,6 +78,9 @@ void ColorTableLayer::Initialize(const std::shared_ptr& mapContext) glBindVertexArray(p->vao_); + // NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers) + // NOLINTBEGIN(modernize-use-nullptr) + // Bottom panel glBindBuffer(GL_ARRAY_BUFFER, p->vbo_[0]); glBufferData( @@ -87,6 +90,7 @@ void ColorTableLayer::Initialize(const std::shared_ptr& mapContext) glEnableVertexAttribArray(0); // Color table panel texture coordinates + // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays) const float textureCoords[6][1] = {{0.0f}, // TL {0.0f}, // BL {1.0f}, // TR @@ -95,12 +99,17 @@ void ColorTableLayer::Initialize(const std::shared_ptr& mapContext) {1.0f}, // TR {1.0f}}; // BR glBindBuffer(GL_ARRAY_BUFFER, p->vbo_[1]); - glBufferData( - GL_ARRAY_BUFFER, sizeof(textureCoords), textureCoords, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, + sizeof(textureCoords), + static_cast(textureCoords), + GL_STATIC_DRAW); glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, 0, static_cast(0)); glEnableVertexAttribArray(1); + // NOLINTEND(modernize-use-nullptr) + // NOLINTEND(cppcoreguidelines-avoid-magic-numbers) + connect(mapContext->radar_product_view().get(), &view::RadarProductView::ColorTableLutUpdated, this, @@ -154,6 +163,9 @@ void ColorTableLayer::Render( if (p->colorTable_.size() > 0 && radarProductView->sweep_time() != std::chrono::system_clock::time_point()) { + // NOLINTBEGIN(cppcoreguidelines-avoid-c-arrays) + // NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers) + // Color table panel vertices const float vertexLX = 0.0f; const float vertexRX = static_cast(params.width); @@ -170,7 +182,10 @@ void ColorTableLayer::Render( // Draw vertices glBindVertexArray(p->vao_); glBindBuffer(GL_ARRAY_BUFFER, p->vbo_[0]); - glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices); + glBufferSubData(GL_ARRAY_BUFFER, + 0, + sizeof(vertices), + static_cast(vertices)); glDrawArrays(GL_TRIANGLES, 0, 6); static constexpr int kLeftMargin_ = 0; @@ -180,6 +195,9 @@ void ColorTableLayer::Render( mapContext->set_color_table_margins( QMargins {kLeftMargin_, kTopMargin_, kRightMargin_, kBottomMargin_}); + + // NOLINTEND(cppcoreguidelines-avoid-magic-numbers) + // NOLINTEND(cppcoreguidelines-avoid-c-arrays) } else { 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 9d759c8e..22b43a87 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -151,6 +151,9 @@ void RadarProductLayer::Initialize( void RadarProductLayer::UpdateSweep( const std::shared_ptr& mapContext) { + // NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers) + // NOLINTBEGIN(modernize-use-nullptr) + boost::timer::cpu_timer timer; std::shared_ptr radarProductView = @@ -176,7 +179,7 @@ void RadarProductLayer::UpdateSweep( glBindBuffer(GL_ARRAY_BUFFER, p->vbo_[0]); timer.start(); glBufferData(GL_ARRAY_BUFFER, - vertices.size() * sizeof(GLfloat), + static_cast(vertices.size() * sizeof(GLfloat)), vertices.data(), GL_STATIC_DRAW); timer.stop(); @@ -245,7 +248,10 @@ void RadarProductLayer::UpdateSweep( glDisableVertexAttribArray(2); } - p->numVertices_ = vertices.size() / 2; + p->numVertices_ = static_cast(vertices.size() / 2); + + // NOLINTEND(modernize-use-nullptr) + // NOLINTEND(cppcoreguidelines-avoid-magic-numbers) } void RadarProductLayer::Render( @@ -302,7 +308,7 @@ void RadarProductLayer::Render( glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_1D, p->texture_); glBindVertexArray(p->vao_); - glDrawArrays(GL_TRIANGLES, 0, p->numVertices_); + glDrawArrays(GL_TRIANGLES, 0, static_cast(p->numVertices_)); if (wireframeEnabled) {