Add some missing override labels.

63 files changed, 272 insertions, 272 deletions

diff --git a/src/lib/analytics.h b/src/lib/analytics.h
index c0a3e17ef..0de0b51ca 100644
--- a/src/lib/analytics.h
+++ b/src/lib/analytics.h
@@ -31,8 +31,8 @@ public:
 
 	void successful_dcp_encode ();
 
-	void write () const;
-	void read ();
+	void write () const override;
+	void read () override;
 
 	boost::signals2::signal<void (std::string, std::string)> Message;
 
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a2e06f11c..a8495aaa8 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -51,9 +51,9 @@ class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public D
 public:
 	AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
 
-	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const;
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const override;
 	void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
-	void seek ();
+	void seek () override;
 	void flush ();
 
 	dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_change_job.h
index b3cdf594c..a374e2a6f 100644
--- a/src/lib/check_content_change_job.h
+++ b/src/lib/check_content_change_job.h
@@ -30,7 +30,7 @@ public:
 	CheckContentChangeJob (std::shared_ptr<const Film>);
 	~CheckContentChangeJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 };
diff --git a/src/lib/combine_dcp_job.h b/src/lib/combine_dcp_job.h
index 4a7e02b8b..5311ddd3e 100644
--- a/src/lib/combine_dcp_job.h
+++ b/src/lib/combine_dcp_job.h
@@ -28,9 +28,9 @@ class CombineDCPJob : public Job
 public:
 	CombineDCPJob (std::vector<boost::filesystem::path> inputs, boost::filesystem::path output, std::string annotation_text);
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 
 private:
 	std::vector<boost::filesystem::path> _inputs;
diff --git a/src/lib/config.h b/src/lib/config.h
index 29f401755..e9b3ec203 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1108,7 +1108,7 @@ public:
 
 	static boost::signals2::signal<bool (BadReason)> Bad;
 
-	void write () const;
+	void write () const override;
 	void write_config () const;
 	void write_cinemas () const;
 	void write_dkdm_recipients () const;
@@ -1135,7 +1135,7 @@ public:
 
 private:
 	Config ();
-	void read ();
+	void read () override;
 	void set_defaults ();
 	void set_kdm_email_to_default ();
 	void set_notification_email_to_default ();
diff --git a/src/lib/curl_uploader.h b/src/lib/curl_uploader.h
index a3ef3cb22..564e77493 100644
--- a/src/lib/curl_uploader.h
+++ b/src/lib/curl_uploader.h
@@ -32,8 +32,8 @@ public:
 	size_t read_callback (void* ptr, size_t size, size_t nmemb);
 
 protected:
-	virtual void create_directory (boost::filesystem::path directory);
-	virtual void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size);
+	void create_directory (boost::filesystem::path directory) override;
+	void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size) override;
 
 private:
 	CURL* _curl;
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 40ed181fe..d57c0059c 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -65,18 +65,18 @@ public:
 		return std::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	std::string identifier () const;
-	void take_settings_from (std::shared_ptr<const Content> c);
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	std::string identifier () const override;
+	void take_settings_from (std::shared_ptr<const Content> c) override;
 
 	void set_default_colour_conversion ();
-	std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const;
+	std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const override;
 
 	std::vector<boost::filesystem::path> directories () const;
 
@@ -173,7 +173,7 @@ public:
 private:
 	friend struct reels_test5;
 
-	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const override;
 
 	void read_directory (boost::filesystem::path);
 	void read_sub_directory (boost::filesystem::path);
diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index f4a767d21..5949f8b0b 100644
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -27,12 +27,12 @@ public:
 	DCPSubtitleContent (boost::filesystem::path);
 	DCPSubtitleContent (cxml::ConstNodePtr, int);
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
 private:
 	dcpomatic::ContentTime _length;
diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 95e783d06..4a54aaf2e 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -32,10 +32,10 @@ class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 public:
 	DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>);
 
-	bool pass ();
-	void seek (dcpomatic::ContentTime time, bool accurate);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool accurate) override;
 
-	std::vector<dcpomatic::FontData> fonts () const;
+	std::vector<dcpomatic::FontData> fonts () const override;
 
 private:
 	dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr<const dcp::Subtitle> s) const;
diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h
index 50f2f3e15..6e9e4dfb1 100644
--- a/src/lib/dkdm_recipient.h
+++ b/src/lib/dkdm_recipient.h
@@ -47,7 +47,7 @@ public:
 
 	explicit DKDMRecipient (cxml::ConstNodePtr);
 
-	void as_xml (xmlpp::Element *) const;
+	void as_xml (xmlpp::Element *) const override;
 
 	std::list<std::string> emails;
 	int utc_offset_hour;
diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index 0c2992bc4..7227fdc86 100644
--- a/src/lib/dkdm_wrapper.h
+++ b/src/lib/dkdm_wrapper.h
@@ -61,8 +61,8 @@ public:
 		: _dkdm (k)
 	{}
 
-	std::string name () const;
-	void as_xml (xmlpp::Element *) const;
+	std::string name () const override;
+	void as_xml (xmlpp::Element *) const override;
 
 	dcp::EncryptedKDM dkdm () const {
 		return _dkdm;
@@ -80,11 +80,11 @@ public:
 		: _name (name)
 	{}
 
-	std::string name () const {
+	std::string name () const override {
 		return _name;
 	}
 
-	void as_xml (xmlpp::Element *) const;
+	void as_xml (xmlpp::Element *) const override;
 
 	std::list<std::shared_ptr<DKDMBase>> children () const {
 		return _children;
diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index 0ca60f3f3..f93d66746 100644
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -51,10 +51,10 @@ public:
 	EncodeServer (bool verbose, int num_threads);
 	~EncodeServer ();
 
-	void run ();
+	void run () override;
 
 private:
-	void handle (std::shared_ptr<Socket>);
+	void handle (std::shared_ptr<Socket>) override;
 	void worker_thread ();
 	int process (std::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
 	void broadcast_thread ();
diff --git a/src/lib/encoded_log_entry.h b/src/lib/encoded_log_entry.h
index c4633dbe9..fadf48add 100644
--- a/src/lib/encoded_log_entry.h
+++ b/src/lib/encoded_log_entry.h
@@ -27,7 +27,7 @@ class EncodedLogEntry : public LogEntry
 public:
 	EncodedLogEntry (int frame, std::string ip, double receive, double encode, double send);
 
-	std::string message () const;
+	std::string message () const override;
 
 private:
 	int _frame;
diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 9437942dc..601b28584 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -31,9 +31,9 @@ public:
 	ExamineContentJob (std::shared_ptr<const Film>, std::shared_ptr<Content>);
 	~ExamineContentJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 
 	std::shared_ptr<Content> content () const {
 		return _content;
diff --git a/src/lib/examine_ffmpeg_subtitles_job.h b/src/lib/examine_ffmpeg_subtitles_job.h
index c9c0cabf4..1a065df57 100644
--- a/src/lib/examine_ffmpeg_subtitles_job.h
+++ b/src/lib/examine_ffmpeg_subtitles_job.h
@@ -29,9 +29,9 @@ public:
 	ExamineFFmpegSubtitlesJob (std::shared_ptr<const Film>, std::shared_ptr<FFmpegContent>);
 	~ExamineFFmpegSubtitlesJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 
 private:
 	std::shared_ptr<FFmpegContent> _content;
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index df7b56edc..ce4a8aa69 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -59,15 +59,15 @@ public:
 		return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
 	}
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	void take_settings_from (std::shared_ptr<const Content> c);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	void take_settings_from (std::shared_ptr<const Content> c) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
-	std::string identifier () const;
+	std::string identifier () const override;
 
 	void set_default_colour_conversion ();
 
@@ -100,7 +100,7 @@ public:
 	void signal_subtitle_stream_changed ();
 
 private:
-	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const override;
 
 	friend struct ffmpeg_pts_offset_test;
 	friend struct audio_sampling_rate_test;
diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 48317ed75..b2b0260b5 100644
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -34,12 +34,12 @@ public:
 	Result image (
 		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-		) const;
+		) const override;
 
-	void add_metadata (xmlpp::Node *) const;
-	void write_to_socket (std::shared_ptr<Socket>) const;
-	bool same (std::shared_ptr<const ImageProxy> other) const;
-	size_t memory_used () const;
+	void add_metadata (xmlpp::Node *) const override;
+	void write_to_socket (std::shared_ptr<Socket>) const override;
+	bool same (std::shared_ptr<const ImageProxy> other) const override;
+	size_t memory_used () const override;
 
 	int avio_read (uint8_t* buffer, int const amount);
 	int64_t avio_seek (int64_t const pos, int whence);
diff --git a/src/lib/file_log.h b/src/lib/file_log.h
index d7667f799..2795349ce 100644
--- a/src/lib/file_log.h
+++ b/src/lib/file_log.h
@@ -28,10 +28,10 @@ public:
 	explicit FileLog (boost::filesystem::path file);
 	FileLog (boost::filesystem::path file, int types);
 
-	std::string head_and_tail (int amount = 1024) const;
+	std::string head_and_tail (int amount = 1024) const override;
 
 private:
-	void do_log (std::shared_ptr<const LogEntry> entry);
+	void do_log (std::shared_ptr<const LogEntry> entry) override;
 
 	/** filename to write to */
 	boost::filesystem::path _file;
diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 81396c63b..d817eeee8 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -37,21 +37,21 @@ public:
 		return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
 	};
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
-	std::string identifier () const;
+	std::string identifier () const override;
 
 	void set_default_colour_conversion ();
 
 	bool still () const;
 
 private:
-	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const override;
 
 	boost::optional<boost::filesystem::path> _path_to_scan;
 };
diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index d925bef86..9666ea406 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -59,13 +59,13 @@ public:
 	Result image (
 		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-		) const;
+		) const override;
 
-	void add_metadata (xmlpp::Node *) const;
-	void write_to_socket (std::shared_ptr<Socket>) const;
+	void add_metadata (xmlpp::Node *) const override;
+	void write_to_socket (std::shared_ptr<Socket> override) const override;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
-	bool same (std::shared_ptr<const ImageProxy>) const;
-	int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+	bool same (std::shared_ptr<const ImageProxy>) const override;
+	int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const override;
 
 	std::shared_ptr<const dcp::Data> j2k () const {
 		return _data;
@@ -79,7 +79,7 @@ public:
 		return _eye;
 	}
 
-	size_t memory_used () const;
+	size_t memory_used () const override;
 
 private:
 	std::shared_ptr<const dcp::Data> _data;
diff --git a/src/lib/mid_side_decoder.h b/src/lib/mid_side_decoder.h
index 99821caa4..857975478 100644
--- a/src/lib/mid_side_decoder.h
+++ b/src/lib/mid_side_decoder.h
@@ -25,11 +25,11 @@
 class MidSideDecoder : public AudioProcessor
 {
 public:
-	std::string name () const;
-	std::string id () const;
-	int out_channels () const;
-	std::shared_ptr<AudioProcessor> clone (int) const;
-	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels);
-	void make_audio_mapping_default (AudioMapping& mapping) const;
-	std::vector<NamedChannel> input_names () const;
+	std::string name () const override;
+	std::string id () const override;
+	int out_channels () const override;
+	std::shared_ptr<AudioProcessor> clone (int) const override;
+	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override;
+	void make_audio_mapping_default (AudioMapping& mapping) const override;
+	std::vector<NamedChannel> input_names () const override;
 };
diff --git a/src/lib/null_log.h b/src/lib/null_log.h
index ce6017ca2..2c7232f14 100644
--- a/src/lib/null_log.h
+++ b/src/lib/null_log.h
@@ -23,5 +23,5 @@
 class NullLog : public Log
 {
 private:
-	void do_log (std::shared_ptr<const LogEntry>) {}
+	void do_log (std::shared_ptr<const LogEntry>) override {}
 };
diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index c9885654b..1111b66c0 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -35,12 +35,12 @@ public:
 	Result image (
 		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-		) const;
+		) const override;
 
-	void add_metadata (xmlpp::Node *) const;
-	void write_to_socket (std::shared_ptr<Socket>) const;
-	bool same (std::shared_ptr<const ImageProxy>) const;
-	size_t memory_used () const;
+	void add_metadata (xmlpp::Node *) const override;
+	void write_to_socket (std::shared_ptr<Socket>) const override;
+	bool same (std::shared_ptr<const ImageProxy>) const override;
+	size_t memory_used () const override;
 
 private:
 	std::shared_ptr<Image> _image;
diff --git a/src/lib/screen.h b/src/lib/screen.h
index 6103d207d..84cecb80b 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -62,7 +62,7 @@ public:
 
 	explicit Screen (cxml::ConstNodePtr);
 
-	void as_xml (xmlpp::Element *) const;
+	void as_xml (xmlpp::Element *) const override;
 	std::vector<std::string> trusted_device_thumbprints () const;
 
 	std::shared_ptr<Cinema> cinema;
diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 2b010665c..76fb72b8a 100644
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -53,9 +53,9 @@ public:
 
 	~SendKDMEmailJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 
 private:
 	dcp::NameFormat _container_name_format;
diff --git a/src/lib/stdout_log.h b/src/lib/stdout_log.h
index 0dcc243db..2d5f30ee8 100644
--- a/src/lib/stdout_log.h
+++ b/src/lib/stdout_log.h
@@ -29,5 +29,5 @@ public:
 	explicit StdoutLog (int types);
 
 private:
-	void do_log (std::shared_ptr<const LogEntry> entry);
+	void do_log (std::shared_ptr<const LogEntry> entry) override;
 };
diff --git a/src/lib/string_log_entry.h b/src/lib/string_log_entry.h
index 143ada024..542a84646 100644
--- a/src/lib/string_log_entry.h
+++ b/src/lib/string_log_entry.h
@@ -28,7 +28,7 @@ class StringLogEntry : public LogEntry
 public:
 	StringLogEntry (int type, std::string message);
 
-	std::string message () const {
+	std::string message () const override {
 		return _message;
 	}
 
diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h
index ef908051c..9c7d4cea0 100644
--- a/src/lib/string_text_file_content.h
+++ b/src/lib/string_text_file_content.h
@@ -42,13 +42,13 @@ public:
 		return std::dynamic_pointer_cast<const StringTextFileContent> (Content::shared_from_this ());
 	}
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
-	std::string identifier () const;
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
+	std::string identifier () const override;
 
 private:
 	dcpomatic::ContentTime _length;
diff --git a/src/lib/string_text_file_decoder.h b/src/lib/string_text_file_decoder.h
index aa8c80e6e..5887f34c6 100644
--- a/src/lib/string_text_file_decoder.h
+++ b/src/lib/string_text_file_decoder.h
@@ -31,10 +31,10 @@ class StringTextFileDecoder : public Decoder, public StringTextFile
 public:
 	StringTextFileDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const StringTextFileContent>);
 
-	void seek (dcpomatic::ContentTime time, bool accurate);
-	bool pass ();
+	void seek (dcpomatic::ContentTime time, bool accurate) override;
+	bool pass () override;
 
-	std::vector<dcpomatic::FontData> fonts () const;
+	std::vector<dcpomatic::FontData> fonts () const override;
 
 private:
 	dcpomatic::ContentTimePeriod content_time_period (sub::Subtitle s) const;
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index d1355afb0..39d6e828d 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -48,7 +48,7 @@ public:
 		dcpomatic::ContentTime first
 		);
 
-	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
 		return _position;
 	}
 
@@ -60,7 +60,7 @@ public:
 	void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
 	void emit_stop (dcpomatic::ContentTime to);
 
-	void seek ();
+	void seek () override;
 
 	std::shared_ptr<const TextContent> content () const {
 		return _content;
diff --git a/src/lib/upload_job.h b/src/lib/upload_job.h
index afd5ebda4..a3da164bf 100644
--- a/src/lib/upload_job.h
+++ b/src/lib/upload_job.h
@@ -33,10 +33,10 @@ public:
 	explicit UploadJob (std::shared_ptr<const Film>);
 	~UploadJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
-	std::string status () const;
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
+	std::string status () const override;
 
 private:
 	void set_status (std::string);
diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h
index b357616ef..9e364dcc9 100644
--- a/src/lib/upmixer_a.h
+++ b/src/lib/upmixer_a.h
@@ -36,14 +36,14 @@ class UpmixerA : public AudioProcessor
 public:
 	explicit UpmixerA (int sampling_rate);
 
-	std::string name () const;
-	std::string id () const;
-	int out_channels () const;
-	std::shared_ptr<AudioProcessor> clone (int) const;
-	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels);
-	void flush ();
-	void make_audio_mapping_default (AudioMapping& mapping) const;
-	std::vector<NamedChannel> input_names () const;
+	std::string name () const override;
+	std::string id () const override;
+	int out_channels () const override;
+	std::shared_ptr<AudioProcessor> clone (int) const override;
+	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override;
+	void flush () override;
+	void make_audio_mapping_default (AudioMapping& mapping) const override;
+	std::vector<NamedChannel> input_names () const override;
 
 private:
 	BandPassAudioFilter _left;
diff --git a/src/lib/upmixer_b.h b/src/lib/upmixer_b.h
index fc30e2a28..611ed6a90 100644
--- a/src/lib/upmixer_b.h
+++ b/src/lib/upmixer_b.h
@@ -34,14 +34,14 @@ class UpmixerB : public AudioProcessor
 public:
 	explicit UpmixerB (int sampling_rate);
 
-	std::string name () const;
-	std::string id () const;
-	int out_channels () const;
-	std::shared_ptr<AudioProcessor> clone (int) const;
-	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels);
-	void flush ();
-	void make_audio_mapping_default (AudioMapping& mapping) const;
-	std::vector<NamedChannel> input_names () const;
+	std::string name () const override;
+	std::string id () const override;
+	int out_channels () const override;
+	std::shared_ptr<AudioProcessor> clone (int) const override;
+	std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers>, int channels) override;
+	void flush () override;
+	void make_audio_mapping_default (AudioMapping& mapping) const override;
+	std::vector<NamedChannel> input_names () const override;
 
 private:
 	LowPassAudioFilter _lfe;
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 9d69f743a..828ac66a2 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -56,11 +56,11 @@ public:
 	friend struct ffmpeg_pts_offset_test;
 	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
 		return _position;
 	}
 
-	void seek ();
+	void seek () override;
 	void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
 	boost::signals2::signal<void (ContentVideo)> Data;
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 4d494bb63..42fc421e8 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1585,7 +1585,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		try {
 			wxInitAllImageHandlers ();
@@ -1693,13 +1693,13 @@ private:
 		return true;
 	}
 
-	void OnInitCmdLine (wxCmdLineParser& parser)
+	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
 		parser.SetSwitchChars (wxT ("-"));
 	}
 
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
+	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
 		if (parser.Found (wxT("version"))) {
 			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
@@ -1769,14 +1769,14 @@ private:
 	}
 
 	/* An unhandled exception has occurred inside the main event loop */
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		report_exception ();
 		/* This will terminate the program */
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		report_exception ();
 	}
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 29f79ff08..d3aa2500b 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -369,7 +369,7 @@ public:
 		, _frame (frame)
 	{}
 
-	void handle (shared_ptr<Socket> socket)
+	void handle (shared_ptr<Socket> socket) override
 	{
 		try {
 			int const length = socket->read_uint32 ();
@@ -390,7 +390,7 @@ private:
 
 class App : public wxApp
 {
-	bool OnInit ()
+	bool OnInit () override
 	{
 		wxInitAllImageHandlers ();
 
@@ -469,13 +469,13 @@ class App : public wxApp
 		signal_manager->ui_idle ();
 	}
 
-	void OnInitCmdLine (wxCmdLineParser& parser)
+	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
 		parser.SetSwitchChars (wxT ("-"));
 	}
 
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
+	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
 		for (size_t i = 0; i < parser.GetParamCount(); ++i) {
 			films_to_load.push_back (wx_to_std(parser.GetParam(i)));
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index ec5d8e782..1907a6045 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -418,7 +418,7 @@ public:
 		: _frame (nullptr)
 	{}
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		try {
 			Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
@@ -489,13 +489,13 @@ public:
 		return true;
 	}
 
-	void OnInitCmdLine (wxCmdLineParser& parser)
+	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
 		parser.SetSwitchChars (wxT ("-"));
 	}
 
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
+	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
 		_skip_alpha_check = parser.Found(wxT("sure"));
 
@@ -549,14 +549,14 @@ public:
 		}
 	}
 
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		report_exception ();
 		/* This will terminate the program */
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		report_exception ();
 	}
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 24bd3b4d7..481b0fb8b 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -620,7 +620,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		wxSplashScreen* splash = nullptr;
 
@@ -719,7 +719,7 @@ private:
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		error_dialog (nullptr, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
 	}
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 8c9f016d4..b83d9c482 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -1023,7 +1023,7 @@ public:
 		, _frame (frame)
 	{}
 
-	void handle (shared_ptr<Socket> socket)
+	void handle (shared_ptr<Socket> socket) override
 	{
 		try {
 			int const length = socket->read_uint32 ();
@@ -1057,7 +1057,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		wxSplashScreen* splash = nullptr;
 		try {
@@ -1156,13 +1156,13 @@ private:
 		return true;
 	}
 
-	void OnInitCmdLine (wxCmdLineParser& parser)
+	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
 		parser.SetSwitchChars (wxT ("-"));
 	}
 
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
+	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
 		if (parser.GetParamCount() > 0) {
 			_dcp_to_load = wx_to_std (parser.GetParam (0));
@@ -1207,14 +1207,14 @@ private:
 	}
 
 	/* An unhandled exception has occurred inside the main event loop */
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		report_exception ();
 		/* This will terminate the program */
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		report_exception ();
 	}
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 6f06c0624..dbc5e81dd 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -85,7 +85,7 @@ public:
 		return _content_view->selected ();
 	}
 
-	shared_ptr<Content> get (string digest) const
+	shared_ptr<Content> get (string digest) const override
 	{
 		return _content_view->get (digest);
 	}
@@ -590,7 +590,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	try
 	{
 		wxInitAllImageHandlers ();
@@ -645,7 +645,7 @@ private:
 	}
 
 	/* An unhandled exception has occurred inside the main event loop */
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		try {
 			throw;
@@ -674,7 +674,7 @@ private:
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		error_dialog (0, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
 	}
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 401fb1077..de25f531d 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -87,7 +87,7 @@ public:
 	boost::signals2::signal<void(int)> Removed;
 
 private:
-	void do_log (shared_ptr<const LogEntry> entry)
+	void do_log (shared_ptr<const LogEntry> entry) override
 	{
 		time_t const s = entry->seconds ();
 		struct tm* local = localtime (&s);
@@ -226,7 +226,7 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
 	}
 
-	wxMenu* CreatePopupMenu ()
+	wxMenu* CreatePopupMenu () override
 	{
 		auto menu = new wxMenu;
 		menu->Append (ID_status, std_to_wx ("Status..."));
@@ -273,7 +273,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		if (!wxApp::OnInit()) {
 			return false;
@@ -327,7 +327,7 @@ private:
 		return true;
 	}
 
-	int OnExit ()
+	int OnExit () override
 	{
 		delete _icon;
 		return wxApp::OnExit ();
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 12dd0cadf..8ba69ec79 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -36,7 +36,7 @@ class AudioDialog : public wxDialog
 public:
 	AudioDialog (wxWindow* parent, std::shared_ptr<Film> film, std::weak_ptr<FilmViewer> viewer, std::shared_ptr<Content> content = std::shared_ptr<Content>());
 
-	bool Show (bool show = true);
+	bool Show (bool show = true) override;
 
 	void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
 
diff --git a/src/wx/barco_alchemy_certificate_panel.h b/src/wx/barco_alchemy_certificate_panel.h
index fce7d3f5d..addae0421 100644
--- a/src/wx/barco_alchemy_certificate_panel.h
+++ b/src/wx/barco_alchemy_certificate_panel.h
@@ -25,7 +25,7 @@ class BarcoAlchemyCertificatePanel : public CredentialsDownloadCertificatePanel
 public:
 	BarcoAlchemyCertificatePanel (DownloadCertificateDialog* dialog);
 
-	bool ready_to_download () const;
-	void do_download ();
-	wxString name () const;
+	bool ready_to_download () const override;
+	void do_download () override;
+	wxString name () const override;
 };
diff --git a/src/wx/batch_job_view.h b/src/wx/batch_job_view.h
index 6d9ccba31..91dca82e9 100644
--- a/src/wx/batch_job_view.h
+++ b/src/wx/batch_job_view.h
@@ -28,10 +28,10 @@ public:
 	BatchJobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
 
 private:
-	int insert_position () const;
-	void job_list_changed ();
+	int insert_position () const override;
+	void job_list_changed () override;
 
-	void finish_setup (wxWindow* parent, wxSizer* sizer);
+	void finish_setup (wxWindow* parent, wxSizer* sizer) override;
 	void higher_priority_clicked ();
 	void lower_priority_clicked ();
 
diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 8e6789e44..5176cd2e8 100644
--- a/src/wx/check_box.h
+++ b/src/wx/check_box.h
@@ -32,8 +32,8 @@ class CheckBox : public wxCheckBox, public I18NHook
 public:
 	CheckBox (wxWindow* parent, wxString label);
 
-	void set_text (wxString text);
-	wxString get_text () const;
+	void set_text (wxString text) override;
+	wxString get_text () const override;
 };
 
 
diff --git a/src/wx/christie_certificate_panel.h b/src/wx/christie_certificate_panel.h
index 41278cb7c..54536a81c 100644
--- a/src/wx/christie_certificate_panel.h
+++ b/src/wx/christie_certificate_panel.h
@@ -25,6 +25,6 @@ class ChristieCertificatePanel : public CredentialsDownloadCertificatePanel
 public:
 	ChristieCertificatePanel (DownloadCertificateDialog* dialog);
 
-	void do_download ();
-	wxString name () const;
+	void do_download () override;
+	wxString name () const override;
 };
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index b7f3a269f..ce5df2c5b 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -54,7 +54,7 @@ public:
 	Page (wxSize panel_size, int border);
 	virtual ~Page () {}
 
-	wxWindow* CreateWindow (wxWindow* parent);
+	wxWindow* CreateWindow (wxWindow* parent) override;
 
 protected:
 	wxWindow* create_window (wxWindow* parent);
@@ -79,10 +79,10 @@ class GeneralPage : public Page
 public:
 	GeneralPage (wxSize panel_size, int border);
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
 	}
@@ -91,7 +91,7 @@ public:
 protected:
 	void add_language_controls (wxGridBagSizer* table, int& r);
 	void add_update_controls (wxGridBagSizer* table, int& r);
-	virtual void config_changed ();
+	void config_changed () override;
 
 private:
 	void setup_sensitivity ();
@@ -156,10 +156,10 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
 	}
@@ -167,10 +167,10 @@ public:
 
 private:
 
-	void setup ();
+	void setup () override;
 
 	void export_decryption_certificate ();
-	void config_changed () {}
+	void config_changed () override {}
 	bool nag_alter_decryption_chain ();
 	void decryption_advanced ();
 	void signing_advanced ();
@@ -187,10 +187,10 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName() const;
+	wxString GetName() const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
 	}
@@ -198,8 +198,8 @@ public:
 
 private:
 
-	void setup ();
-	void config_changed ();
+	void setup () override;
+	void config_changed () override;
         boost::optional<std::string> get_sound_output ();
 	void sound_changed ();
 	void sound_output_changed ();
@@ -219,15 +219,15 @@ class LocationsPage : public Page
 public:
 	LocationsPage (wxSize panel_size, int border);
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const;
+	wxBitmap GetLargeIcon () const override;
 #endif
 
 private:
-	void setup ();
-	void config_changed ();
+	void setup () override;
+	void config_changed () override;
 	void content_directory_changed ();
 	void playlist_directory_changed ();
 	void kdm_directory_changed ();
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index e25dedcea..650b79668 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -48,7 +48,7 @@ class LimitedSplitter : public wxSplitterWindow
 public:
 	LimitedSplitter (wxWindow* parent);
 
-	bool OnSashPositionChange (int new_position)
+	bool OnSashPositionChange (int new_position) override
 	{
 		/* Try to stop the top bit of the splitter getting so small that buttons disappear */
 		return new_position > 220;
diff --git a/src/wx/content_view.h b/src/wx/content_view.h
index 1ad7c541a..d7c1a43ed 100644
--- a/src/wx/content_view.h
+++ b/src/wx/content_view.h
@@ -39,7 +39,7 @@ public:
 	std::shared_ptr<Content> selected () const;
 	void update ();
 
-	std::shared_ptr<Content> get (std::string digest) const;
+	std::shared_ptr<Content> get (std::string digest) const override;
 
 private:
 	void add (std::shared_ptr<Content> content);
diff --git a/src/wx/credentials_download_certificate_panel.h b/src/wx/credentials_download_certificate_panel.h
index b802768e9..b9af14f5b 100644
--- a/src/wx/credentials_download_certificate_panel.h
+++ b/src/wx/credentials_download_certificate_panel.h
@@ -38,7 +38,7 @@ public:
 			std::function<void ()> unset_password
 			);
 
-	virtual bool ready_to_download () const;
+	bool ready_to_download () const override;
 
 private:
 	void username_changed ();
diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h
index 682fa5fe6..aba41b125 100644
--- a/src/wx/dcpomatic_button.h
+++ b/src/wx/dcpomatic_button.h
@@ -29,8 +29,8 @@ class Button : public wxButton, public I18NHook
 public:
 	Button (wxWindow* parent, wxString label, wxPoint pos = wxDefaultPosition, wxSize = wxDefaultSize, long style = 0);
 
-	void set_text (wxString text);
-	wxString get_text () const;
+	void set_text (wxString text) override;
+	wxString get_text () const override;
 };
 
 #endif
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 1c14ad35c..0699bff22 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -89,7 +89,7 @@ public:
 	{}
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -146,7 +146,7 @@ private:
 		_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
@@ -246,20 +246,20 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Defaults");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -385,7 +385,7 @@ private:
 		}
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
@@ -545,20 +545,20 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Servers");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		_use_any_servers = new CheckBox (_panel, _("Search network for servers"));
 		_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
@@ -578,7 +578,7 @@ private:
 		_use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		checked_set (_use_any_servers, Config::instance()->use_any_servers ());
 		_servers_list->refresh ();
@@ -606,20 +606,20 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("TMS");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		_upload = new CheckBox (_panel, _("Upload DCP to TMS after creation"));
 		_panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border);
@@ -659,7 +659,7 @@ private:
 		_tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
@@ -717,20 +717,20 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Email");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -776,7 +776,7 @@ private:
 		_send_test_email->Bind (wxEVT_BUTTON, boost::bind(&EmailPage::send_test_email_clicked, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
@@ -889,20 +889,20 @@ public:
 #endif
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("KDM Email");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -948,9 +948,9 @@ private:
 		_reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
-		Config* config = Config::instance ();
+		auto config = Config::instance ();
 
 		checked_set (_subject, config->kdm_subject ());
 		checked_set (_from, config->kdm_from ());
@@ -1011,20 +1011,20 @@ public:
 #endif
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Notifications");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -1100,7 +1100,7 @@ private:
 		_reset_email->Enable(s);
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
@@ -1184,20 +1184,20 @@ public:
 #endif
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Cover Sheet");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		_cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
 		_panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
@@ -1209,7 +1209,7 @@ private:
 		_reset_cover_sheet->Bind (wxEVT_BUTTON, boost::bind (&CoverSheetPage::reset_cover_sheet, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		checked_set (_cover_sheet, Config::instance()->cover_sheet());
 	}
@@ -1243,20 +1243,20 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Identifiers");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
 private:
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -1301,7 +1301,7 @@ private:
 		_j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 		checked_set (_issuer, config->dcp_issuer ());
@@ -1361,13 +1361,13 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Advanced");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
 	}
@@ -1385,7 +1385,7 @@ private:
 		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
 	}
 
-	void setup ()
+	void setup () override
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
@@ -1545,7 +1545,7 @@ private:
 #endif
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		auto config = Config::instance ();
 
diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index a26dcc0bb..a6d5e49a6 100644
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -111,7 +111,7 @@ public:
 	}
 
 private:
-	wxString OnGetItemText (long item, long column) const
+	wxString OnGetItemText (long item, long column) const override
 	{
 		if (column == 0) {
 			return _matching_subtags[item].subtag;
diff --git a/src/wx/gdc_certificate_panel.h b/src/wx/gdc_certificate_panel.h
index b69c7a51f..e41254e45 100644
--- a/src/wx/gdc_certificate_panel.h
+++ b/src/wx/gdc_certificate_panel.h
@@ -25,6 +25,6 @@ class GDCCertificatePanel : public CredentialsDownloadCertificatePanel
 public:
 	GDCCertificatePanel (DownloadCertificateDialog* dialog);
 
-	void do_download ();
-	wxString name () const;
+	void do_download () override;
+	wxString name () const override;
 };
diff --git a/src/wx/normal_job_view.h b/src/wx/normal_job_view.h
index acd8111b6..7d4f72ad5 100644
--- a/src/wx/normal_job_view.h
+++ b/src/wx/normal_job_view.h
@@ -33,10 +33,10 @@ public:
 	void setup ();
 
 private:
-	int insert_position () const;
-	void finish_setup (wxWindow* parent, wxSizer* sizer);
+	int insert_position () const override;
+	void finish_setup (wxWindow* parent, wxSizer* sizer) override;
 	void pause_clicked ();
-	void finished ();
+	void finished () override;
 
 	wxButton* _pause = nullptr;
 };
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 91434beae..af0f8641e 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -78,7 +78,7 @@ public:
 	{}
 
 private:
-	void setup ()
+	void setup () override
 	{
 		wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -132,7 +132,7 @@ private:
 		_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
 		GeneralPage::config_changed ();
 
@@ -228,13 +228,13 @@ public:
 		, _log_timing (0)
 	{}
 
-	wxString GetName () const
+	wxString GetName () const override
 	{
 		return _("Advanced");
 	}
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
 	}
@@ -252,9 +252,9 @@ private:
 		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
 	}
 
-	void setup ()
+	void setup () override
 	{
-		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
@@ -288,9 +288,9 @@ private:
 #endif
 	}
 
-	void config_changed ()
+	void config_changed () override
 	{
-		Config* config = Config::instance ();
+		auto config = Config::instance ();
 
 		checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
 		checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
@@ -339,17 +339,17 @@ private:
 wxPreferencesEditor*
 create_player_config_dialog ()
 {
-	wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
+	auto e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
 
 #ifdef DCPOMATIC_OSX
 	/* Width that we force some of the config panels to be on OSX so that
 	   the containing window doesn't shrink too much when we select those panels.
 	   This is obviously an unpleasant hack.
 	*/
-	wxSize ps = wxSize (520, -1);
+	auto ps = wxSize (520, -1);
 	int const border = 16;
 #else
-	wxSize ps = wxSize (-1, -1);
+	auto ps = wxSize (-1, -1);
 	int const border = 8;
 #endif
 
diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index 8375f952e..57a84c128 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -28,7 +28,7 @@ class PlaylistControls : public Controls
 public:
 	PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
 
-	void set_film (std::shared_ptr<Film> film);
+	void set_film (std::shared_ptr<Film> film) override;
 
 	/** This is so that we can tell our parent player to reset the film
 	    when we have created one from a SPL.  We could call a method
@@ -36,8 +36,8 @@ public:
 	*/
 	boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
 
-	void play ();
-	void stop ();
+	void play () override;
+	void stop () override;
 
 private:
 	void play_clicked ();
@@ -50,10 +50,10 @@ private:
 	void update_playlist_directory ();
 	void spl_selection_changed ();
 	void select_playlist (int selected, int position);
-	void started ();
-	void stopped ();
-	void setup_sensitivity ();
-	void config_changed (int);
+	void started () override;
+	void stopped () override;
+	void setup_sensitivity () override;
+	void config_changed (int) override;
 	void viewer_finished ();
 	void reset_film ();
 	void update_current_content ();
diff --git a/src/wx/standard_controls.h b/src/wx/standard_controls.h
index 191924509..4e0e836e8 100644
--- a/src/wx/standard_controls.h
+++ b/src/wx/standard_controls.h
@@ -27,15 +27,15 @@ class StandardControls : public Controls
 public:
 	StandardControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer, bool editor_controls);
 
-	void play ();
-	void stop ();
+	void play () override;
+	void stop () override;
 
 private:
 	void check_play_state ();
 	void play_clicked ();
-	void started ();
-	void stopped ();
-	void setup_sensitivity ();
+	void started () override;
+	void stopped () override;
+	void setup_sensitivity () override;
 
 	wxToggleButton* _play_button;
 };
diff --git a/src/wx/static_text.h b/src/wx/static_text.h
index 0e49379a9..325e1f6d8 100644
--- a/src/wx/static_text.h
+++ b/src/wx/static_text.h
@@ -26,6 +26,6 @@ class StaticText : public wxStaticText, public I18NHook
 public:
 	StaticText (wxWindow* parent, wxString label, wxPoint pos = wxDefaultPosition, wxSize = wxDefaultSize, long style = 0);
 
-	void set_text (wxString text);
-	wxString get_text () const;
+	void set_text (wxString text) override;
+	wxString get_text () const override;
 };
diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 53b0ce2b8..2d056a22c 100644
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -44,8 +44,8 @@ class TimePickerSpin : public TimePicker
 public:
 	TimePickerSpin (wxWindow* parent, wxDateTime time);
 
-	int hours () const;
-	int minutes () const;
+	int hours () const override;
+	int minutes () const override;
 
 private:
 	void changed ();
@@ -60,8 +60,8 @@ class TimePickerText : public TimePicker
 public:
 	TimePickerText (wxWindow* parent, wxDateTime time);
 
-	int hours () const;
-	int minutes () const;
+	int hours () const override;
+	int minutes () const override;
 
 private:
 	void changed ();
diff --git a/src/wx/timeline_text_content_view.h b/src/wx/timeline_text_content_view.h
index 98aea6316..046f5b3e6 100644
--- a/src/wx/timeline_text_content_view.h
+++ b/src/wx/timeline_text_content_view.h
@@ -32,9 +32,9 @@ public:
 	TimelineTextContentView (Timeline& tl, std::shared_ptr<Content>, std::shared_ptr<TextContent>);
 
 private:
-	bool active () const;
-	wxColour background_colour () const;
-	wxColour foreground_colour () const;
+	bool active () const override;
+	wxColour background_colour () const override;
+	wxColour foreground_colour () const override;
 
 	std::shared_ptr<TextContent> _caption;
 };
diff --git a/src/wx/timeline_time_axis_view.h b/src/wx/timeline_time_axis_view.h
index 100228ae8..4c8e090fe 100644
--- a/src/wx/timeline_time_axis_view.h
+++ b/src/wx/timeline_time_axis_view.h
@@ -25,11 +25,11 @@ class TimelineTimeAxisView : public TimelineView
 public:
 	TimelineTimeAxisView (Timeline& tl, int y);
 
-	dcpomatic::Rect<int> bbox () const;
+	dcpomatic::Rect<int> bbox () const override;
 	void set_y (int y);
 
 private:
-	void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps);
+	void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
 
 	int _y; ///< y position in tracks (not pixels)
 };
diff --git a/src/wx/wx_signal_manager.h b/src/wx/wx_signal_manager.h
index 2e6ddc300..7269acebf 100644
--- a/src/wx/wx_signal_manager.h
+++ b/src/wx/wx_signal_manager.h
@@ -30,7 +30,7 @@ class wxSignalManager : public SignalManager
 {
 public:
 	explicit wxSignalManager (wxEvtHandler *);
-	void wake_ui ();
+	void wake_ui () override;
 
 private:
 	wxEvtHandler* _handler;