From 34a87b1c1e3647d31836d3b7fd32f7fb451c708d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Dec 2011 21:09:31 +0000 Subject: [PATCH] Silence a pile of /W4 warnings Originally committed to SVN as r6001. --- .../include/libaegisub/cajun/elements.h | 2 +- .../include/libaegisub/cajun/elements.inl | 24 ++++++++-------- .../include/libaegisub/option_value.h | 20 ++++++------- aegisub/src/ass_style_storage.h | 1 - aegisub/src/audio_controller.cpp | 6 ++-- aegisub/src/audio_display.cpp | 6 ++-- aegisub/src/audio_karaoke.cpp | 2 +- aegisub/src/audio_player.cpp | 2 +- aegisub/src/audio_provider_dummy.cpp | 2 +- aegisub/src/auto4_lua.cpp | 2 +- aegisub/src/base_grid.cpp | 6 ++-- aegisub/src/command/app.cpp | 8 +++--- aegisub/src/command/audio.cpp | 28 +++++++++---------- aegisub/src/command/edit.cpp | 2 +- aegisub/src/command/grid.cpp | 14 +++++----- aegisub/src/command/help.cpp | 12 ++++---- aegisub/src/command/tool.cpp | 2 +- aegisub/src/command/video.cpp | 6 ++-- aegisub/src/dialog_attachments.cpp | 10 +++---- aegisub/src/dialog_colorpicker.cpp | 12 ++++---- aegisub/src/dialog_dummy_video.cpp | 11 ++++---- aegisub/src/dialog_kara_timing_copy.cpp | 20 ++++++------- aegisub/src/dialog_progress.cpp | 6 ++-- aegisub/src/dialog_properties.cpp | 4 +-- aegisub/src/dialog_resample.cpp | 8 +++--- aegisub/src/dialog_search_replace.cpp | 10 +++---- aegisub/src/dialog_styling_assistant.cpp | 2 +- aegisub/src/dialog_text_import.cpp | 14 +--------- aegisub/src/dialog_version_check.cpp | 6 ++-- aegisub/src/frame_main.cpp | 2 +- aegisub/src/hotkey_data_view_model.cpp | 8 +++--- aegisub/src/preferences.cpp | 4 +-- aegisub/src/subs_edit_box.cpp | 2 +- aegisub/src/subs_grid.cpp | 2 +- aegisub/src/timeedit_ctrl.cpp | 2 +- aegisub/src/validators.cpp | 2 +- aegisub/src/video_slider.cpp | 4 +-- aegisub/src/video_slider.h | 2 +- aegisub/src/visual_tool.h | 4 +-- 39 files changed, 133 insertions(+), 147 deletions(-) diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.h b/aegisub/libaegisub/include/libaegisub/cajun/elements.h index 7caa58019..bfe16d6df 100644 --- a/aegisub/libaegisub/include/libaegisub/cajun/elements.h +++ b/aegisub/libaegisub/include/libaegisub/cajun/elements.h @@ -139,7 +139,7 @@ private: class Null { public: - bool operator == (const Null& trivial) const { return true; } + bool operator == (const Null&) const { return true; } }; } // end namespace diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.inl b/aegisub/libaegisub/include/libaegisub/cajun/elements.inl index 35ca5bbb8..129777e2d 100644 --- a/aegisub/libaegisub/include/libaegisub/cajun/elements.inl +++ b/aegisub/libaegisub/include/libaegisub/cajun/elements.inl @@ -55,12 +55,12 @@ private: class UnknownElement::ConstCastVisitor : public ConstVisitor { - virtual void Visit(const Array& array) {} - virtual void Visit(const Object& object) {} - virtual void Visit(const Number& number) {} - virtual void Visit(const String& string) {} - virtual void Visit(const Boolean& boolean) {} - virtual void Visit(const Null& null) {} + virtual void Visit(const Array&) {} + virtual void Visit(const Object&) {} + virtual void Visit(const Number&) {} + virtual void Visit(const String&) {} + virtual void Visit(const Boolean&) {} + virtual void Visit(const Null&) {} }; template @@ -75,12 +75,12 @@ public: class UnknownElement::CastVisitor : public Visitor { - virtual void Visit(Array& array) {} - virtual void Visit(Object& object) {} - virtual void Visit(Number& number) {} - virtual void Visit(String& string) {} - virtual void Visit(Boolean& boolean) {} - virtual void Visit(Null& null) {} + virtual void Visit(Array&) {} + virtual void Visit(Object&) {} + virtual void Visit(Number&) {} + virtual void Visit(String&) {} + virtual void Visit(Boolean&) {} + virtual void Visit(Null&) {} }; template diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h index d95ae5c71..5ad4c5752 100644 --- a/aegisub/libaegisub/include/libaegisub/option_value.h +++ b/aegisub/libaegisub/include/libaegisub/option_value.h @@ -82,11 +82,11 @@ public: virtual Colour GetColour() const { throw TypeError("colour"); } virtual bool GetBool() const { throw TypeError("bool"); } - virtual void SetString(const std::string val) { throw TypeError("string", " set "); } - virtual void SetInt(const int64_t val) { throw TypeError("int", " set "); } - virtual void SetDouble(const double val) { throw TypeError("double", " set "); } - virtual void SetColour(const Colour val) { throw TypeError("colour", " set "); } - virtual void SetBool(const bool val) { throw TypeError("bool", " set "); } + virtual void SetString(const std::string) { throw TypeError("string", " set "); } + virtual void SetInt(const int64_t) { throw TypeError("int", " set "); } + virtual void SetDouble(const double) { throw TypeError("double", " set "); } + virtual void SetColour(const Colour) { throw TypeError("colour", " set "); } + virtual void SetBool(const bool) { throw TypeError("bool", " set "); } virtual std::string GetDefaultString() const { throw TypeError("string"); } virtual int64_t GetDefaultInt() const { throw TypeError("int"); } @@ -101,11 +101,11 @@ public: virtual std::vector const& GetListColour() const { throw ListTypeError("colour"); } virtual std::vector const& GetListBool() const { throw ListTypeError("string"); } - virtual void SetListString(const std::vector& val) { throw ListTypeError("string", " set "); } - virtual void SetListInt(const std::vector& val) { throw ListTypeError("int", " set "); } - virtual void SetListDouble(const std::vector& val) { throw ListTypeError("double", " set "); } - virtual void SetListColour(const std::vector& val) { throw ListTypeError("colour", " set "); } - virtual void SetListBool(const std::vector& val) { throw ListTypeError("string", " set "); } + virtual void SetListString(const std::vector&) { throw ListTypeError("string", " set "); } + virtual void SetListInt(const std::vector&) { throw ListTypeError("int", " set "); } + virtual void SetListDouble(const std::vector&) { throw ListTypeError("double", " set "); } + virtual void SetListColour(const std::vector&) { throw ListTypeError("colour", " set "); } + virtual void SetListBool(const std::vector&) { throw ListTypeError("string", " set "); } virtual std::vector const& GetDefaultListString() const { throw ListTypeError("string"); } virtual std::vector const& GetDefaultListInt() const { throw ListTypeError("int"); } diff --git a/aegisub/src/ass_style_storage.h b/aegisub/src/ass_style_storage.h index f8a4f16d3..7e3ff00d8 100644 --- a/aegisub/src/ass_style_storage.h +++ b/aegisub/src/ass_style_storage.h @@ -51,7 +51,6 @@ class AssStyle; - /// DOCME /// @class AssStyleStorage /// @brief DOCME diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp index a8a959e56..d588403d8 100644 --- a/aegisub/src/audio_controller.cpp +++ b/aegisub/src/audio_controller.cpp @@ -164,7 +164,7 @@ AudioController::~AudioController() } -void AudioController::OnPlaybackTimer(wxTimerEvent &event) +void AudioController::OnPlaybackTimer(wxTimerEvent &) { int64_t pos = player->GetCurrentPosition(); @@ -183,14 +183,14 @@ void AudioController::OnPlaybackTimer(wxTimerEvent &event) #ifdef wxHAS_POWER_EVENTS -void AudioController::OnComputerSuspending(wxPowerEvent &event) +void AudioController::OnComputerSuspending(wxPowerEvent &) { Stop(); player->CloseStream(); } -void AudioController::OnComputerResuming(wxPowerEvent &event) +void AudioController::OnComputerResuming(wxPowerEvent &) { if (provider) player->OpenStream(); diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index e178a3dbf..349acecc2 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -859,7 +859,7 @@ BEGIN_EVENT_TABLE(AudioDisplay, wxWindow) END_EVENT_TABLE(); -void AudioDisplay::OnPaint(wxPaintEvent& event) +void AudioDisplay::OnPaint(wxPaintEvent&) { wxAutoBufferedPaintDC dc(this); @@ -1200,7 +1200,7 @@ void AudioDisplay::OnKeyDown(wxKeyEvent& event) } -void AudioDisplay::OnSize(wxSizeEvent &event) +void AudioDisplay::OnSize(wxSizeEvent &) { // We changed size, update the sub-controls' internal data and redraw wxSize size = GetClientSize(); @@ -1219,7 +1219,7 @@ void AudioDisplay::OnSize(wxSizeEvent &event) } -void AudioDisplay::OnFocus(wxFocusEvent &event) +void AudioDisplay::OnFocus(wxFocusEvent &) { // The scrollbar indicates focus so repaint that RefreshRect(scrollbar->GetBounds(), false); diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp index 45786a519..0204c59e2 100644 --- a/aegisub/src/audio_karaoke.cpp +++ b/aegisub/src/audio_karaoke.cpp @@ -152,7 +152,7 @@ void AudioKaraoke::SetEnabled(bool en) { } } -void AudioKaraoke::OnPaint(wxPaintEvent &evt) { +void AudioKaraoke::OnPaint(wxPaintEvent &) { int w, h; split_area->GetClientSize(&w, &h); diff --git a/aegisub/src/audio_player.cpp b/aegisub/src/audio_player.cpp index 2d051026a..0ad7486bf 100644 --- a/aegisub/src/audio_player.cpp +++ b/aegisub/src/audio_player.cpp @@ -83,7 +83,7 @@ BEGIN_EVENT_TABLE(AudioPlayer, wxEvtHandler) EVT_COMMAND (1000, wxEVT_STOP_AUDIO, AudioPlayer::OnStopAudio) END_EVENT_TABLE() -void AudioPlayer::OnStopAudio(wxCommandEvent &event) { +void AudioPlayer::OnStopAudio(wxCommandEvent &) { Stop(false); } diff --git a/aegisub/src/audio_provider_dummy.cpp b/aegisub/src/audio_provider_dummy.cpp index 08b1c5ce7..0568d1fae 100644 --- a/aegisub/src/audio_provider_dummy.cpp +++ b/aegisub/src/audio_provider_dummy.cpp @@ -62,7 +62,7 @@ DummyAudioProvider::~DummyAudioProvider() { /// @param start /// @param count /// -void DummyAudioProvider::GetAudio(void *buf, int64_t start, int64_t count) const { +void DummyAudioProvider::GetAudio(void *buf, int64_t, int64_t count) const { short *workbuf = (short*)buf; if (noise) { diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index d9a34d388..e3083b9a0 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -171,7 +171,7 @@ namespace { }; #else struct LuaStackcheck { - void check_stack(int additional) { } + void check_stack(int) { } void dump() { } LuaStackcheck(lua_State*) { } }; diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index e12171aaa..61cead269 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -100,8 +100,8 @@ BaseGrid::BaseGrid(wxWindow* parent, agi::Context *context, const wxSize& size, , batch_active_line_changed(false) , seek_listener(context->videoController->AddSeekListener(std::tr1::bind(&BaseGrid::Refresh, this, false, (wxRect*)NULL))) , context_menu(0) -, context(context) , yPos(0) +, context(context) { scrollBar->SetScrollbar(0,10,100,10); @@ -429,7 +429,7 @@ wxArrayInt BaseGrid::GetSelection() const { } -void BaseGrid::OnPaint(wxPaintEvent &event) { +void BaseGrid::OnPaint(wxPaintEvent &) { // Get size and pos wxSize cs = GetClientSize(); cs.SetWidth(cs.GetWidth() - scrollBar->GetSize().GetWidth()); @@ -649,7 +649,7 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx } } -void BaseGrid::OnSize(wxSizeEvent &event) { +void BaseGrid::OnSize(wxSizeEvent &) { AdjustScrollbar(); SetColumnWidths(); Refresh(false); diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp index 47eb893ee..f7bc2acad 100644 --- a/aegisub/src/command/app.cpp +++ b/aegisub/src/command/app.cpp @@ -205,7 +205,7 @@ struct app_new_window : public Command { STR_DISP("New Window") STR_HELP("Open a new application window.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { RestartAegisub(); } }; @@ -235,11 +235,11 @@ struct app_toggle_global_hotkeys : public Command { STR_HELP("Toggle global hotkey overrides.") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Medusa Timing Hotkeys")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { agi::OptionValue *opt = OPT_SET("Audio/Medusa Timing Hotkeys"); opt->SetBool(!opt->GetBool()); } @@ -252,7 +252,7 @@ struct app_updates : public Command { STR_DISP("Check for Updates") STR_HELP("Check to see if there is a new version of Aegisub available.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { PerformVersionCheck(true); } }; diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp index 70510ec3e..c91d2e984 100644 --- a/aegisub/src/command/audio.cpp +++ b/aegisub/src/command/audio.cpp @@ -168,11 +168,11 @@ struct audio_view_spectrum : public Command { STR_HELP("Display audio as a frequency-power spectrograph.") CMD_TYPE(COMMAND_RADIO) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Spectrum")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Audio/Spectrum")->SetBool(true); } }; @@ -186,11 +186,11 @@ struct audio_view_waveform : public Command { STR_HELP("Display audio as a linear amplitude graph.") CMD_TYPE(COMMAND_RADIO) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return !OPT_GET("Audio/Spectrum")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Audio/Spectrum")->SetBool(false); } }; @@ -391,11 +391,11 @@ struct audio_autoscroll : public Command { STR_HELP("Auto scrolls audio display to selected line") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Auto/Scroll")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { toggle("Audio/Auto/Scroll"); } }; @@ -408,11 +408,11 @@ struct audio_autocommit : public Command { STR_HELP("Automatically commit all changes") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Auto/Commit")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { toggle("Audio/Auto/Commit"); } }; @@ -425,11 +425,11 @@ struct audio_autonext : public Command { STR_HELP("Auto goes to next line on commit") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Next Line on Commit")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { toggle("Audio/Next Line on Commit"); } }; @@ -442,11 +442,11 @@ struct audio_toggle_spectrum : public Command { STR_HELP("Spectrum analyzer mode") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Spectrum")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { toggle("Audio/Spectrum"); } }; @@ -459,11 +459,11 @@ struct audio_vertical_link : public Command { STR_HELP("Link vertical zoom and volume sliders") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Audio/Link")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { toggle("Audio/Link"); } }; diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp index c8c97767a..3cb257675 100644 --- a/aegisub/src/command/edit.cpp +++ b/aegisub/src/command/edit.cpp @@ -254,7 +254,7 @@ struct edit_line_paste : public Command { STR_HELP("Paste subtitles.") CMD_TYPE(COMMAND_VALIDATE) - bool Validate(const agi::Context *c) { + bool Validate(const agi::Context *) { if (wxTheClipboard->Open()) { bool can_paste = wxTheClipboard->IsSupported(wxDF_TEXT); wxTheClipboard->Close(); diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp index e064e7390..dc813574c 100644 --- a/aegisub/src/command/grid.cpp +++ b/aegisub/src/command/grid.cpp @@ -86,7 +86,7 @@ struct grid_tag_cycle_hiding : public Command { STR_DISP("Cycle Tag Hiding") STR_HELP("Cycle through tag hiding modes.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { int tagMode = OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt(); // Cycle to next @@ -113,11 +113,11 @@ struct grid_tags_hide : public Command { STR_HELP("Hide override tags in the subtitle grid.") CMD_TYPE(COMMAND_RADIO) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 2; } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(2); } }; @@ -131,11 +131,11 @@ struct grid_tags_show : public Command { STR_HELP("Show full override tags in the subtitle grid.") CMD_TYPE(COMMAND_RADIO) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 0; } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(0); } }; @@ -149,11 +149,11 @@ struct grid_tags_simplify : public Command { STR_HELP("Replace override tags in the subtitle grid with a simplified placeholder.") CMD_TYPE(COMMAND_RADIO) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 1; } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(1); } }; diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp index fdb5980cf..eae877b6d 100644 --- a/aegisub/src/command/help.cpp +++ b/aegisub/src/command/help.cpp @@ -84,7 +84,7 @@ struct help_contents : public Command { STR_DISP("Contents") STR_HELP("Help topics.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { HelpButton::OpenPage("Main"); } }; @@ -97,7 +97,7 @@ struct help_files : public Command { STR_DISP("All Files") STR_HELP("Resource files.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { char *shared_path = agi::util::OSX_GetBundleSharedSupportDirectory(); wxString help_path = wxString::Format("%s/doc", wxString(shared_path, wxConvUTF8)); agi::util::OSX_OpenLocation(help_path.c_str()); @@ -113,7 +113,7 @@ struct help_forums : public Command { STR_DISP("Forums") STR_HELP("Visit Aegisub's forums.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { AegisubApp::OpenURL("http://forum.aegisub.org/"); } }; @@ -126,7 +126,7 @@ struct help_irc : public Command { STR_DISP("IRC Channel") STR_HELP("Visit Aegisub's official IRC channel.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { AegisubApp::OpenURL("irc://irc.rizon.net/aegisub"); } }; @@ -138,7 +138,7 @@ struct help_video : public Command { STR_DISP("Visual Typesetting") STR_HELP("Open the manual page for Visual Typesetting.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { HelpButton::OpenPage("Visual Typesetting"); } }; @@ -150,7 +150,7 @@ struct help_website : public Command { STR_DISP("Website") STR_HELP("Visit Aegisub's official website.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { AegisubApp::OpenURL("http://www.aegisub.org/"); } }; diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp index 4d84c0eeb..e7babeb1c 100644 --- a/aegisub/src/command/tool.cpp +++ b/aegisub/src/command/tool.cpp @@ -72,7 +72,7 @@ struct tool_assdraw : public Command { STR_DISP("ASSDraw3") STR_HELP("Launch ASSDraw3 tool for vector drawing.") - void operator()(agi::Context *c) { + void operator()(agi::Context *) { wxExecute("\"" + StandardPaths::DecodePath("?data/ASSDraw3.exe") + "\""); } }; diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp index c4f06a5fd..6814769b0 100644 --- a/aegisub/src/command/video.cpp +++ b/aegisub/src/command/video.cpp @@ -622,11 +622,11 @@ struct video_opt_autoscroll : public Command { STR_HELP("Toggle autoscroll of video") CMD_TYPE(COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Video/Subtitle Sync")->GetBool(); } - void operator()(agi::Context *c) { + void operator()(agi::Context *) { OPT_SET("Video/Subtitle Sync")->SetBool(!OPT_GET("Video/Subtitle Sync")->GetBool()); } }; @@ -663,7 +663,7 @@ struct video_show_overscan : public validator_video_loaded { STR_HELP("Show a mask over the video, indicating areas that might get cropped off by overscan on televisions.") CMD_TYPE(COMMAND_VALIDATE | COMMAND_TOGGLE) - bool IsActive(const agi::Context *c) { + bool IsActive(const agi::Context *) { return OPT_GET("Video/Overscan Mask")->GetBool(); } diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp index 7b46ad693..6986d3823 100644 --- a/aegisub/src/dialog_attachments.cpp +++ b/aegisub/src/dialog_attachments.cpp @@ -197,7 +197,7 @@ END_EVENT_TABLE() /// @param event /// @return /// -void DialogAttachments::OnAttachFont(wxCommandEvent &event) { +void DialogAttachments::OnAttachFont(wxCommandEvent &) { // Pick files wxArrayString filenames; wxArrayString paths; @@ -235,7 +235,7 @@ void DialogAttachments::OnAttachFont(wxCommandEvent &event) { /// @param event /// @return /// -void DialogAttachments::OnAttachGraphics(wxCommandEvent &event) { +void DialogAttachments::OnAttachGraphics(wxCommandEvent &) { // Pick files wxArrayString filenames; wxArrayString paths; @@ -273,7 +273,7 @@ void DialogAttachments::OnAttachGraphics(wxCommandEvent &event) { /// @param event /// @return /// -void DialogAttachments::OnExtract(wxCommandEvent &event) { +void DialogAttachments::OnExtract(wxCommandEvent &) { // Check if there's a selection int i = listView->GetFirstSelected(); @@ -308,7 +308,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &event) { /// @brief Delete /// @param event /// -void DialogAttachments::OnDelete(wxCommandEvent &event) { +void DialogAttachments::OnDelete(wxCommandEvent &) { // Loop through items in list int i = listView->GetFirstSelected(); while (i != -1) { @@ -327,7 +327,7 @@ void DialogAttachments::OnDelete(wxCommandEvent &event) { /// @brief List selection changed /// @param event /// -void DialogAttachments::OnListClick(wxListEvent &event) { +void DialogAttachments::OnListClick(wxListEvent &) { // Check if any is selected bool hasSel = listView->GetFirstSelected() != -1; diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 43efc7133..026e1d7a5 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -314,7 +314,7 @@ void ColorPickerSpectrum::SetBackground(wxBitmap *new_background, bool force) wxDEFINE_EVENT(EVT_SPECTRUM_CHANGE, wxCommandEvent); -void ColorPickerSpectrum::OnPaint(wxPaintEvent &evt) +void ColorPickerSpectrum::OnPaint(wxPaintEvent &) { if (!background) return; @@ -494,7 +494,7 @@ void ColorPickerRecent::OnClick(wxMouseEvent &evt) } } -void ColorPickerRecent::OnPaint(wxPaintEvent &evt) +void ColorPickerRecent::OnPaint(wxPaintEvent &) { wxPaintDC pdc(this); PrepareDC(pdc); @@ -523,7 +523,7 @@ void ColorPickerRecent::OnPaint(wxPaintEvent &evt) pdc.DrawBitmap(background, 0, 0, false); } -void ColorPickerRecent::OnSize(wxSizeEvent &evt) +void ColorPickerRecent::OnSize(wxSizeEvent &) { background_valid = false; Refresh(); @@ -578,7 +578,7 @@ void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt) } } -void ColorPickerScreenDropper::OnPaint(wxPaintEvent &evt) +void ColorPickerScreenDropper::OnPaint(wxPaintEvent &) { wxPaintDC pdc(this); @@ -1129,14 +1129,14 @@ wxBitmap *DialogColorPicker::MakeSVSpectrum() return hsv_spectrum = new wxBitmap(spectrum_image); } -void DialogColorPicker::OnChangeMode(wxCommandEvent &evt) +void DialogColorPicker::OnChangeMode(wxCommandEvent &) { spectrum_dirty = true; OPT_SET("Tool/Colour Picker/Mode")->SetInt(colorspace_choice->GetSelection()); UpdateSpectrumDisplay(); } -void DialogColorPicker::OnSpectrumChange(wxCommandEvent &evt) +void DialogColorPicker::OnSpectrumChange(wxCommandEvent &) { int i = colorspace_choice->GetSelection(); switch (i) { diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp index aab3bad2a..c05152491 100644 --- a/aegisub/src/dialog_dummy_video.cpp +++ b/aegisub/src/dialog_dummy_video.cpp @@ -216,8 +216,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) UpdateLengthDisplay(); // Layout - main_sizer->SetSizeHints(this); - SetSizer(main_sizer); + SetSizerAndFit(main_sizer); CenterOnParent(); } @@ -242,7 +241,7 @@ END_EVENT_TABLE() /// @brief DOCME /// @param evt /// -void DialogDummyVideo::OnResolutionShortcut(wxCommandEvent &evt) +void DialogDummyVideo::OnResolutionShortcut(wxCommandEvent &) { int rs = resolution_shortcuts->GetSelection(); width->ChangeValue(wxString::Format("%d", resolutions[rs].width)); @@ -254,7 +253,7 @@ void DialogDummyVideo::OnResolutionShortcut(wxCommandEvent &evt) /// @brief DOCME /// @param evt /// -void DialogDummyVideo::OnFpsChange(wxCommandEvent &evt) +void DialogDummyVideo::OnFpsChange(wxCommandEvent &) { UpdateLengthDisplay(); } @@ -264,7 +263,7 @@ void DialogDummyVideo::OnFpsChange(wxCommandEvent &evt) /// @brief DOCME /// @param evt /// -void DialogDummyVideo::OnLengthSpin(wxSpinEvent &evt) +void DialogDummyVideo::OnLengthSpin(wxSpinEvent &) { UpdateLengthDisplay(); } @@ -274,7 +273,7 @@ void DialogDummyVideo::OnLengthSpin(wxSpinEvent &evt) /// @brief DOCME /// @param evt /// -void DialogDummyVideo::OnLengthChange(wxCommandEvent &evt) +void DialogDummyVideo::OnLengthChange(wxCommandEvent &) { UpdateLengthDisplay(); } diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp index 5fac3cffb..fd69a142b 100644 --- a/aegisub/src/dialog_kara_timing_copy.cpp +++ b/aegisub/src/dialog_kara_timing_copy.cpp @@ -193,7 +193,7 @@ int DrawBoxedText(wxDC &dc, const wxString &txt, int x, int y) } } -void KaraokeLineMatchDisplay::OnPaint(wxPaintEvent &event) +void KaraokeLineMatchDisplay::OnPaint(wxPaintEvent &) { wxPaintDC dc(this); @@ -731,7 +731,7 @@ BEGIN_EVENT_TABLE(DialogKanjiTimer,wxDialog) EVT_TEXT_ENTER(TEXT_DEST,DialogKanjiTimer::OnKeyEnter) END_EVENT_TABLE() -void DialogKanjiTimer::OnClose(wxCommandEvent &event) { +void DialogKanjiTimer::OnClose(wxCommandEvent &) { OPT_SET("Tool/Kanji Timer/Interpolation")->SetBool(Interpolate->IsChecked()); for (size_t i = 0; i < LinesToChange.size(); ++i) { @@ -745,7 +745,7 @@ void DialogKanjiTimer::OnClose(wxCommandEvent &event) { Close(); } -void DialogKanjiTimer::OnStart(wxCommandEvent &event) { +void DialogKanjiTimer::OnStart(wxCommandEvent &) { if (SourceStyle->GetValue().empty() || DestStyle->GetValue().empty()) wxMessageBox(_("Select source and destination styles first."),_("Error"),wxICON_EXCLAMATION | wxOK); else if (SourceStyle->GetValue() == DestStyle->GetValue()) @@ -758,30 +758,30 @@ void DialogKanjiTimer::OnStart(wxCommandEvent &event) { LinesToChange.clear(); } -void DialogKanjiTimer::OnLink(wxCommandEvent &event) { +void DialogKanjiTimer::OnLink(wxCommandEvent &) { if (display->AcceptMatch()) TryAutoMatch(); else wxBell(); } -void DialogKanjiTimer::OnUnlink(wxCommandEvent &event) { +void DialogKanjiTimer::OnUnlink(wxCommandEvent &) { if (!display->UndoMatch()) wxBell(); // Don't auto-match here, undoing sets the selection to the undone match } -void DialogKanjiTimer::OnSkipSource(wxCommandEvent &event) { +void DialogKanjiTimer::OnSkipSource(wxCommandEvent &) { currentSourceLine = FindNextStyleMatch(currentSourceLine, SourceStyle->GetValue()); ResetForNewLine(); } -void DialogKanjiTimer::OnSkipDest(wxCommandEvent &event) { +void DialogKanjiTimer::OnSkipDest(wxCommandEvent &) { currentDestinationLine = FindNextStyleMatch(currentDestinationLine, DestStyle->GetValue()); ResetForNewLine(); } -void DialogKanjiTimer::OnGoBack(wxCommandEvent &event) { +void DialogKanjiTimer::OnGoBack(wxCommandEvent &) { if (LinesToChange.size()) LinesToChange.pop_back(); //If we go back, then take out the modified line we saved. @@ -790,7 +790,7 @@ void DialogKanjiTimer::OnGoBack(wxCommandEvent &event) { ResetForNewLine(); } -void DialogKanjiTimer::OnAccept(wxCommandEvent &event) { +void DialogKanjiTimer::OnAccept(wxCommandEvent &) { if (display->GetRemainingSource() > 0) wxMessageBox(_("Group all of the source text."),_("Error"),wxICON_EXCLAMATION | wxOK); else { @@ -831,7 +831,7 @@ void DialogKanjiTimer::OnKeyDown(wxKeyEvent &event) { } } -void DialogKanjiTimer::OnKeyEnter(wxCommandEvent &event) { +void DialogKanjiTimer::OnKeyEnter(wxCommandEvent &) { wxCommandEvent evt; if (display->GetRemainingSource() == 0 && display->GetRemainingDestination() == 0) diff --git a/aegisub/src/dialog_progress.cpp b/aegisub/src/dialog_progress.cpp index a9c1f847a..958672363 100644 --- a/aegisub/src/dialog_progress.cpp +++ b/aegisub/src/dialog_progress.cpp @@ -192,11 +192,11 @@ void DialogProgress::OnSetProgress(wxThreadEvent &evt) { gauge->SetValue(mid(0, evt.GetPayload(), 100)); } -void DialogProgress::OnSetIndeterminate(wxThreadEvent &evt) { +void DialogProgress::OnSetIndeterminate(wxThreadEvent &) { pulse_timer.Start(1000); } -void DialogProgress::OnComplete(wxThreadEvent &evt) { +void DialogProgress::OnComplete(wxThreadEvent &) { pulse_timer.Stop(); // Unbind the cancel handler so that the default behavior happens (i.e. the @@ -225,7 +225,7 @@ void DialogProgress::OnLog(wxThreadEvent &evt) { log_output->SetInsertionPointEnd(); } -void DialogProgress::OnCancel(wxCommandEvent &evt) { +void DialogProgress::OnCancel(wxCommandEvent &) { ps->Cancel(); cancel_button->Enable(false); cancel_button->SetLabelText(_("Cancelling...")); diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp index 60298405f..67eea8db9 100644 --- a/aegisub/src/dialog_properties.cpp +++ b/aegisub/src/dialog_properties.cpp @@ -145,7 +145,7 @@ void DialogProperties::AddProperty(wxSizer *sizer, wxString const& label, wxStri properties.push_back(std::make_pair(property, ctrl)); } -void DialogProperties::OnOK(wxCommandEvent &event) { +void DialogProperties::OnOK(wxCommandEvent &) { int count = 0; for (size_t i = 0; i < properties.size(); ++i) count += SetInfoIfDifferent(properties[i].first, properties[i].second->GetValue()); @@ -170,7 +170,7 @@ int DialogProperties::SetInfoIfDifferent(wxString key,wxString value) { return 0; } -void DialogProperties::OnSetFromVideo(wxCommandEvent &event) { +void DialogProperties::OnSetFromVideo(wxCommandEvent &) { ResX->SetValue(wxString::Format("%d", c->videoController->GetWidth())); ResY->SetValue(wxString::Format("%d", c->videoController->GetHeight())); } diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp index 97b9f0819..bce2a90a6 100644 --- a/aegisub/src/dialog_resample.cpp +++ b/aegisub/src/dialog_resample.cpp @@ -164,7 +164,7 @@ void DialogResample::ResampleTags (wxString name,int n,AssOverrideParameter *cur /// @param _curDiag /// @return /// -void DialogResample::DoResampleTags (wxString name,int n,AssOverrideParameter *curParam,void *_curDiag) { +void DialogResample::DoResampleTags (wxString name,int n,AssOverrideParameter *curParam,void *) { double resizer = 1.0; bool isX = false; bool isY = false; @@ -226,7 +226,7 @@ void DialogResample::DoResampleTags (wxString name,int n,AssOverrideParameter *c /// @param event /// @return /// -void DialogResample::OnResample (wxCommandEvent &event) { +void DialogResample::OnResample (wxCommandEvent &) { int x1,y1; c->ass->GetResolution(x1,y1); long x2 = 0; @@ -332,7 +332,7 @@ void DialogResample::OnResample (wxCommandEvent &event) { /// @brief Get destination resolution from video /// @param event /// -void DialogResample::OnGetDestRes (wxCommandEvent &event) { +void DialogResample::OnGetDestRes (wxCommandEvent &) { ResX->SetValue(wxString::Format("%i",c->videoController->GetWidth())); ResY->SetValue(wxString::Format("%i",c->videoController->GetHeight())); } @@ -342,7 +342,7 @@ void DialogResample::OnGetDestRes (wxCommandEvent &event) { /// @brief Symmetrical checkbox clicked /// @param event /// -void DialogResample::OnSymmetrical (wxCommandEvent &event) { +void DialogResample::OnSymmetrical (wxCommandEvent &) { bool state = !MarginSymmetrical->IsChecked(); MarginRight->Enable(state); MarginBottom->Enable(state); diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp index cb06809f9..88516d4ce 100644 --- a/aegisub/src/dialog_search_replace.cpp +++ b/aegisub/src/dialog_search_replace.cpp @@ -246,7 +246,7 @@ void DialogSearchReplace::FindReplace(int mode) { /// @brief Find next /// @param event /// -void DialogSearchReplace::OnFindNext (wxCommandEvent &event) { +void DialogSearchReplace::OnFindNext (wxCommandEvent &) { FindReplace(0); } @@ -255,7 +255,7 @@ void DialogSearchReplace::OnFindNext (wxCommandEvent &event) { /// @brief Replace next /// @param event /// -void DialogSearchReplace::OnReplaceNext (wxCommandEvent &event) { +void DialogSearchReplace::OnReplaceNext (wxCommandEvent &) { FindReplace(1); } @@ -264,7 +264,7 @@ void DialogSearchReplace::OnReplaceNext (wxCommandEvent &event) { /// @brief Replace all /// @param event /// -void DialogSearchReplace::OnReplaceAll (wxCommandEvent &event) { +void DialogSearchReplace::OnReplaceAll (wxCommandEvent &) { FindReplace(2); } @@ -295,7 +295,7 @@ void DialogSearchReplace::UpdateDropDowns() { /// @brief DOCME /// @param event /// -void DialogSearchReplace::OnSetFocus (wxFocusEvent &event) { +void DialogSearchReplace::OnSetFocus (wxFocusEvent &) { Search.hasFocus = true; } @@ -303,7 +303,7 @@ void DialogSearchReplace::OnSetFocus (wxFocusEvent &event) { /// @brief DOCME /// @param event /// -void DialogSearchReplace::OnKillFocus (wxFocusEvent &event) { +void DialogSearchReplace::OnKillFocus (wxFocusEvent &) { Search.hasFocus = false; } diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp index c9c3677c8..c0bc2f09b 100644 --- a/aegisub/src/dialog_styling_assistant.cpp +++ b/aegisub/src/dialog_styling_assistant.cpp @@ -206,7 +206,7 @@ void DialogStyling::OnActivate(wxActivateEvent &) { style_name->SetFocus(); } -void DialogStyling::OnStyleBoxModified(wxCommandEvent &event) { +void DialogStyling::OnStyleBoxModified(wxCommandEvent &) { long from, to; style_name->GetSelection(&from, &to); wxString prefix = style_name->GetValue().Left(from).Lower(); diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp index 9d7ca9aa4..15f7479ad 100644 --- a/aegisub/src/dialog_text_import.cpp +++ b/aegisub/src/dialog_text_import.cpp @@ -83,7 +83,7 @@ DialogTextImport::~DialogTextImport() /// @brief DOCME /// @param event /// -void DialogTextImport::OnOK(wxCommandEvent &event) +void DialogTextImport::OnOK(wxCommandEvent &) { // Set options OPT_SET("Tool/Import/Text/Actor Separator")->SetString(STD_STR(edit_separator->GetValue())); @@ -92,20 +92,8 @@ void DialogTextImport::OnOK(wxCommandEvent &event) EndModal(wxID_OK); } - -/// @brief DOCME -/// @param event -/// -void DialogTextImport::OnCancel(wxCommandEvent &event) -{ - EndModal(wxID_CANCEL); -} - /////////////// // Event table BEGIN_EVENT_TABLE(DialogTextImport,wxDialog) EVT_BUTTON(wxID_OK,DialogTextImport::OnOK) - EVT_BUTTON(wxID_CANCEL,DialogTextImport::OnCancel) END_EVENT_TABLE() - - diff --git a/aegisub/src/dialog_version_check.cpp b/aegisub/src/dialog_version_check.cpp index 67ddc1245..0597b893b 100644 --- a/aegisub/src/dialog_version_check.cpp +++ b/aegisub/src/dialog_version_check.cpp @@ -532,13 +532,13 @@ VersionCheckerResultDialog::VersionCheckerResultDialog(const wxString &main_text } -void VersionCheckerResultDialog::OnCloseButton(wxCommandEvent &evt) +void VersionCheckerResultDialog::OnCloseButton(wxCommandEvent &) { Close(); } -void VersionCheckerResultDialog::OnRemindMeLater(wxCommandEvent &evt) +void VersionCheckerResultDialog::OnRemindMeLater(wxCommandEvent &) { // In one week time_t new_next_check_time = wxDateTime::Today().GetTicks() + 7*24*60*60; @@ -548,7 +548,7 @@ void VersionCheckerResultDialog::OnRemindMeLater(wxCommandEvent &evt) } -void VersionCheckerResultDialog::OnClose(wxCloseEvent &evt) +void VersionCheckerResultDialog::OnClose(wxCloseEvent &) { OPT_SET("App/Auto/Check For Updates")->SetBool(automatic_check_checkbox->GetValue()); Destroy(); diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index cf2c3addc..4cf0d0aab 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -581,7 +581,7 @@ void FrameMain::OnStatusClear(wxTimerEvent &) { SetStatusText("",1); } -void FrameMain::OnAudioOpen(AudioProvider *provider) { +void FrameMain::OnAudioOpen(AudioProvider *) { SetDisplayMode(-1, 1); } diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp index d0e3e6022..4e80ac74a 100644 --- a/aegisub/src/hotkey_data_view_model.cpp +++ b/aegisub/src/hotkey_data_view_model.cpp @@ -84,7 +84,7 @@ public: hk_map->insert(make_pair(combo.CmdName(), combo)); } - unsigned int GetChildren(wxDataViewItemArray &children) const { return 0; } + unsigned int GetChildren(wxDataViewItemArray &) const { return 0; } wxDataViewItem GetParent() const { return wxDataViewItem(parent); } bool IsContainer() const { return false; } @@ -195,7 +195,7 @@ public: wxDataViewItem GetParent() const { return wxDataViewItem(0); } bool IsContainer() const { return true; } - bool SetValue(wxVariant const& variant, unsigned int col) { return false; } + bool SetValue(wxVariant const&, unsigned int) { return false; } void GetValue(wxVariant &variant, unsigned int col) const { if (col == 1) variant << wxDataViewIconText(name); @@ -250,8 +250,8 @@ public: wxDataViewItem GetParent() const { return wxDataViewItem(0); } bool IsContainer() const { return true; } - bool SetValue(wxVariant const& variant, unsigned int col) { return false; } - void GetValue(wxVariant &variant, unsigned int col) const { } + bool SetValue(wxVariant const&, unsigned int) { return false; } + void GetValue(wxVariant &, unsigned int) const { } unsigned int GetChildren(wxDataViewItemArray &out) const { out.reserve(categories.size()); diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp index 4e29b5498..bfdcd9e27 100644 --- a/aegisub/src/preferences.cpp +++ b/aegisub/src/preferences.cpp @@ -358,7 +358,7 @@ void Interface_Hotkeys::OnUpdateFilter(wxCommandEvent&) { } } -void Interface_Hotkeys::OnClearFilter(wxCommandEvent &evt) { +void Interface_Hotkeys::OnClearFilter(wxCommandEvent &) { quick_search->SetValue(""); } @@ -525,7 +525,7 @@ void Preferences::OnOK(wxCommandEvent &event) { EndModal(0); } -void Preferences::OnApply(wxCommandEvent &event) { +void Preferences::OnApply(wxCommandEvent &) { for (std::map::iterator cur = pending_changes.begin(); cur != pending_changes.end(); ++cur) { agi::OptionValue *opt = OPT_SET(cur->first); switch (opt->GetType()) { diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index d277ba62e..9d3e85894 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -672,7 +672,7 @@ void SubsEditBox::OnEffectChange(wxCommandEvent &) { SetSelectedRows(&AssDialogue::Effect, Effect->GetValue(), _("effect change"), AssFile::COMMIT_DIAG_META); } -void SubsEditBox::OnCommentChange(wxCommandEvent &event) { +void SubsEditBox::OnCommentChange(wxCommandEvent &) { SetSelectedRows(&AssDialogue::Comment, CommentBox->GetValue(), _("comment change"), AssFile::COMMIT_DIAG_META); } diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp index 6ab4c0d62..aadd5ebb8 100644 --- a/aegisub/src/subs_grid.cpp +++ b/aegisub/src/subs_grid.cpp @@ -307,7 +307,7 @@ void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) { entryIter before_first = std::find_if(context->ass->Line.begin(), context->ass->Line.end(), cast()); --before_first; int row = -1; - int deleted = 0; + size_t deleted = 0; for (entryIter cur = context->ass->Line.begin(); cur != context->ass->Line.end();) { if (dynamic_cast(*cur) && ++row == target[deleted]) { cur = context->ass->Line.erase(cur); diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp index d81454ad9..5934bead7 100644 --- a/aegisub/src/timeedit_ctrl.cpp +++ b/aegisub/src/timeedit_ctrl.cpp @@ -259,7 +259,7 @@ void TimeEdit::OnKeyDown(wxKeyEvent &event) { /// @brief Mouse event /// @param event -void TimeEdit::OnContextMenu(wxContextMenuEvent &event) { +void TimeEdit::OnContextMenu(wxContextMenuEvent &) { if (!byFrame && OPT_GET("Subtitle/Time Edit/Insert Mode")->GetBool()) { wxMenu menu; menu.Append(Time_Edit_Copy,_("&Copy")); diff --git a/aegisub/src/validators.cpp b/aegisub/src/validators.cpp index 401d08626..9c9721a11 100644 --- a/aegisub/src/validators.cpp +++ b/aegisub/src/validators.cpp @@ -76,7 +76,7 @@ wxObject* NumValidator::Clone() const { return new NumValidator(*this); } -bool NumValidator::Validate(wxWindow* parent) { +bool NumValidator::Validate(wxWindow*) { wxTextCtrl *ctrl = (wxTextCtrl*) GetWindow(); wxString value = ctrl->GetValue(); diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp index 84eebd738..3b17d24ae 100644 --- a/aegisub/src/video_slider.cpp +++ b/aegisub/src/video_slider.cpp @@ -162,7 +162,7 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) { } } -void VideoSlider::OnPaint(wxPaintEvent &event) { +void VideoSlider::OnPaint(wxPaintEvent &) { wxPaintDC dc(this); DrawImage(dc); } @@ -259,6 +259,6 @@ void VideoSlider::DrawImage(wxDC &destdc) { destdc.Blit(0,0,w,h,&dc,0,0); } -void VideoSlider::OnFocus(wxFocusEvent &event) { +void VideoSlider::OnFocus(wxFocusEvent &) { Refresh(false); } diff --git a/aegisub/src/video_slider.h b/aegisub/src/video_slider.h index 45862dd0c..68a2bd70c 100644 --- a/aegisub/src/video_slider.h +++ b/aegisub/src/video_slider.h @@ -78,7 +78,7 @@ class VideoSlider: public wxWindow { void OnKeyDown(wxKeyEvent &event); void OnPaint(wxPaintEvent &event); void OnFocus(wxFocusEvent &event); - void OnEraseBackground(wxEraseEvent &event) {} + void OnEraseBackground(wxEraseEvent &) {} public: VideoSlider(wxWindow* parent, agi::Context *c); diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h index 1eadadd13..f86a3dee0 100644 --- a/aegisub/src/visual_tool.h +++ b/aegisub/src/visual_tool.h @@ -70,7 +70,7 @@ class VisualToolBase : protected SelectionListener { // SubtitleSelectionListener implementation void OnActiveLineChanged(AssDialogue *new_line); - void OnSelectedSetChanged(const Selection &lines_added, const Selection &lines_removed) { } + void OnSelectedSetChanged(const Selection &, const Selection &) { } // Below here are the virtuals that must be implemented @@ -153,7 +153,7 @@ public: virtual void OnMouseEvent(wxMouseEvent &event)=0; virtual void Draw()=0; virtual void SetDisplayArea(int x, int y, int w, int h); - virtual void SetToolbar(wxToolBar *tb) { } + virtual void SetToolbar(wxToolBar *) { } virtual ~VisualToolBase(); };