From d096804a24329a4aaf9afbb1f52bbad3fe1412da Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 6 Sep 2019 14:48:31 +0200 Subject: [PATCH] Fix a few warnings in PrintHostDialogs, UploadDialogs --- src/slic3r/GUI/PrintHostDialogs.cpp | 6 +++--- src/slic3r/GUI/PrintHostDialogs.hpp | 1 - src/slic3r/GUI/UpdateDialogs.cpp | 6 ++---- src/slic3r/GUI/UpdateDialogs.hpp | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index 09bd65682..d08389537 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -250,7 +250,7 @@ void PrintHostQueueDialog::on_list_select() void PrintHostQueueDialog::on_progress(Event &evt) { - wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); + wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list"); if (evt.progress < 100) { set_state(evt.job_id, ST_PROGRESS); @@ -265,7 +265,7 @@ void PrintHostQueueDialog::on_progress(Event &evt) void PrintHostQueueDialog::on_error(Event &evt) { - wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); + wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list"); set_state(evt.job_id, ST_ERROR); @@ -280,7 +280,7 @@ void PrintHostQueueDialog::on_error(Event &evt) void PrintHostQueueDialog::on_cancel(Event &evt) { - wxCHECK_RET(evt.job_id < job_list->GetItemCount(), "Out of bounds access to job list"); + wxCHECK_RET(evt.job_id < (size_t)job_list->GetItemCount(), "Out of bounds access to job list"); set_state(evt.job_id, ST_CANCELLED); job_list->SetValue(wxVariant(0), evt.job_id, COL_PROGRESS); diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp index 427c4f6bf..e5f96f2b6 100644 --- a/src/slic3r/GUI/PrintHostDialogs.hpp +++ b/src/slic3r/GUI/PrintHostDialogs.hpp @@ -37,7 +37,6 @@ public: private: wxTextCtrl *txt_filename; wxCheckBox *box_print; - bool can_start_print; }; diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index a1a113066..d2a5e185a 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -34,10 +34,8 @@ static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/Prus // MsgUpdateSlic3r -MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online) : - MsgDialog(nullptr, _(L("Update available")), wxString::Format(_(L("New version of %s is available")), SLIC3R_APP_NAME)), - ver_current(ver_current), - ver_online(ver_online) +MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online) + : MsgDialog(nullptr, _(L("Update available")), wxString::Format(_(L("New version of %s is available")), SLIC3R_APP_NAME)) { const bool dev_version = ver_online.prerelease() != nullptr; diff --git a/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp index 4b61b84c2..a916e0145 100644 --- a/src/slic3r/GUI/UpdateDialogs.hpp +++ b/src/slic3r/GUI/UpdateDialogs.hpp @@ -31,8 +31,6 @@ public: bool disable_version_check() const; private: - const Semver &ver_current; - const Semver &ver_online; wxCheckBox *cbox; };