From 677cb580006888ffe4480b9c8d751e3fd5725bec Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 15 Sep 2021 16:36:59 +0200 Subject: [PATCH] Fix several warnings --- src/libslic3r/Model.cpp | 4 ++-- src/slic3r/GUI/Field.cpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 2 +- src/slic3r/GUI/ObjectDataViewModel.cpp | 1 - src/slic3r/GUI/Plater.cpp | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 8d7b9ccad..2844f644c 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -1505,7 +1505,7 @@ double ModelObject::get_instance_min_z(size_t instance_idx) const const Transform3d mv = mi * v->get_matrix(); const TriangleMesh& hull = v->get_convex_hull(); - for (const stl_triangle_vertex_indices facet : hull.its.indices) + for (const stl_triangle_vertex_indices& facet : hull.its.indices) for (int i = 0; i < 3; ++ i) min_z = std::min(min_z, (mv * hull.its.vertices[facet[i]].cast()).z()); } @@ -1526,7 +1526,7 @@ double ModelObject::get_instance_max_z(size_t instance_idx) const const Transform3d mv = mi * v->get_matrix(); const TriangleMesh& hull = v->get_convex_hull(); - for (const stl_triangle_vertex_indices facet : hull.its.indices) + for (const stl_triangle_vertex_indices& facet : hull.its.indices) for (int i = 0; i < 3; ++i) max_z = std::max(max_z, (mv * hull.its.vertices[facet[i]].cast()).z()); } diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 06cfd0a1c..7dbb9d787 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -977,7 +977,7 @@ void Choice::BUILD() { propagate_value(); } ); - temp->Bind(wxEVT_TEXT_ENTER, [this, temp](wxEvent& e) { + temp->Bind(wxEVT_TEXT_ENTER, [this](wxEvent& e) { EnterPressed enter(this); propagate_value(); } ); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index 11446d6d7..a50c503b9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -881,7 +881,7 @@ CommonGizmosDataID GLGizmoSlaSupports::on_get_requirements() const void GLGizmoSlaSupports::ask_about_changes_call_after(std::function on_yes, std::function on_no) { - wxGetApp().CallAfter([this, on_yes, on_no]() { + wxGetApp().CallAfter([on_yes, on_no]() { // Following is called through CallAfter, because otherwise there was a problem // on OSX with the wxMessageDialog being shown several times when clicked into. MessageDialog dlg(GUI::wxGetApp().mainframe, _L("Do you want to save your manually " diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index 928249e5b..8ceb3cc23 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -37,7 +37,6 @@ void ObjectDataViewModelNode::init_container() static constexpr char LayerRootIcon[] = "edit_layers_all"; static constexpr char LayerIcon[] = "edit_layers_some"; static constexpr char WarningIcon[] = "exclamation"; -static constexpr char InfoIcon[] = "objlist_info"; struct InfoItemAtributes { std::string name; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index e78ffe566..713fc04e1 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3691,7 +3691,7 @@ void Plater::priv::create_simplify_notification(const std::vector& obj_i std::vector big_ids; big_ids.reserve(obj_ids.size()); std::copy_if(obj_ids.begin(), obj_ids.end(), std::back_inserter(big_ids), - [this, triangles_to_suggest_simplify](size_t object_id) { + [this](size_t object_id) { if (object_id >= model.objects.size()) return false; // out of object index ModelVolumePtrs& volumes = model.objects[object_id]->volumes; if (volumes.size() != 1) return false; // not only one volume