Add some missing overrides.

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 69520fbd65a017fde85da1099105a3945d0286d2..c9b18037aa776d972b19bc558e90e6ebd1d6de58 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -61,18 +61,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;
 

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index f4a767d210c6c587630c99132db208274c7fd122..5949f8b0ba5ef866b68a418379ff98c182b0053f 100644 (file)
--- 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/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index df7b56edca41e9ecd5475c2f0a9658f1a1b855e5..ce4a8aa6985cdbdc38af33bf5e4c8b479cbc65db 100644 (file)
--- 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/image_content.h b/src/lib/image_content.h
index 81396c63ba19a95683c856d2441d17f62db80306..d817eeee84e4cc0b6a2685666db207eae79a0025 100644 (file)
--- 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/string_text_file_content.h b/src/lib/string_text_file_content.h
index aec86181ccc8ab58adb902c8a6c4e6bc25345a16..f9356cc6fcfd286bde129e920d036fd2a0030aad 100644 (file)
--- 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;