Use C++11 override everywhere it is appropriate.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 5906a3c44ca41f499b17340e3fcc36fdaec80dfc..4cde466c2d85de4a4b81bb5880399c197a11d63e 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -51,24 +51,24 @@ public:
        ResampleEffect();
        ~ResampleEffect();
 
        ResampleEffect();
        ~ResampleEffect();
 

-       virtual std::string effect_type_id() const { return "ResampleEffect"; }
+       std::string effect_type_id() const override { return "ResampleEffect"; }

 
        // We want this for the same reason as ResizeEffect; we could end up scaling
        // down quite a lot.
 
        // We want this for the same reason as ResizeEffect; we could end up scaling
        // down quite a lot.

-       virtual bool needs_texture_bounce() const { return true; }
-       virtual bool needs_srgb_primaries() const { return false; }
+       bool needs_texture_bounce() const override { return true; }
+       bool needs_srgb_primaries() const override { return false; }

 
 

-       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
+       void inform_input_size(unsigned input_num, unsigned width, unsigned height) override;

 
 

-       virtual std::string output_fragment_shader() {
+       std::string output_fragment_shader() override {

                assert(false);
        }
                assert(false);
        }

-       virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) {
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override {

                assert(false);
        }
 
                assert(false);
        }
 

-       virtual void rewrite_graph(EffectChain *graph, Node *self);
-       virtual bool set_float(const std::string &key, float value);
+       void rewrite_graph(EffectChain *graph, Node *self) override;
+       bool set_float(const std::string &key, float value) override;

        
 private:
        void update_size();
        
 private:
        void update_size();


@@ -92,29 +92,29 @@ public:
        // resolutions.
        SingleResamplePassEffect(ResampleEffect *parent);
        ~SingleResamplePassEffect();
        // resolutions.
        SingleResamplePassEffect(ResampleEffect *parent);
        ~SingleResamplePassEffect();

-       virtual std::string effect_type_id() const { return "SingleResamplePassEffect"; }
+       std::string effect_type_id() const override { return "SingleResamplePassEffect"; }

 
 

-       std::string output_fragment_shader();
+       std::string output_fragment_shader() override;

 
 

-       virtual bool needs_texture_bounce() const { return true; }
-       virtual bool needs_srgb_primaries() const { return false; }
-       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
+       bool needs_texture_bounce() const override { return true; }
+       bool needs_srgb_primaries() const override { return false; }
+       AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }

 
 

-       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
-       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
+       void inform_added(EffectChain *chain) override { this->chain = chain; }
+       void inform_input_size(unsigned input_num, unsigned width, unsigned height) override {

                if (parent != nullptr) {
                        parent->inform_input_size(input_num, width, height);
                }
        }
                if (parent != nullptr) {
                        parent->inform_input_size(input_num, width, height);
                }
        }

-       virtual bool changes_output_size() const { return true; }
-       virtual bool sets_virtual_output_size() const { return false; }
+       bool changes_output_size() const override { return true; }
+       bool sets_virtual_output_size() const override { return false; }

 
 

-       virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
+       void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const override {

                *virtual_width = *width = this->output_width;
                *virtual_height = *height = this->output_height;
        }
 
                *virtual_width = *width = this->output_width;
                *virtual_height = *height = this->output_height;
        }
 

-       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;

        
        enum Direction { HORIZONTAL = 0, VERTICAL = 1 };
 
        
        enum Direction { HORIZONTAL = 0, VERTICAL = 1 };