Tidy up careful_string_filter and add some extra transliterations.

[dcpomatic.git] / src / lib / dcp_content.h

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 40ed181fe7f383d6489f2e14c9d88e2d2b19b788..55773b94439217540bc9ea5a916527e7a96cd388 100644 (file)
--- 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;
 
@@ -92,7 +92,7 @@ public:
                return _kdm;
        }
 
-       bool can_be_played () const;
+       bool can_be_played () const override;
        bool needs_kdm () const;
        bool needs_assets () 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);