From 5fd279cbc86a05fc90e327a64c5d210ddddbdaac Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 30 Nov 2021 10:50:18 +0100 Subject: [PATCH] Fixing clang compiler warnings --- src/libslic3r/PrintApply.cpp | 3 ++- src/libslic3r/SupportMaterial.cpp | 2 +- src/libslic3r/TriangleMesh.cpp | 2 +- src/libslic3r/TriangleMeshSlicer.cpp | 2 +- src/slic3r/GUI/DoubleSlider.hpp | 2 +- src/slic3r/GUI/ExtraRenderers.cpp | 3 ++- src/slic3r/GUI/GUI_App.cpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp | 2 +- src/slic3r/Utils/AstroBox.hpp | 2 +- src/slic3r/Utils/Duet.hpp | 2 +- src/slic3r/Utils/FlashAir.hpp | 2 +- src/slic3r/Utils/MKS.hpp | 2 +- src/slic3r/Utils/OctoPrint.hpp | 6 +++--- src/slic3r/Utils/Repetier.hpp | 2 +- src/slic3r/Utils/TCPConsole.cpp | 1 - tests/libslic3r/test_config.cpp | 8 ++++---- tests/libslic3r/test_indexed_triangle_set.cpp | 5 ++++- 18 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp index c1878bd87b..34e3129d98 100644 --- a/src/libslic3r/PrintApply.cpp +++ b/src/libslic3r/PrintApply.cpp @@ -920,7 +920,7 @@ static PrintObjectRegions* generate_print_object_regions( const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[parent_region_id]; const ModelVolume &parent_volume = *parent_region.model_volume; if (parent_volume.is_model_part() || parent_volume.is_modifier()) - if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) + if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) { // Only create new region for a modifier, which actually modifies config of it's parent. if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders); config != parent_region.region->config()) { @@ -928,6 +928,7 @@ static PrintObjectRegions* generate_print_object_regions( layer_range.volume_regions.push_back({ &volume, parent_region_id, get_create_region(std::move(config)), bbox }); } else if (parent_model_part_id == -1 && parent_volume.is_model_part()) parent_model_part_id = parent_region_id; + } } if (! added && parent_model_part_id >= 0) // This modifier does not override any printable volume's configuration, however it may in the future. diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp index 7ef289757d..faf283d6a6 100644 --- a/src/libslic3r/SupportMaterial.cpp +++ b/src/libslic3r/SupportMaterial.cpp @@ -2355,7 +2355,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::bottom_conta Polygons *layer_buildplate_covered = buildplate_covered.empty() ? nullptr : &buildplate_covered[layer_id]; // Filtering the propagated support columns to two extrusions, overlapping by maximum 20%. float column_propagation_filtering_radius = scaled(0.8 * 0.5 * (m_support_params.support_material_flow.spacing() + m_support_params.support_material_flow.width())); - task_group.run([&grid_params, &overhangs_projection, &overhangs_projection_raw, &layer, &layer_support_area, layer_buildplate_covered, column_propagation_filtering_radius + task_group.run([&grid_params, &overhangs_projection, &overhangs_projection_raw, &layer, &layer_support_area, layer_buildplate_covered /* , column_propagation_filtering_radius */ #ifdef SLIC3R_DEBUG , iRun, layer_id #endif /* SLIC3R_DEBUG */ diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp index 5eafd68842..93a09a0d98 100644 --- a/src/libslic3r/TriangleMesh.cpp +++ b/src/libslic3r/TriangleMesh.cpp @@ -1090,7 +1090,7 @@ indexed_triangle_set its_convex_hull(const std::vector &pts) centroid += pt; centroid /= float(pts.size()); #endif // NDEBUG - for (const orgQhull::QhullFacet facet : qhull.facetList()) { + for (const orgQhull::QhullFacet &facet : qhull.facetList()) { // Collect face vertices first, allocate unique vertices in dst_vertices based on QHull's vertex ID. Vec3i indices; int cnt = 0; diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp index 05936f1394..ae917756b0 100644 --- a/src/libslic3r/TriangleMeshSlicer.cpp +++ b/src/libslic3r/TriangleMeshSlicer.cpp @@ -560,9 +560,9 @@ void slice_facet_with_slabs( // Save the open edge for sure. type = FacetSliceType::Slicing; } else { +#ifndef NDEBUG const stl_triangle_vertex_indices &neighbor = mesh_triangles[neighbor_idx]; float z = *it; -#ifndef NDEBUG int num_on_plane = (mesh_vertices[neighbor(0)].z() == z) + (mesh_vertices[neighbor(1)].z() == z) + (mesh_vertices[neighbor(2)].z() == z); assert(num_on_plane == 2 || num_on_plane == 3); #endif // NDEBUG diff --git a/src/slic3r/GUI/DoubleSlider.hpp b/src/slic3r/GUI/DoubleSlider.hpp index 8f88de4726..e0f713d879 100644 --- a/src/slic3r/GUI/DoubleSlider.hpp +++ b/src/slic3r/GUI/DoubleSlider.hpp @@ -115,7 +115,7 @@ class TickCodeInfo bool m_suppress_plus = false; bool m_suppress_minus = false; bool m_use_default_colors= false; - int m_default_color_idx = 0; +// int m_default_color_idx = 0; std::vector* m_colors {nullptr}; diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 874df1b4ab..d72e1dd328 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -223,7 +223,8 @@ bool BitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value if (!text_editor || text_editor->GetValue().IsEmpty()) return false; - if (m_was_unusable_symbol = Slic3r::GUI::Plater::has_illegal_filename_characters(text_editor->GetValue())) + m_was_unusable_symbol = Slic3r::GUI::Plater::has_illegal_filename_characters(text_editor->GetValue()); + if (m_was_unusable_symbol) return false; // The icon can't be edited so get its old value and reuse it. diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4253f26c2e..df31fd6c82 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -535,7 +535,7 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension) } } - for (const std::string_view ext : data.file_extensions) + for (const std::string_view &ext : data.file_extensions) // Only add an extension if it was not added first as the custom extension. if (ext != custom_ext_lower) { if (title.empty()) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp index 0eaf9cf0a7..577db8ed5a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp @@ -97,7 +97,7 @@ public: // will be also extended to support additional states, requiring at least one state to remain free out of 19 states. static const constexpr size_t EXTRUDERS_LIMIT = 16; - virtual const float get_cursor_radius_min() const { return CursorRadiusMin; } + const float get_cursor_radius_min() const override { return CursorRadiusMin; } protected: std::array get_cursor_sphere_left_button_color() const override; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp index a2f8193879..39093e14d6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp @@ -39,7 +39,7 @@ protected: virtual void on_render() override; virtual void on_render_for_picking() override{}; - virtual CommonGizmosDataID on_get_requirements() const; + CommonGizmosDataID on_get_requirements() const override; private: void apply_simplify(); diff --git a/src/slic3r/Utils/AstroBox.hpp b/src/slic3r/Utils/AstroBox.hpp index ad656c4940..15a8863a90 100644 --- a/src/slic3r/Utils/AstroBox.hpp +++ b/src/slic3r/Utils/AstroBox.hpp @@ -26,7 +26,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return true; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; } std::string get_host() const override { return host; } protected: diff --git a/src/slic3r/Utils/Duet.hpp b/src/slic3r/Utils/Duet.hpp index ea007006c7..edca66ce0c 100644 --- a/src/slic3r/Utils/Duet.hpp +++ b/src/slic3r/Utils/Duet.hpp @@ -25,7 +25,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return false; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint | PrintHostPostUploadAction::StartSimulation; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint | PrintHostPostUploadAction::StartSimulation; } std::string get_host() const override { return host; } private: diff --git a/src/slic3r/Utils/FlashAir.hpp b/src/slic3r/Utils/FlashAir.hpp index 5ae38da500..14e3f00156 100644 --- a/src/slic3r/Utils/FlashAir.hpp +++ b/src/slic3r/Utils/FlashAir.hpp @@ -26,7 +26,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return false; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return {}; } + PrintHostPostUploadActions get_post_upload_actions() const override { return {}; } std::string get_host() const override { return host; } private: diff --git a/src/slic3r/Utils/MKS.hpp b/src/slic3r/Utils/MKS.hpp index 37021dc6d0..22455436ae 100644 --- a/src/slic3r/Utils/MKS.hpp +++ b/src/slic3r/Utils/MKS.hpp @@ -25,7 +25,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return false; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; } std::string get_host() const override { return m_host; } private: diff --git a/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp index 14d53118a2..7945cfdb1a 100644 --- a/src/slic3r/Utils/OctoPrint.hpp +++ b/src/slic3r/Utils/OctoPrint.hpp @@ -28,7 +28,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return true; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; } std::string get_host() const override { return m_host; } const std::string& get_apikey() const { return m_apikey; } const std::string& get_cafile() const { return m_cafile; } @@ -57,7 +57,7 @@ public: wxString get_test_ok_msg() const override; wxString get_test_failed_msg(wxString &msg) const override; - PrintHostPostUploadActions get_post_upload_actions() const { return {}; } + PrintHostPostUploadActions get_post_upload_actions() const override { return {}; } protected: bool validate_version_text(const boost::optional &version_text) const override; @@ -82,7 +82,7 @@ public: wxString get_test_ok_msg() const override; wxString get_test_failed_msg(wxString& msg) const override; - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; } protected: bool validate_version_text(const boost::optional& version_text) const override; diff --git a/src/slic3r/Utils/Repetier.hpp b/src/slic3r/Utils/Repetier.hpp index 8b95b019dd..6f33102604 100644 --- a/src/slic3r/Utils/Repetier.hpp +++ b/src/slic3r/Utils/Repetier.hpp @@ -26,7 +26,7 @@ public: bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool has_auto_discovery() const override { return false; } bool can_test() const override { return true; } - PrintHostPostUploadActions get_post_upload_actions() const { return PrintHostPostUploadAction::StartPrint; } + PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; } bool supports_multiple_printers() const override { return true; } std::string get_host() const override { return host; } diff --git a/src/slic3r/Utils/TCPConsole.cpp b/src/slic3r/Utils/TCPConsole.cpp index a4f4bc21e9..3c943cc632 100644 --- a/src/slic3r/Utils/TCPConsole.cpp +++ b/src/slic3r/Utils/TCPConsole.cpp @@ -148,7 +148,6 @@ bool TCPConsole::is_deadline_over() const bool TCPConsole::run_queue() { - auto now = std::chrono::steady_clock::now(); try { // TODO: Add more resets and initializations after previous run (reset() method?..) set_deadline_in(m_connect_timeout); diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 8dfda789ee..025459d689 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -220,8 +220,8 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { cereal::BinaryOutputArchive oarchive(ss); oarchive(cfg); serialized = ss.str(); - } catch (std::runtime_error &e) { - e.what(); + } catch (const std::runtime_error & /* e */) { + // e.what(); } THEN("Config object contains ini file options.") { @@ -230,8 +230,8 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { std::stringstream ss(serialized); cereal::BinaryInputArchive iarchive(ss); iarchive(cfg2); - } catch (std::runtime_error &e) { - e.what(); + } catch (const std::runtime_error & /* e */) { + // e.what(); } REQUIRE(cfg == cfg2); } diff --git a/tests/libslic3r/test_indexed_triangle_set.cpp b/tests/libslic3r/test_indexed_triangle_set.cpp index 7e2d511c77..0bb85b7ed0 100644 --- a/tests/libslic3r/test_indexed_triangle_set.cpp +++ b/tests/libslic3r/test_indexed_triangle_set.cpp @@ -117,15 +117,18 @@ static float triangle_area(const Vec3crd &triangle_inices, const std::vector its_sample_surface(const indexed_triangle_set &its, double sample_per_mm2, - std::mt19937 random_generator = create_random_generator()) + std::mt19937 random_generator) // = create_random_generator()) { std::vector samples; std::uniform_real_distribution rand01(0.f, 1.f);