From 137340f70f1c0b97b84dd110bd59d1d9988f10c3 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 28 Mar 2024 11:03:23 +0100 Subject: [PATCH] Fixed couple of compiler warnings --- src/libslic3r/MacUtils.mm | 2 +- src/libslic3r/ProfilesSharingUtils.cpp | 8 ++++---- src/slic3r/GUI/GUI_App.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 5 +++-- src/slic3r/GUI/TopBar.cpp | 2 +- src/slic3r/GUI/UserAccountCommunication.cpp | 4 ++-- src/slic3r/GUI/WebView.cpp | 2 +- src/slic3r/GUI/WebViewDialog.cpp | 3 ++- src/slic3r/Utils/MacDarkMode.mm | 1 + src/slic3r/Utils/PrusaConnect.cpp | 2 +- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/libslic3r/MacUtils.mm b/src/libslic3r/MacUtils.mm index ee1462fb79..cd5c650a01 100644 --- a/src/libslic3r/MacUtils.mm +++ b/src/libslic3r/MacUtils.mm @@ -9,6 +9,6 @@ std::string GetDataDir() inDomain:NSUserDomainMask appropriateForURL:nil create:NO error:nil]; - return std::string([(CFStringRef)url.path UTF8String]); + return std::string([url.path UTF8String]); } diff --git a/src/libslic3r/ProfilesSharingUtils.cpp b/src/libslic3r/ProfilesSharingUtils.cpp index b950b37c0d..44ea057bd9 100644 --- a/src/libslic3r/ProfilesSharingUtils.cpp +++ b/src/libslic3r/ProfilesSharingUtils.cpp @@ -475,7 +475,7 @@ std::string load_full_print_config(const std::string& print_preset_name, check_material(material_preset_names_in.front(), errors); if (material_preset_names_in.size() > 1) { - for (int idx = 1; idx < material_preset_names_in.size(); idx++) { + for (size_t idx = 1; idx < material_preset_names_in.size(); idx++) { if (material_preset_names_in[idx] != material_preset_names_in.front()) check_material(material_preset_names_in[idx], errors); } @@ -494,14 +494,14 @@ std::string load_full_print_config(const std::string& print_preset_name, } if (printer_technology == ptFFF) { - const int extruders_count = static_cast(printer_preset->config.option("nozzle_diameter"))->values.size(); + const int extruders_count = int(static_cast(printer_preset->config.option("nozzle_diameter"))->values.size()); if (extruders_count > material_preset_names.size()) { BOOST_LOG_TRIVIAL(warning) << "Note: Less than needed filament profiles were entered. Missed filament profiles will be filled with first material."; material_preset_names.reserve(extruders_count); for (int i = extruders_count - material_preset_names.size(); i > 0; i--) material_preset_names.push_back(material_preset_names.front()); } - else if (extruders_count < material_preset_names.size()) { + else if (extruders_count < int(material_preset_names.size())) { BOOST_LOG_TRIVIAL(warning) << "Note: More than needed filament profiles were entered. Extras filament profiles will be ignored."; material_preset_names.resize(extruders_count); } @@ -529,7 +529,7 @@ std::string load_full_print_config(const std::string& print_preset_name, check_material_preset_compatibility(material_preset_names.front(), errors); if (material_preset_names.size() > 1) { - for (int idx = 1; idx < material_preset_names.size(); idx++) { + for (size_t idx = 1; idx < material_preset_names.size(); idx++) { if (material_preset_names[idx] != material_preset_names.front()) check_material_preset_compatibility(material_preset_names[idx], errors); } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4b44683ecd..038fcbc252 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1579,7 +1579,7 @@ static bool is_focused(HWND hWnd) } #endif -static bool is_default(wxWindow* win) +[[maybe_unused]] static bool is_default(wxWindow* win) { wxTopLevelWindow* tlw = find_toplevel_parent(win); if (!tlw) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index ea28670ec6..e09329ce98 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -909,7 +909,7 @@ void MainFrame::set_printer_webview_tab_url(const wxString& url) } m_printer_webview->clear(); m_printer_webview->set_default_url(url); - if (m_tabpanel->GetSelection() == m_tabpanel->GetPageCount() - 1) { + if (m_tabpanel->GetSelection() == int(m_tabpanel->GetPageCount() - 1)) { m_printer_webview->load_url(url); } else { m_printer_webview->load_default_url_delayed(); @@ -1903,9 +1903,10 @@ void MainFrame::export_configbundle(bool export_physical_printers /*= false*/) file = dlg.GetPath(); if (!file.IsEmpty()) { // Export the config bundle. - +#if wxUSE_SECRETSTORE bool passwords_to_plain = false; bool passwords_dialog_shown = false; +#endif // callback function thats going to be passed to preset bundle (so preset bundle doesnt have to include WX secret lib) std::function load_password = [&](const std::string& printer_id, const std::string& opt, std::string& out_psswd)->bool{ out_psswd = std::string(); diff --git a/src/slic3r/GUI/TopBar.cpp b/src/slic3r/GUI/TopBar.cpp index 9a4cb56fe9..5ee2a32dce 100644 --- a/src/slic3r/GUI/TopBar.cpp +++ b/src/slic3r/GUI/TopBar.cpp @@ -228,7 +228,6 @@ void TopBarItemsCtrl::CreateAccountMenu() m_connect_dummy_menu_item = append_menu_item(&m_account_menu, wxID_ANY, _L("PrusaConnect Printers"), "", [](wxCommandEvent&) { wxGetApp().plater()->get_user_account()->enqueue_connect_printers_action(); }, "", nullptr, []() { return wxGetApp().plater()->get_user_account()->is_logged(); }, this->GetParent()); -#endif // 0 wxMenuItem* remember_me_menu_item = append_menu_check_item(&m_account_menu, wxID_ANY, _L("Remember me"), "" , [](wxCommandEvent&) { wxGetApp().plater()->get_user_account()->toggle_remember_session(); } @@ -236,6 +235,7 @@ void TopBarItemsCtrl::CreateAccountMenu() , []() { return wxGetApp().plater()->get_user_account() ? wxGetApp().plater()->get_user_account()->is_logged() : false; } , []() { return wxGetApp().plater()->get_user_account() ? wxGetApp().plater()->get_user_account()->get_remember_session() : false; } , this->GetParent()); +#endif // 0 m_login_menu_item = append_menu_item(&m_account_menu, wxID_ANY, "", "", [](wxCommandEvent&) { diff --git a/src/slic3r/GUI/UserAccountCommunication.cpp b/src/slic3r/GUI/UserAccountCommunication.cpp index eb203667e4..ceb53ee41d 100644 --- a/src/slic3r/GUI/UserAccountCommunication.cpp +++ b/src/slic3r/GUI/UserAccountCommunication.cpp @@ -310,7 +310,7 @@ void UserAccountCommunication::enqueue_connect_user_data_action() } wakeup_session_thread(); } -#endif 0 +#endif // 0 void UserAccountCommunication::enqueue_connect_printers_action() { @@ -422,7 +422,7 @@ std::string CodeChalengeGenerator::generate_code_verifier(size_t length) std::mt19937 gen(rd()); std::uniform_int_distribution distribution(0, chars.size() - 1); std::string code_verifier; - for (int i = 0; i < length; ++i) { + for (size_t i = 0; i < length; ++i) { code_verifier += chars[distribution(gen)]; } return code_verifier; diff --git a/src/slic3r/GUI/WebView.cpp b/src/slic3r/GUI/WebView.cpp index a1874e6562..866592261e 100644 --- a/src/slic3r/GUI/WebView.cpp +++ b/src/slic3r/GUI/WebView.cpp @@ -170,7 +170,7 @@ bool WebView::run_script(wxWebView *webView, wxString const &javascript) }, NULL); return true; #endif - } catch (std::exception &e) { + } catch (std::exception &) { return false; } } diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index bd692406ee..d851e11e09 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -650,7 +650,8 @@ void WebViewDialog::run_script(const wxString& javascript) { if (!m_browser) return; - bool res = WebView::run_script(m_browser, javascript); + // dk_FIXME: Is it ok to discard the return value? + /*bool res = */ WebView::run_script(m_browser, javascript); } PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string& ret_val) diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm index 96f421d035..6eca9329d2 100644 --- a/src/slic3r/Utils/MacDarkMode.mm +++ b/src/slic3r/Utils/MacDarkMode.mm @@ -7,6 +7,7 @@ #import #import #import +#import @interface MacDarkMode : NSObject {} @end diff --git a/src/slic3r/Utils/PrusaConnect.cpp b/src/slic3r/Utils/PrusaConnect.cpp index cf8ba300f2..6ba4be633c 100644 --- a/src/slic3r/Utils/PrusaConnect.cpp +++ b/src/slic3r/Utils/PrusaConnect.cpp @@ -71,7 +71,7 @@ bool PrusaConnectNew::test(wxString& curl_msg) const res = false; curl_msg = format_error(body, error, status); }) - .on_complete([&, this](std::string body, unsigned) { + .on_complete([&](std::string body, unsigned) { BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Got files/raw: %2%") % name % body; }) .perform_sync();