C++11 tidying.

4 files changed, 19 insertions, 15 deletions

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 4a2184f40..0186417d2 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -40,14 +40,14 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	wxWindow* get () const {
+	wxWindow* get () const override {
 		return _canvas;
 	}
-	void update ();
-	void start ();
-	void stop ();
+	void update () override;
+	void start () override;
+	void stop () override;
 
-	NextFrameResult display_next_frame (bool);
+	NextFrameResult display_next_frame (bool) override;
 
 	bool vsync_enabled () const {
 		return _vsync_enabled;
diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 31756b5d8..26d1299b1 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -33,13 +33,13 @@ class SimpleVideoView : public VideoView
 public:
 	SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-	wxWindow* get () const {
+	wxWindow* get () const override {
 		return _panel;
 	}
 
-	void update ();
-	void start ();
-	NextFrameResult display_next_frame (bool non_blocking);
+	void update () override;
+	void start () override;
+	NextFrameResult display_next_frame (bool non_blocking) override;
 
 private:
 	void set_image (std::shared_ptr<const Image> image) {
diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc
index 7aabf1bf5..ed93a4ab4 100644
--- a/src/wx/system_information_dialog.cc
+++ b/src/wx/system_information_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
+#include "film_viewer.h"
+#include "gl_video_view.h"
 #include "system_information_dialog.h"
 #include "wx_util.h"
-#include "gl_video_view.h"
-#include "film_viewer.h"
+
 
 #ifdef DCPOMATIC_OSX
 #include <OpenGL/glu.h>
@@ -31,10 +33,12 @@
 #include <GL/glext.h>
 #endif
 
+
 using std::string;
 using std::weak_ptr;
 using std::shared_ptr;
 
+
 SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<FilmViewer> weak_viewer)
 	: TableDialog (parent, _("System information"), 2, 1, false)
 {
@@ -49,7 +53,7 @@ SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<Fil
 		add (_("unknown (OpenGL not enabled in DCP-o-matic)"), false);
 	} else {
 		add (_("OpenGL version"), true);
-		char const * v = (char const *) glGetString (GL_VERSION);
+		auto v = reinterpret_cast<char const *>(glGetString(GL_VERSION));
 		if (v) {
 			add (std_to_wx(v), false);
 		} else {
diff --git a/src/wx/system_information_dialog.h b/src/wx/system_information_dialog.h
index 5b9efa234..49e617a6e 100644
--- a/src/wx/system_information_dialog.h
+++ b/src/wx/system_information_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,9 +25,9 @@
 
 class FilmViewer;
 
+
 class SystemInformationDialog : public TableDialog
 {
 public:
 	SystemInformationDialog (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
-
 };