Merge pull request openscad#5379 from openscad/clang-tidy-fixes

thehans · web-flow · commit ef6c55e06990 · 2024-10-16T22:12:11.000-05:00
Various fixes for clang-tidy checks with few occurences
diff --git a/src/core/Expression.cc b/src/core/Expression.cc
@@ -228,7 +228,6 @@ Range::Range(Expression *begin, Expression *step, Expression *end, const Locatio
  * during normal operating, not runtime during error handling.
  */
 static void NOINLINE print_range_depr(const Location& loc, const std::shared_ptr<const Context>& context){
-  std::string locs = loc.toRelativeString(context->documentRoot());
   LOG(message_group::Deprecated, loc, context->documentRoot(), "Using ranges of the form [begin:end] with begin value greater than the end value is deprecated");
 }
 
diff --git a/src/core/FreetypeRenderer.h b/src/core/FreetypeRenderer.h
@@ -192,16 +192,16 @@ class FreetypeRenderer
     // when rendering from Freetype, and have not yet been scaled
     // back up to the desired font size.
     std::vector<GlyphData> glyph_array;
-    double x_offset;
-    double y_offset;
-    double left;
-    double right;
-    double top;
-    double bottom;
-    double advance_x;
-    double advance_y;
-    double ascent;
-    double descent;
+    double x_offset{0.0};
+    double y_offset{0.0};
+    double left{0.0};
+    double right{0.0};
+    double top{0.0};
+    double bottom{0.0};
+    double advance_x{0.0};
+    double advance_y{0.0};
+    double ascent{0.0};
+    double descent{0.0};
     ShapeResults(const FreetypeRenderer::Params& params);
     virtual ~ShapeResults();
 private:
diff --git a/src/geometry/ClipperUtils.cc b/src/geometry/ClipperUtils.cc
@@ -177,7 +177,7 @@ std::unique_ptr<Polygon2d> apply(const std::vector<std::shared_ptr<const Polygon
 				 ClipperLib::ClipType clipType)
 {
   BoundingBox bounds;
-  for (auto polygon : polygons) {
+  for (const auto& polygon : polygons) {
     if (polygon) bounds.extend(polygon->getBoundingBox());
   }
   int pow2 = ClipperUtils::getScalePow2(bounds);
diff --git a/src/geometry/PolySetBuilder.cc b/src/geometry/PolySetBuilder.cc
@@ -171,8 +171,7 @@ void PolySetBuilder::appendPolySet(const PolySet& ps)
         color_map[i] = it - colors_.begin();
       }
     }
-    for (int i = 0, n = ps.color_indices.size(); i < n; i++) {
-      const auto color_index = ps.color_indices[i];
+    for (auto color_index : ps.color_indices) {
       color_indices_.push_back(color_index < 0 ? -1 : color_map[color_index]);
     }
   } else if (!color_indices_.empty()) {
diff --git a/src/geometry/manifold/manifoldutils.cc b/src/geometry/manifold/manifoldutils.cc
@@ -49,7 +49,7 @@ const char* statusToString(Error status) {
 template <class TriangleMesh>
 std::shared_ptr<ManifoldGeometry> createManifoldFromSurfaceMesh(const TriangleMesh& tm)
 {
-  typedef typename TriangleMesh::Vertex_index vertex_descriptor;
+  using vertex_descriptor = typename TriangleMesh::Vertex_index;
 
   manifold::MeshGL64 meshgl;
 
diff --git a/src/glview/GLView.cc b/src/glview/GLView.cc
@@ -183,7 +183,7 @@ void GLView::paintGL()
     showObject(obj,eyedir);
   }
   glColor3f(0,1,0);
-  for (const SelectedObject obj: this->shown_obj) {
+  for (const SelectedObject &obj: this->shown_obj) {
     showObject(obj,eyedir);
   }
   glDisable(GL_LIGHTING);
diff --git a/src/glview/NULLGL.cc b/src/glview/NULLGL.cc
@@ -22,8 +22,8 @@ void GLView::setColorScheme(const std::string& cs) {assert(false && "not impleme
 #include "glview/system-gl.h"
 
 double gl_version() { return -1; }
-std::string gl_dump() { return std::string("GL Renderer: NULLGL\n"); }
-std::string gl_extensions_dump() { return std::string("NULLGL Extensions"); }
+std::string gl_dump() { return {"GL Renderer: NULLGL\n"}; }
+std::string gl_extensions_dump() { return {"NULLGL Extensions"}; }
 bool report_glerror(const char *function) { return false; }
 
 #include "glview/OpenGLContext.h"
diff --git a/src/glview/OffscreenContextEGL.cc b/src/glview/OffscreenContextEGL.cc
@@ -115,7 +115,7 @@ std::shared_ptr<OffscreenContext> CreateOffscreenContextEGL(size_t width, size_t
 {
   auto ctx = std::make_shared<OffscreenContextEGL>(width, height);
 
-  int initialEglVersion = gladLoaderLoadEGL(NULL);
+  int initialEglVersion = gladLoaderLoadEGL(nullptr);
   if (!initialEglVersion) {
     LOG("gladLoaderLoadEGL(NULL): Unable to load EGL");
     return nullptr;
diff --git a/src/glview/Renderer.cc b/src/glview/Renderer.cc
@@ -206,7 +206,7 @@ void Renderer::setColorScheme(const ColorScheme& cs) {
 }
 
 
-std::vector<SelectedObject> Renderer::findModelObject(Vector3d near_pt, Vector3d far_pt, int mouse_x, int mouse_y, double tolerance) { return std::vector<SelectedObject>(); }
+std::vector<SelectedObject> Renderer::findModelObject(Vector3d near_pt, Vector3d far_pt, int mouse_x, int mouse_y, double tolerance) { return {}; }
 #else //NULLGL
 
 Renderer::Renderer() : colorscheme(nullptr) {}
@@ -217,6 +217,6 @@ void Renderer::setColor(const float color[4], const shaderinfo_t *shaderinfo) co
 Color4f Renderer::setColor(ColorMode colormode, const float color[4], const shaderinfo_t *shaderinfo) const { return {}; }
 void Renderer::setColor(ColorMode colormode, const shaderinfo_t *shaderinfo) const {}
 void Renderer::setColorScheme(const ColorScheme& cs) {}
-std::vector<SelectedObject> Renderer::findModelObject(Vector3d near_pt, Vector3d far_pt, int mouse_x, int mouse_y, double tolerance) { return std::vector<SelectedObject>(); }
+std::vector<SelectedObject> Renderer::findModelObject(Vector3d near_pt, Vector3d far_pt, int mouse_x, int mouse_y, double tolerance) { return {}; }
 
 #endif //NULLGL
diff --git a/src/glview/VertexState.h b/src/glview/VertexState.h
@@ -9,9 +9,11 @@
 
 #define GL_TRACE_ENABLE
 #ifdef GL_TRACE_ENABLE
+// NOLINTBEGIN(bugprone-macro-parentheses)
 #define GL_TRACE(fmt_, args) do { \
           if (OpenSCAD::debug != "") PRINTDB("%d : " fmt_, __LINE__ % args); \
 } while (0)
+// NOLINTEND(bugprone-macro-parentheses)
 #define GL_TRACE0(fmt_) do { \
           if (OpenSCAD::debug != "") PRINTDB("%d : " fmt_, __LINE__); \
 } while (0)
diff --git a/src/glview/cgal/CGALRenderUtils.cc b/src/glview/cgal/CGALRenderUtils.cc
@@ -10,9 +10,9 @@
 
 bool linsystem( Vector3d v1,Vector3d v2,Vector3d v3,Vector3d pt,Vector3d &res,double *detptr)
 {
-        float det,ad11,ad12,ad13,ad21,ad22,ad23,ad31,ad32,ad33;
+        double det,ad11,ad12,ad13,ad21,ad22,ad23,ad31,ad32,ad33;
         det=v1[0]*(v2[1]*v3[2]-v3[1]*v2[2])-v1[1]*(v2[0]*v3[2]-v3[0]*v2[2])+v1[2]*(v2[0]*v3[1]-v3[0]*v2[1]);
-        if(detptr != NULL) *detptr=det;
+        if(detptr != nullptr) *detptr=det;
         ad11=v2[1]*v3[2]-v3[1]*v2[2];
         ad12=v3[0]*v2[2]-v2[0]*v3[2];
         ad13=v2[0]*v3[1]-v3[0]*v2[1];
diff --git a/src/glview/offscreen-old/OffscreenContextEGL.cc b/src/glview/offscreen-old/OffscreenContextEGL.cc
@@ -107,7 +107,7 @@ static bool create_egl_dummy_context(OffscreenContextEGL& ctx)
     eglQueryDevicesEXT(MAX_DEVICES, eglDevs, &numDevices);
     PRINTDB("Found %d EGL devices.", numDevices);
     for (int idx = 0; idx < numDevices; idx++) {
-      EGLDisplay disp = eglGetPlatformDisplayEXT(EGL_PLATFORM_DEVICE_EXT, eglDevs[idx], 0);
+      EGLDisplay disp = eglGetPlatformDisplayEXT(EGL_PLATFORM_DEVICE_EXT, eglDevs[idx], nullptr);
       if (disp != EGL_NO_DISPLAY) {
         ctx.display = disp;
         break;
diff --git a/src/gui/ErrorLog.cc b/src/gui/ErrorLog.cc
@@ -8,7 +8,6 @@
 #include <QStandardItemModel>
 #include <QString>
 #include <QWidget>
-#include <utility>
 #include <boost/filesystem.hpp>
 
 ErrorLog::ErrorLog(QWidget *parent) : QWidget(parent)
@@ -40,7 +39,7 @@ void ErrorLog::initGUI()
 
 void ErrorLog::toErrorLog(const Message& log_msg)
 {
-  lastMessages.push_back(std::forward<const Message>(log_msg));
+  lastMessages.push_back(log_msg);
   QString currGroup = errorLogComboBox->currentText();
 
   //handle combobox
diff --git a/src/gui/FontList.cc b/src/gui/FontList.cc
@@ -504,5 +504,7 @@ const QModelIndex FontList::colIdx(const QModelIndex& idx, int column)
 
 const QString FontList::colStr(const QModelIndex& idx, int column)
 {
-  return idx.model()->data(colIdx(idx, column)).toString();
+  return idx.model() ?
+    idx.model()->data(colIdx(idx, column)).toString() :
+    QString{};
 }
diff --git a/src/gui/FontListDialog.cc b/src/gui/FontListDialog.cc
@@ -93,7 +93,7 @@ void FontListDialog::update_font_list()
 
   int idx = 0;
   for (auto it = list->begin(); it != list->end(); it++, idx++) {
-    FontInfo font_info = (*it);
+    const FontInfo& font_info = (*it);
     auto *family = new QStandardItem(QString(font_info.get_family().c_str()));
     family->setEditable(false);
     model->setItem(idx, 0, family);
diff --git a/src/gui/MainWindow.cc b/src/gui/MainWindow.cc
@@ -2557,7 +2557,7 @@ void findNodesWithSameMod(std::shared_ptr<const AbstractNode> tree,
   if (node_mod->modinst == tree->modinst) {
     nodes.push_back(tree);
   }
-  for (auto step : tree->children) {
+  for (const auto& step : tree->children) {
     findNodesWithSameMod(step, node_mod, nodes);
   }
 }
@@ -2617,7 +2617,7 @@ void MainWindow::setSelectionIndicatorStatus(int nodeIndex, EditorSelectionIndic
   // ends at size - 1 because we are not doing anything for the root node.
   // starts at 1 because we will process this one after later
   for (int i = 1; i < stack.size() - 1; i++) {
-    auto node = stack[i];
+    const auto& node = stack[i];
 
     auto& location = node->modinst->location();
     if (location.filePath().compare(activeEditor->filepath.toStdString()) != 0) {
@@ -2677,7 +2677,7 @@ void MainWindow::setSelection(int index)
   findNodesWithSameMod(root_node, selected_node, nodesSameModule);
 
   // highlight in the text editor all the text fragment of the hierarchy of object with same mode.
-  for (auto element : nodesSameModule) {
+  for (const auto& element : nodesSameModule) {
     if (element->index() != currently_selected_object) {
       setSelectionIndicatorStatus(element->index(), EditorSelectionIndicatorStatus::IMPACTED);
     }
diff --git a/src/gui/Measurement.cc b/src/gui/Measurement.cc
@@ -76,7 +76,6 @@ QString Measurement::statemachine(QPoint mouse)
         if(obj1.type == SelectionType::SELECTION_LINE && obj2.type == SelectionType::SELECTION_LINE) dist =calculateSegSegDistance(obj1.p1, obj1.p2,obj2.p1,obj2.p2,lat);
         if(!std::isnan(dist)) {
           return QString("Distance is %1").arg(fabs(dist));
-              std::stringstream ss;
         }
         qglview->selected_obj.clear();
         qglview->shown_obj.clear();
diff --git a/src/io/DxfData.cc b/src/io/DxfData.cc
@@ -71,9 +71,10 @@ namespace fs = boost::filesystem;
  */
 
 struct Line {
-  int idx[2]; // indices into DxfData::points
+  int idx[2] = {-1, -1}; // indices into DxfData::points
   bool disabled{false};
-  Line(int i1 = -1, int i2 = -1) : idx{i1, i2} { }
+  Line() = default;
+  Line(int i1, int i2) : idx{i1, i2} { }
 };
 
 /*!
diff --git a/src/io/imageutils-macosx.cc b/src/io/imageutils-macosx.cc
@@ -31,7 +31,7 @@ CGDataConsumerRef CGDataConsumerCreateWithOstream(std::ostream& output)
 
 bool write_png(std::ostream& output, unsigned char *pixels, int width, int height)
 {
-  size_t rowBytes = width * 4;
+  size_t rowBytes = static_cast<size_t>(width) * 4;
 //  CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
   CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
   CGBitmapInfo bitmapInfo = kCGImageAlphaNoneSkipLast | kCGBitmapByteOrder32Big; // BGRA
diff --git a/src/io/import_3mf_v1.cc b/src/io/import_3mf_v1.cc
@@ -154,8 +154,8 @@ std::unique_ptr<Geometry> import_3mf(const std::string& filename, const Location
       MODELMESHVERTEX vertex;
 
       builder.beginPolygon(3);
-      for(int i=0;i<3;i++) {
-        if (lib3mf_meshobject_getvertex(object, triangle.m_nIndices[i], &vertex) != LIB3MF_OK) {
+      for (auto m_nIndex : triangle.m_nIndices) {
+        if (lib3mf_meshobject_getvertex(object, m_nIndex, &vertex) != LIB3MF_OK) {
           return import_3mf_error(model, object_it);
         }
         builder.addVertex(Vector3d(vertex.m_fPosition[0], vertex.m_fPosition[1], vertex.m_fPosition[2]));
diff --git a/src/io/import_amf.cc b/src/io/import_amf.cc
@@ -161,8 +161,8 @@ void AmfImporter::end_triangle(AmfImporter *importer, const xmlChar *)
   std::vector<Eigen::Vector3d>& v = importer->vertex_list;
 
   importer->builder->beginPolygon(3);
-  for(int i=0;i<3;i++) // TODO set vertex array first
-	  importer->builder->addVertex(Vector3d(v[idx[i]].x(), v[idx[i]].y(), v[idx[i]].z()));
+  for(auto i : idx) // TODO set vertex array first
+	  importer->builder->addVertex(Vector3d(v[i].x(), v[i].y(), v[i].z()));
 }
 
 void AmfImporter::processNode(xmlTextReaderPtr reader)
diff --git a/src/io/import_obj.cc b/src/io/import_obj.cc
@@ -61,7 +61,6 @@ std::unique_ptr<PolySet> import_obj(const std::string& filename, const Location&
         return PolySet::createEmpty();
       }
     } else if (boost::regex_search(line, results, ex_f) && results.size() >= 2) {
-      std::string args=results[1];
       std::vector<std::string> words;
       boost::split(words, results[1], boost::is_any_of(" \t"));
       builder.beginPolygon(words.size());
diff --git a/src/libsvg/path.cc b/src/libsvg/path.cc
@@ -540,8 +540,8 @@ path::set_attrs(attr_map_t& attrs, void *context)
 bool
 path::is_open_path(path_t& path) const
 {
-  const Eigen::Vector3d p1 = path[0];
-  const Eigen::Vector3d p2 = path.back();
+  const Eigen::Vector3d& p1 = path[0];
+  const Eigen::Vector3d& p2 = path.back();
   double distance = pow(pow(p1.x() - p2.x(), 2) + pow(p1.y() - p2.y(), 2) + pow(p1.z() - p2.z(), 2), 0.5);
   return distance > 0.1;
 }
diff --git a/src/platform/PlatformUtils-win.cc b/src/platform/PlatformUtils-win.cc
@@ -117,6 +117,7 @@ unsigned long PlatformUtils::stackLimit()
   return STACK_LIMIT_DEFAULT;
 }
 
+// NOLINTNEXTLINE(modernize-use-using)
 typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
 
 // see http://msdn.microsoft.com/en-us/library/windows/desktop/ms684139%28v=vs.85%29.aspx
@@ -240,6 +241,6 @@ void PlatformUtils::ensureStdIO(void)
   }
 
 #ifdef USE_MIMALLOC
-  mi_register_output(&mi_output, NULL);
+  mi_register_output(&mi_output, nullptr);
 #endif
 }
diff --git a/src/utils/findversion.h b/src/utils/findversion.h
@@ -19,7 +19,7 @@
 #include <windows.h>
 
 #define FV_EQUAL 0
-#define FV_LESS -1
+#define FV_LESS (-1)
 #define FV_GREAT 1
 #define FV_MIN_VALUE 0
 #define FV_MINOR_VERSION_MAX_VALUE 16
@@ -46,6 +46,7 @@ DWORDLONG eqFor(DWORD target)
     return VerSetConditionMask(0, target, VER_EQUAL);
 }
 
+// NOLINTBEGIN(bugprone-macro-parentheses)
 #define findPartTemplate(T)\
 BOOL findPart##T(T * part, DWORD partType, OSVERSIONINFOEX * ret, T a, T b) \
 { \
@@ -92,6 +93,7 @@ BOOL findPart##T(T * part, DWORD partType, OSVERSIONINFOEX * ret, T a, T b) \
 \
     return TRUE; \
 }
+// NOLINTEND(bugprone-macro-parentheses)
 
 findPartTemplate(DWORD)
 findPartTemplate(WORD)
diff --git a/src/utils/scope_guard.hpp b/src/utils/scope_guard.hpp
@@ -123,7 +123,7 @@ namespace sg
     class SG_NODISCARD scope_guard<Callback> final
     {
     public:
-      typedef Callback callback_type;
+      using callback_type = Callback;
 
       scope_guard(scope_guard&& other)
       noexcept(std::is_nothrow_constructible<Callback, Callback&&>::value);
@@ -188,7 +188,7 @@ template<typename Callback>
 sg::detail::scope_guard<Callback>::scope_guard(scope_guard&& other)
 noexcept(std::is_nothrow_constructible<Callback, Callback&&>::value)
   : m_callback(std::forward<Callback>(other.m_callback)) // idem
-  , m_active{std::move(other.m_active)}
+  , m_active{other.m_active}
 {
   other.m_active = false;
 }

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ Range::Range(Expression begin, Expression step, Expression *end, const Locatio`
`228`	`228`	`* during normal operating, not runtime during error handling.`
`229`	`229`	`*/`
`230`	`230`	`static void NOINLINE print_range_depr(const Location& loc, const std::shared_ptr<const Context>& context){`
`231`		`- std::string locs = loc.toRelativeString(context->documentRoot());`
`232`	`231`	`LOG(message_group::Deprecated, loc, context->documentRoot(), "Using ranges of the form [begin:end] with begin value greater than the end value is deprecated");`
`233`	`232`	`}`
`234`	`233`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ std::unique_ptr<Polygon2d> apply(const std::vector<std::shared_ptr<const Polygon`
`177`	`177`	`ClipperLib::ClipType clipType)`
`178`	`178`	`{`
`179`	`179`	`BoundingBox bounds;`
`180`		`- for (auto polygon : polygons) {`
	`180`	`+ for (const auto& polygon : polygons) {`
`181`	`181`	`if (polygon) bounds.extend(polygon->getBoundingBox());`
`182`	`182`	`}`
`183`	`183`	`int pow2 = ClipperUtils::getScalePow2(bounds);`
Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,7 @@ void PolySetBuilder::appendPolySet(const PolySet& ps)`
`171`	`171`	`color_map[i] = it - colors_.begin();`
`172`	`172`	`}`
`173`	`173`	`}`
`174`		`- for (int i = 0, n = ps.color_indices.size(); i < n; i++) {`
`175`		`- const auto color_index = ps.color_indices[i];`
	`174`	`+ for (auto color_index : ps.color_indices) {`
`176`	`175`	`color_indices_.push_back(color_index < 0 ? -1 : color_map[color_index]);`
`177`	`176`	`}`
`178`	`177`	`} else if (!color_indices_.empty()) {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ const char* statusToString(Error status) {`
`49`	`49`	`template <class TriangleMesh>`
`50`	`50`	`std::shared_ptr<ManifoldGeometry> createManifoldFromSurfaceMesh(const TriangleMesh& tm)`
`51`	`51`	`{`
`52`		`- typedef typename TriangleMesh::Vertex_index vertex_descriptor;`
	`52`	`+ using vertex_descriptor = typename TriangleMesh::Vertex_index;`
`53`	`53`
`54`	`54`	`manifold::MeshGL64 meshgl;`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void GLView::paintGL()`
`183`	`183`	`showObject(obj,eyedir);`
`184`	`184`	`}`
`185`	`185`	`glColor3f(0,1,0);`
`186`		`- for (const SelectedObject obj: this->shown_obj) {`
	`186`	`+ for (const SelectedObject &obj: this->shown_obj) {`
`187`	`187`	`showObject(obj,eyedir);`
`188`	`188`	`}`
`189`	`189`	`glDisable(GL_LIGHTING);`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ std::shared_ptr<OffscreenContext> CreateOffscreenContextEGL(size_t width, size_t`
`115`	`115`	`{`
`116`	`116`	`auto ctx = std::make_shared<OffscreenContextEGL>(width, height);`
`117`	`117`
`118`		`- int initialEglVersion = gladLoaderLoadEGL(NULL);`
	`118`	`+ int initialEglVersion = gladLoaderLoadEGL(nullptr);`
`119`	`119`	`if (!initialEglVersion) {`
`120`	`120`	`LOG("gladLoaderLoadEGL(NULL): Unable to load EGL");`
`121`	`121`	`return nullptr;`