From 759b8433c181ccc27e99ef8f64bcc2f627406561 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 10 Mar 2012 02:16:08 +0000 Subject: [PATCH] Silence some clang warnings Originally committed to SVN as r6558. --- aegisub/libaegisub/windows/util_win.cpp | 1 - aegisub/src/ass_dialogue.cpp | 4 +--- aegisub/src/ass_dialogue.h | 2 +- aegisub/src/ass_style.cpp | 7 +++---- aegisub/src/auto4_lua_progresssink.cpp | 5 ----- aegisub/src/dialog_dummy_video.cpp | 3 +-- aegisub/src/dialog_resample.cpp | 4 ++-- aegisub/src/dialog_style_manager.cpp | 2 +- aegisub/src/frame_main.cpp | 2 +- aegisub/src/hotkey.cpp | 2 +- aegisub/src/spellchecker.cpp | 2 +- aegisub/src/subtitle_format_ttxt.cpp | 2 +- aegisub/src/subtitles_provider.cpp | 3 +-- aegisub/src/video_provider_dummy.cpp | 4 ++-- 14 files changed, 16 insertions(+), 27 deletions(-) diff --git a/aegisub/libaegisub/windows/util_win.cpp b/aegisub/libaegisub/windows/util_win.cpp index d10eb5261..53b833aae 100644 --- a/aegisub/libaegisub/windows/util_win.cpp +++ b/aegisub/libaegisub/windows/util_win.cpp @@ -88,7 +88,6 @@ void time_log(agi_timeval &tv) { // Initialize the present time to 0 and the timezone to UTC unsigned __int64 tmpres = 0; - static int tzflag = 0; GetSystemTimeAsFileTime(&ft); diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp index cc699fb68..49cbe865d 100644 --- a/aegisub/src/ass_dialogue.cpp +++ b/aegisub/src/ass_dialogue.cpp @@ -300,9 +300,7 @@ void AssDialogue::ParseASSTags() { } // Drawing else { - AssDialogueBlockDrawing *block = new AssDialogueBlockDrawing(work); - block->Scale = drawingLevel; - Blocks.push_back(block); + Blocks.push_back(new AssDialogueBlockDrawing(work, drawingLevel)); } } } diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h index ae4346b0b..784fbd7a3 100644 --- a/aegisub/src/ass_dialogue.h +++ b/aegisub/src/ass_dialogue.h @@ -109,7 +109,7 @@ public: int Scale; ASS_BlockType GetType() { return BLOCK_DRAWING; } - AssDialogueBlockDrawing(wxString const& text = wxString()) : AssDialogueBlock(text) { } + AssDialogueBlockDrawing(wxString const& text, int scale) : AssDialogueBlock(text), Scale(scale) { } void TransformCoords(int trans_x,int trans_y,double mult_x,double mult_y); }; diff --git a/aegisub/src/ass_style.cpp b/aegisub/src/ass_style.cpp index 830fbd2f3..d6681b02c 100644 --- a/aegisub/src/ass_style.cpp +++ b/aegisub/src/ass_style.cpp @@ -57,10 +57,9 @@ AssColor::AssColor(int r, int g, int b, int a) { } -/// @brief DOCME -/// @param color -/// -AssColor::AssColor (const wxColour &color) { +AssColor::AssColor(const wxColour &color) +: a(0) +{ SetWXColor(color); } diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/aegisub/src/auto4_lua_progresssink.cpp index c3c38e5f2..cf85ed980 100644 --- a/aegisub/src/auto4_lua_progresssink.cpp +++ b/aegisub/src/auto4_lua_progresssink.cpp @@ -65,11 +65,6 @@ namespace { lua_setfield(L, idx, name); } - inline wxString get_wxstring(lua_State *L, int idx) - { - return wxString(lua_tostring(L, idx), wxConvUTF8); - } - inline wxString check_wxstring(lua_State *L, int idx) { return wxString(luaL_checkstring(L, idx), wxConvUTF8); diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp index d279fc243..c50ad9577 100644 --- a/aegisub/src/dialog_dummy_video.cpp +++ b/aegisub/src/dialog_dummy_video.cpp @@ -300,11 +300,10 @@ void DialogDummyVideo::OnLengthChange(wxCommandEvent &) void DialogDummyVideo::UpdateLengthDisplay() { double fpsval; - int lengthval = 0; if (!length_display) return; bool valid = false; if (fps->GetValue().ToDouble(&fpsval)) { - lengthval = length->GetValue(); + int lengthval = length->GetValue(); if (lengthval && fpsval > 0 && lengthval > 0) { valid = true; int tt = int(lengthval / fpsval * 1000); // frames / (frames/seconds) * 1000 = milliseconds diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp index da5dbfdb3..645414e1b 100644 --- a/aegisub/src/dialog_resample.cpp +++ b/aegisub/src/dialog_resample.cpp @@ -194,7 +194,7 @@ void DialogResample::DoResampleTags (wxString name,int n,AssOverrideParameter *c case PARCLASS_DRAWING: { - AssDialogueBlockDrawing block(curParam->Get()); + AssDialogueBlockDrawing block(curParam->Get(), 1); block.TransformCoords(m[0],m[2],rx,ry); curParam->Set(block.GetText()); } @@ -296,7 +296,7 @@ void DialogResample::OnResample (wxCommandEvent &) { catch (const char *err) { wxLogMessage(err); } - catch (wxString err) { + catch (wxString const& err) { wxLogMessage(err); } } diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp index 356fc3c49..9477b78d8 100644 --- a/aegisub/src/dialog_style_manager.cpp +++ b/aegisub/src/dialog_style_manager.cpp @@ -172,7 +172,7 @@ DialogStyleManager::DialogStyleManager(agi::Context *context) // Catalog wxSizer *CatalogBox = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Catalog of available storages")); - CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, NULL, wxCB_READONLY | wxCB_READONLY, wxDefaultValidator, "Catalog List"); + CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, NULL, wxCB_READONLY); wxButton *CatalogNew = new wxButton(this, -1, _("New")); CatalogDelete = new wxButton(this, -1, _("Delete")); CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT | wxALIGN_RIGHT,5); diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 00ecbbec2..c9bd8e4d6 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -335,7 +335,7 @@ void FrameMain::LoadSubtitles(wxString filename,wxString charset) { wxMessageBox(wxString(err), "Error", wxOK | wxICON_ERROR, NULL); return; } - catch (wxString err) { + catch (wxString const& err) { wxMessageBox(err, "Error", wxOK | wxICON_ERROR, NULL); return; } diff --git a/aegisub/src/hotkey.cpp b/aegisub/src/hotkey.cpp index f9856ead9..0a5ae74a1 100644 --- a/aegisub/src/hotkey.cpp +++ b/aegisub/src/hotkey.cpp @@ -46,7 +46,7 @@ namespace { { "grid/move/up", "Default", "Alt", "Up" }, { "grid/line/next/create", "Subtitle Edit Box", "Enter", 0 }, { "grid/line/next/create", "Subtitle Edit Box", "KP_Enter", 0 }, - 0 + { 0 } }; void migrate_hotkeys(const char *removed[], const char *added[][4]) { diff --git a/aegisub/src/spellchecker.cpp b/aegisub/src/spellchecker.cpp index 98780c66f..0fac12caa 100644 --- a/aegisub/src/spellchecker.cpp +++ b/aegisub/src/spellchecker.cpp @@ -59,7 +59,7 @@ SpellChecker *SpellCheckerFactory::GetSpellChecker() { SpellChecker *checker = Create(list[i]); if (checker) return checker; } - catch (wxString err) { error += list[i] + " factory: " + err + "\n"; } + catch (wxString const& err) { error += list[i] + " factory: " + err + "\n"; } catch (const char *err) { error += list[i] + " factory: " + wxString(err) + "\n"; } catch (...) { error += list[i] + " factory: Unknown error\n"; } } diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/aegisub/src/subtitle_format_ttxt.cpp index 5e3404456..2ada5ba95 100644 --- a/aegisub/src/subtitle_format_ttxt.cpp +++ b/aegisub/src/subtitle_format_ttxt.cpp @@ -91,7 +91,7 @@ void TTXTSubtitleFormat::ReadFile(AssFile *target, wxString const& filename, wxS for (wxXmlNode *child = doc.GetRoot()->GetChildren(); child; child = child->GetNext()) { // Line if (child->GetName() == "TextSample") { - if (diag = ProcessLine(child, diag, version)) { + if ((diag = ProcessLine(child, diag, version))) { lines++; target->Line.push_back(diag); } diff --git a/aegisub/src/subtitles_provider.cpp b/aegisub/src/subtitles_provider.cpp index ec8d4286b..59fcc4b35 100644 --- a/aegisub/src/subtitles_provider.cpp +++ b/aegisub/src/subtitles_provider.cpp @@ -60,13 +60,12 @@ SubtitlesProvider* SubtitlesProviderFactory::GetProvider() { for (unsigned int i=0;i