From 5f19539df54f0572e54e63892fb1652359fa66c6 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 21 Oct 2021 09:55:12 +0200 Subject: [PATCH] Obvious fixes to stupid warnings --- src/slic3r/GUI/DoubleSlider.cpp | 2 +- src/slic3r/GUI/GUI_ObjectList.cpp | 2 +- src/slic3r/GUI/ImGuiWrapper.cpp | 2 +- src/slic3r/GUI/OptionsGroup.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- tests/libslic3r/test_config.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index d0b29165c7..fc47484b56 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -2080,7 +2080,7 @@ void Control::auto_color_change() } int extruders_cnt = GUI::wxGetApp().extruders_edited_cnt(); - int extruder = 2; +// int extruder = 2; const Print& print = GUI::wxGetApp().plater()->fff_print(); for (auto object : print.objects()) { diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 83f9d1ec1a..43ebd23f2b 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1433,7 +1433,7 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false selection_changed(); } /* -void ObjectList::load_part(ModelObject& model_object, std::vector& added_volumes, ModelVolumeType type, bool from_galery/* = false* /) +void ObjectList::load_part(ModelObject& model_object, std::vector& added_volumes, ModelVolumeType type, bool from_galery = false) { if (type != ModelVolumeType::MODEL_PART) return; diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 22dccc695a..a65991a1e6 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -306,7 +306,7 @@ ImVec2 ImGuiWrapper::get_item_spacing() const { const ImGuiContext &g = *GImGui; const ImGuiStyle &style = g.Style; - return g.Style.ItemSpacing; + return style.ItemSpacing; } float ImGuiWrapper::get_slider_float_height() const diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index fd9f4b5e82..2e0d8384de 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -201,7 +201,7 @@ void OptionsGroup::activate_line(Line& line) if (line.is_separator()) return; - m_use_custom_ctrl_as_parent = false; + m_use_custom_ctrl_as_parent = false; if (line.full_width && ( line.widget != nullptr || diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 9a24d91cc8..0013e106c7 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -205,7 +205,7 @@ void ObjectInfo::msw_rescale() void ObjectInfo::update_warning_icon(const std::string& warning_icon_name) { - if (showing_manifold_warning_icon = !warning_icon_name.empty()) { + if ((showing_manifold_warning_icon = !warning_icon_name.empty())) { m_warning_icon_name = warning_icon_name; manifold_warning_icon->SetBitmap(create_scaled_bitmap(m_warning_icon_name)); } diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 2131050844..8dfda789ee 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -220,7 +220,7 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { cereal::BinaryOutputArchive oarchive(ss); oarchive(cfg); serialized = ss.str(); - } catch (std::runtime_error e) { + } catch (std::runtime_error &e) { e.what(); } @@ -230,7 +230,7 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { std::stringstream ss(serialized); cereal::BinaryInputArchive iarchive(ss); iarchive(cfg2); - } catch (std::runtime_error e) { + } catch (std::runtime_error &e) { e.what(); } REQUIRE(cfg == cfg2);