Fix a bunch of -pedantic stuff

Originally committed to SVN as r6181.

aegisub/libaegisub/common/cajun/elements.cpp

@@ -101,13 +101,13 @@ UnknownElement::~UnknownElement() { delete m_pImp; }
 	UnknownElement::operator Type const&() const { return CastTo<Type>(); } \
 	UnknownElement::operator Type&() { return CastTo<Type>(); }
 
-DEFINE_UE_TYPE(Object);
-DEFINE_UE_TYPE(Array);
-DEFINE_UE_TYPE(Integer);
-DEFINE_UE_TYPE(Double);
-DEFINE_UE_TYPE(Boolean);
-DEFINE_UE_TYPE(String);
-DEFINE_UE_TYPE(Null);
+DEFINE_UE_TYPE(Object)
+DEFINE_UE_TYPE(Array)
+DEFINE_UE_TYPE(Integer)
+DEFINE_UE_TYPE(Double)
+DEFINE_UE_TYPE(Boolean)
+DEFINE_UE_TYPE(String)
+DEFINE_UE_TYPE(Null)
 
 UnknownElement& UnknownElement::operator =(const UnknownElement& unknown)
 {

aegisub/libaegisub/common/vfr.cpp

@@ -74,7 +74,6 @@ struct TimecodeRange {
 	int start;
 	int end;
 	double fps;
-	double time;
 	bool operator<(TimecodeRange cmp) {
 		return start < cmp.start;
 	}

aegisub/libaegisub/include/libaegisub/option.h

@@ -56,7 +56,7 @@ public:
 	/// Options class settings.
 	enum OptionSetting {
 		NONE       = 0x000,		///< Do nothing (default)
-		FLUSH_SKIP = 0x001,		///< Skip writing the config file to disk
+		FLUSH_SKIP = 0x001		///< Skip writing the config file to disk
 	};
 
 private:

aegisub/libaegisub/include/libaegisub/option_value.h

@@ -114,7 +114,7 @@ public:
 	virtual std::vector<bool> const& GetDefaultListBool() const { throw ListTypeError("string"); }
 
 
-	DEFINE_SIGNAL_ADDERS(ValueChanged, Subscribe);
+	DEFINE_SIGNAL_ADDERS(ValueChanged, Subscribe)
 };
 
 #define CONFIG_OPTIONVALUE(type_name, type)                                                   \

aegisub/reporter/platform.cpp

@@ -113,19 +113,19 @@ std::string Platform::GetVideoInfo(enum Platform::VideoInfo which) {
 
 std::string Platform::ArchName() {
 	return std::string(plat.GetArchName());
-};
+}
 
 std::string Platform::OSFamily() {
 	return std::string(plat.GetOperatingSystemFamilyName());
-};
+}
 
 std::string Platform::OSName() {
 	return std::string(plat.GetOperatingSystemIdName());
-};
+}
 
 std::string Platform::Endian() {
 	return std::string(plat.GetEndiannessName());
-};
+}
 
 
 int Platform::DisplayDepth() {

aegisub/reporter/platform_unix_bsd.cpp

@@ -37,38 +37,38 @@ std::string PlatformUnixBSD::CPUId() {
 	size_t len = sizeof(id);
 	sysctlbyname("hw.model", &id, &len, NULL, 0);
 	return id;
-};
+}
 
 std::string PlatformUnixBSD::CPUSpeed() {
 	return "";
-};
+}
 
 int PlatformUnixBSD::CPUCores() {
 	return 0;
-};
+}
 
 int PlatformUnixBSD::CPUCount() {
 	int proc;
 	size_t len = sizeof(proc);
 	sysctlbyname("hw.ncpu", &proc, &len, NULL, 0);
 	return proc;
-};
+}
 
 std::string PlatformUnixBSD::CPUFeatures() {
 	return "";
-};
+}
 
 std::string PlatformUnixBSD::CPUFeatures2() {
 	return "";
-};
+}
 
 uint64_t PlatformUnixBSD::Memory() {
 	uint64_t memory;
 	size_t len = sizeof(memory);
 	sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
 	return memory;
-};
+}
 
 std::string PlatformUnixBSD::UnixLibraries() {
 	return "";
-};
+}

aegisub/src/aegisub_endian.h

@@ -444,4 +444,4 @@ namespace Endian {
 	}
 
 #endif
-};
+}

aegisub/src/ass_file.h

@@ -194,7 +194,7 @@ public:
 		COMMIT_DIAG_TIME   = 0x40,
 		/// The text of existing dialogue lines have changed
 		COMMIT_DIAG_TEXT   = 0x80,
-		COMMIT_DIAG_FULL   = COMMIT_DIAG_META | COMMIT_DIAG_TIME | COMMIT_DIAG_TEXT,
+		COMMIT_DIAG_FULL   = COMMIT_DIAG_META | COMMIT_DIAG_TIME | COMMIT_DIAG_TEXT
 	};
 
 	DEFINE_SIGNAL_ADDERS(AnnounceCommit, AddCommitListener)

aegisub/src/audio_box.cpp

@@ -74,7 +74,7 @@
 enum {
 	Audio_Horizontal_Zoom = 1600,
 	Audio_Vertical_Zoom,
-	Audio_Volume,
+	Audio_Volume
 };
 
 AudioBox::AudioBox(wxWindow *parent, agi::Context *context)
@@ -144,7 +144,7 @@ BEGIN_EVENT_TABLE(AudioBox,wxSashWindow)
 	EVT_COMMAND_SCROLL(Audio_Horizontal_Zoom, AudioBox::OnHorizontalZoom)
 	EVT_COMMAND_SCROLL(Audio_Vertical_Zoom, AudioBox::OnVerticalZoom)
 	EVT_COMMAND_SCROLL(Audio_Volume, AudioBox::OnVolume)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 void AudioBox::OnMouseWheel(wxMouseEvent &evt) {
 	if (!ForwardMouseWheelEvent(audioDisplay, evt))

aegisub/src/audio_controller.h

@@ -445,6 +445,6 @@ public:
 };
 
 namespace agi {
-	DEFINE_BASE_EXCEPTION(AudioControllerError, Exception);
-	DEFINE_SIMPLE_EXCEPTION(AudioOpenError, AudioControllerError, "audio_controller/open_failed");
-};
+	DEFINE_BASE_EXCEPTION(AudioControllerError, Exception)
+	DEFINE_SIMPLE_EXCEPTION(AudioOpenError, AudioControllerError, "audio_controller/open_failed")
+}

aegisub/src/audio_display.cpp

@@ -853,7 +853,7 @@ BEGIN_EVENT_TABLE(AudioDisplay, wxWindow)
 	EVT_SET_FOCUS(AudioDisplay::OnFocus)
 	EVT_KILL_FOCUS(AudioDisplay::OnFocus)
 	EVT_KEY_DOWN(AudioDisplay::OnKeyDown)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 
 void AudioDisplay::OnPaint(wxPaintEvent&)

aegisub/src/audio_karaoke.cpp

@@ -59,7 +59,7 @@ static inline size_t last_lt_or_eq(Container const& c, Value const& v) {
 	if (it == c.end() || *it > v)
 		--it;
 	return distance(c.begin(), it);
-};
+}
 
 AudioKaraoke::AudioKaraoke(wxWindow *parent, agi::Context *c)
 : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_SUNKEN)

aegisub/src/audio_player_oss.cpp

@@ -205,7 +205,7 @@ void OSSPlayer::SetEndPosition(int64_t pos)
 {
     end_frame = pos;
 
-    if (end_frame <= GetCurrentPosition()) {
+    if (pos <= GetCurrentPosition()) {
         ioctl(dspdev, SNDCTL_DSP_RESET, NULL);
         if (thread && thread->IsAlive())
             thread->Delete();

aegisub/src/auto4_base.cpp

@@ -595,4 +595,4 @@ namespace Automation4 {
 	: Script(filename)
 	{
 	}
-};
+}

aegisub/src/auto4_base.h

@@ -320,4 +320,4 @@ namespace Automation4 {
 		std::vector<ExportFilter*> GetFilters() const { return std::vector<ExportFilter*>(); }
 		std::vector<SubtitleFormat*> GetFormats() const { return std::vector<SubtitleFormat*>(); }
 	};
-};
+}

aegisub/src/auto4_lua.cpp

@@ -515,7 +515,6 @@ namespace Automation4 {
 
 	int LuaScript::LuaDecodePath(lua_State *L)
 	{
-		const agi::Context *c = get_context(L);
 		wxString path = check_wxstring(L, 1);
 		lua_pop(L, 1);
 		lua_pushstring(L, StandardPaths::DecodePath(path).utf8_str());

aegisub/src/auto4_lua.h

@@ -335,4 +335,4 @@ namespace Automation4 {
 		std::vector<ExportFilter*> GetFilters() const { return filters; }
 		std::vector<SubtitleFormat*> GetFormats() const { return std::vector<SubtitleFormat*>(); }
 	};
-};
+}

aegisub/src/auto4_lua_assfile.cpp

@@ -732,6 +732,6 @@ namespace Automation4 {
 
 		// Leaves userdata object on stack
 	}
-};
+}
 
 #endif // WITH_AUTO4_LUA

aegisub/src/auto4_lua_dialog.cpp

@@ -460,7 +460,7 @@ namespace Automation4 {
 				lua_pushboolean(L, value);
 			}
 		};
-	};
+	}
 
 	// LuaDialog
 	LuaDialog::LuaDialog(lua_State *L, bool include_buttons)
@@ -670,6 +670,6 @@ namespace Automation4 {
 		LOG_D("automation/lua/dialog") << "button_pushed set to: " << button_pushed;
 		evt.Skip();
 	}
-};
+}
 
 #endif // WITH_AUTO4_LUA

aegisub/src/auto4_lua_factory.h

@@ -47,4 +47,4 @@ namespace Automation4 {
 	public:
 		LuaScriptFactory();
 	};
-};
+}

aegisub/src/auto4_lua_scriptreader.cpp

@@ -63,6 +63,6 @@ namespace Automation4 {
 	const char* LuaScriptReader::reader_func(lua_State *, void *data, size_t *size) {
 		return static_cast<LuaScriptReader*>(data)->Read(size);
 	}
-};
+}
 
 #endif // WITH_AUTO4_LUA

aegisub/src/auto4_lua_scriptreader.h

@@ -42,4 +42,4 @@ namespace Automation4 {
 
 		static const char* reader_func(lua_State *, void *data, size_t *size);
 	};
-};
+}

aegisub/src/base_grid.cpp

@@ -151,7 +151,7 @@ BEGIN_EVENT_TABLE(BaseGrid,wxWindow)
 	EVT_MOUSE_EVENTS(BaseGrid::OnMouseEvent)
 	EVT_KEY_DOWN(BaseGrid::OnKeyDown)
 	EVT_MENU_RANGE(MENU_SHOW_COL,MENU_SHOW_COL+15,BaseGrid::OnShowColMenu)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 void BaseGrid::OnSubtitlesCommit(int type) {
 	if (type == AssFile::COMMIT_NEW)
@@ -221,7 +221,7 @@ void BaseGrid::UpdateStyle() {
 
 	// Set column widths
 	std::vector<bool> column_array(OPT_GET("Subtitle/Grid/Column")->GetListBool());
-	assert(column_array.size() == columns);
+	assert(column_array.size() == (size_t)columns);
 	for (int i = 0; i < columns; ++i) showCol[i] = column_array[i];
 	SetColumnWidths();
 
@@ -806,7 +806,7 @@ void BaseGrid::OnContextMenu(wxContextMenuEvent &evt) {
 		};
 
 		wxMenu menu;
-		for (size_t i = 0; i < columns; ++i)
+		for (int i = 0; i < columns; ++i)
 			menu.Append(MENU_SHOW_COL + i, strings[i], "", wxITEM_CHECK)->Check(showCol[i]);
 		PopupMenu(&menu);
 	}

aegisub/src/dialog_attachments.cpp

@@ -126,7 +126,7 @@ BEGIN_EVENT_TABLE(DialogAttachments,wxDialog)
 	EVT_LIST_ITEM_SELECTED(ATTACHMENT_LIST,DialogAttachments::OnListClick)
 	EVT_LIST_ITEM_DESELECTED(ATTACHMENT_LIST,DialogAttachments::OnListClick)
 	EVT_LIST_ITEM_FOCUSED(ATTACHMENT_LIST,DialogAttachments::OnListClick)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 void DialogAttachments::AttachFile(wxFileDialog &diag, wxString const& group, wxString const& commit_msg) {
 	if (diag.ShowModal() == wxID_CANCEL) return;

aegisub/src/dialog_automation.h

@@ -48,7 +48,7 @@ namespace Automation4 {
 	class ScriptManager;
 	class AutoloadScriptManager;
 	class Script;
-};
+}
 
 namespace agi { struct Context; }
 

aegisub/src/dialog_dummy_video.h

@@ -114,5 +114,5 @@ enum {
 	Dummy_Video_FPS,
 
 	/// DOCME
-	Dummy_Video_Length,
+	Dummy_Video_Length
 };

aegisub/src/dialog_text_import.h

@@ -77,5 +77,5 @@ enum {
 	EDIT_ACTOR_SEPARATOR = 1480,
 
 	/// DOCME
-	EDIT_COMMENT_STARTER,
+	EDIT_COMMENT_STARTER
 };

aegisub/src/hotkey_data_view_model.cpp

@@ -47,6 +47,8 @@ using namespace agi::hotkey;
 /// @class HotkeyModelItem
 /// @brief A base class for things exposed by HotkeyDataViewModel
 class HotkeyModelItem {
+	protected:
+		~HotkeyModelItem() { }
 public:
 	virtual unsigned int GetChildren(wxDataViewItemArray &children) const=0;
 	virtual wxDataViewItem GetParent() const=0;

aegisub/src/include/aegisub/audio_provider.h

@@ -103,8 +103,8 @@ public:
 	static AudioProvider *GetProvider(wxString filename, int cache=-1);
 };
 
-DEFINE_BASE_EXCEPTION_NOINNER(AudioProviderError, agi::Exception);
-DEFINE_SIMPLE_EXCEPTION_NOINNER(AudioOpenError, AudioProviderError, "audio/open/failed");
+DEFINE_BASE_EXCEPTION_NOINNER(AudioProviderError, agi::Exception)
+DEFINE_SIMPLE_EXCEPTION_NOINNER(AudioOpenError, AudioProviderError, "audio/open/failed")
 
 /// Error of some sort occurred while decoding a frame
-DEFINE_SIMPLE_EXCEPTION_NOINNER(AudioDecodeError, AudioProviderError, "audio/error");
+DEFINE_SIMPLE_EXCEPTION_NOINNER(AudioDecodeError, AudioProviderError, "audio/error")

aegisub/src/include/aegisub/video_provider.h

@@ -71,11 +71,11 @@ public:
 	virtual bool WantsCaching() const { return false; }
 };
 
-DEFINE_BASE_EXCEPTION_NOINNER(VideoProviderError, agi::Exception);
+DEFINE_BASE_EXCEPTION_NOINNER(VideoProviderError, agi::Exception)
 /// File could be opened, but is not a supported format
-DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoNotSupported, VideoProviderError, "video/open/notsupported");
+DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoNotSupported, VideoProviderError, "video/open/notsupported")
 /// File appears to be a supported format, but could not be opened
-DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoOpenError, VideoProviderError, "video/open/failed");
+DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoOpenError, VideoProviderError, "video/open/failed")
 
 /// Error of some sort occurred while decoding a frame
-DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoDecodeError, VideoProviderError, "video/error");
+DEFINE_SIMPLE_EXCEPTION_NOINNER(VideoDecodeError, VideoProviderError, "video/error")

aegisub/src/subtitle_format_srt.cpp

@@ -71,7 +71,7 @@ class SrtTagParser {
 		TAG_STRIKEOUT_OPEN,
 		TAG_STRIKEOUT_CLOSE,
 		TAG_FONT_OPEN,
-		TAG_FONT_CLOSE,
+		TAG_FONT_CLOSE
 	};
 
 	wxRegEx tag_matcher;

aegisub/src/threaded_frame_source.cpp

@@ -90,7 +90,8 @@ std::tr1::shared_ptr<AegiVideoFrame> ThreadedFrameSource::ProcFrame(int frameNum
 					// This will crash if any of the export filters try to use
 					// anything but the subtitles, but that wouldn't be safe to
 					// do anyway
-					agi::Context c = { 0 };
+					agi::Context c;
+					memset(&c, 0, sizeof c);
 					c.ass = subs.get();
 
 					AssExporter exporter(&c);

aegisub/src/validators.h

@@ -90,5 +90,5 @@ public:
 	/// Copy constructor
 	NumValidator(const NumValidator& from);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 };

aegisub/src/video_provider_yuv4mpeg.h

@@ -66,7 +66,7 @@ class YUV4MPEGVideoProvider : public VideoProvider {
 		Y4M_PIXFMT_444,			/// 4:4:4, i.e. no chroma subsampling
 		Y4M_PIXFMT_444ALPHA,	/// 4:4:4 plus alpha channel
 
-		Y4M_PIXFMT_MONO,		/// luma only (grayscale)
+		Y4M_PIXFMT_MONO		/// luma only (grayscale)
 	};
 
 
@@ -79,7 +79,7 @@ class YUV4MPEGVideoProvider : public VideoProvider {
 		Y4M_ILACE_BFF,			/// interlaced, bottom field first
 
 		Y4M_ILACE_MIXED,		/// mixed interlaced/progressive, possibly with RFF flags
-		Y4M_ILACE_UNKNOWN,		/// unknown interlacing mode (not the same as undefined)
+		Y4M_ILACE_UNKNOWN		/// unknown interlacing mode (not the same as undefined)
 	};
 
 
@@ -104,7 +104,7 @@ class YUV4MPEGVideoProvider : public VideoProvider {
 		/// chroma subsampling flags
 		Y4M_FFLAG_C_P		= 0x0200,	/// progressive (whole frame subsampled)
 		Y4M_FFLAG_C_I		= 0x0400,	/// interlaced (fields subsampled independently)
-		Y4M_FFLAG_C_UNKNOWN = 0x0800,	/// unknown (only allowed for non-4:2:0 sampling)
+		Y4M_FFLAG_C_UNKNOWN = 0x0800	/// unknown (only allowed for non-4:2:0 sampling)
 	};