Another round of clang-tidy fixes

scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp

@@ -10,13 +10,7 @@
 #include <imgui.h>
 #include <mbgl/util/constants.hpp>
 
-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

scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp

@@ -3,13 +3,7 @@
 
 #include <optional>
 
-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<GlContext> 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<GlContext> 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

scwx-qt/source/scwx/qt/gl/shader_program.cpp

@@ -4,11 +4,7 @@
 #include <QFile>
 #include <QTextStream>
 
-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<GLenum, std::string> 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<GLchar*>(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