diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-02 10:27:41 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-02 10:27:41 +0000 |
| commit | 555712c0db9d0b724828f45bd3ebc5f169405d9c (patch) | |
| tree | 38f858a4dd46684ae3a1d10ac23f2aafd5d03720 /src/extension/internal | |
| parent | modernize loops (2) (diff) | |
| download | inkscape-555712c0db9d0b724828f45bd3ebc5f169405d9c.tar.gz inkscape-555712c0db9d0b724828f45bd3ebc5f169405d9c.zip | |
modernize: add overrides
Diffstat (limited to 'src/extension/internal')
37 files changed, 76 insertions, 76 deletions
diff --git a/src/extension/internal/bitmap/adaptiveThreshold.h b/src/extension/internal/bitmap/adaptiveThreshold.h index 631c8e2e0..33ad87618 100644 --- a/src/extension/internal/bitmap/adaptiveThreshold.h +++ b/src/extension/internal/bitmap/adaptiveThreshold.h @@ -21,8 +21,8 @@ private: unsigned int _height; unsigned _offset; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/addNoise.h b/src/extension/internal/bitmap/addNoise.h index ab7936432..16ab6ed4c 100644 --- a/src/extension/internal/bitmap/addNoise.h +++ b/src/extension/internal/bitmap/addNoise.h @@ -19,8 +19,8 @@ class AddNoise : public ImageMagick private: const gchar* _noiseTypeName; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/blur.h b/src/extension/internal/bitmap/blur.h index 269d57567..d4315e96a 100644 --- a/src/extension/internal/bitmap/blur.h +++ b/src/extension/internal/bitmap/blur.h @@ -20,8 +20,8 @@ private: float _radius; float _sigma; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/channel.h b/src/extension/internal/bitmap/channel.h index 067a5fd3b..477d6f341 100644 --- a/src/extension/internal/bitmap/channel.h +++ b/src/extension/internal/bitmap/channel.h @@ -20,8 +20,8 @@ private: const gchar * _layerName; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/charcoal.h b/src/extension/internal/bitmap/charcoal.h index 5c2a8d513..bd6021cda 100644 --- a/src/extension/internal/bitmap/charcoal.h +++ b/src/extension/internal/bitmap/charcoal.h @@ -20,8 +20,8 @@ private: float _radius; float _sigma; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/colorize.h b/src/extension/internal/bitmap/colorize.h index 5faccf5a9..c854b78e9 100644 --- a/src/extension/internal/bitmap/colorize.h +++ b/src/extension/internal/bitmap/colorize.h @@ -22,8 +22,8 @@ private: guint32 _color; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/contrast.h b/src/extension/internal/bitmap/contrast.h index c8099176f..d37736874 100644 --- a/src/extension/internal/bitmap/contrast.h +++ b/src/extension/internal/bitmap/contrast.h @@ -19,8 +19,8 @@ class Contrast : public ImageMagick private: unsigned int _sharpen; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/crop.h b/src/extension/internal/bitmap/crop.h index 168c093c5..7cb9b0148 100644 --- a/src/extension/internal/bitmap/crop.h +++ b/src/extension/internal/bitmap/crop.h @@ -23,9 +23,9 @@ private: int _left; int _right; public: - void applyEffect(Magick::Image *image); - void postEffect(Magick::Image *image, SPItem *item); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void postEffect(Magick::Image *image, SPItem *item) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/cycleColormap.h b/src/extension/internal/bitmap/cycleColormap.h index eacbb8c85..81ffd32e0 100644 --- a/src/extension/internal/bitmap/cycleColormap.h +++ b/src/extension/internal/bitmap/cycleColormap.h @@ -18,8 +18,8 @@ class CycleColormap : public ImageMagick { private: int _amount; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/despeckle.h b/src/extension/internal/bitmap/despeckle.h index 0c846b651..d38d83921 100644 --- a/src/extension/internal/bitmap/despeckle.h +++ b/src/extension/internal/bitmap/despeckle.h @@ -16,8 +16,8 @@ namespace Bitmap { class Despeckle : public ImageMagick { public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/edge.h b/src/extension/internal/bitmap/edge.h index 8c7b8f9d1..3091e2d75 100644 --- a/src/extension/internal/bitmap/edge.h +++ b/src/extension/internal/bitmap/edge.h @@ -18,8 +18,8 @@ class Edge : public ImageMagick { private: unsigned int _radius; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/emboss.h b/src/extension/internal/bitmap/emboss.h index ff897089b..86fa38c18 100644 --- a/src/extension/internal/bitmap/emboss.h +++ b/src/extension/internal/bitmap/emboss.h @@ -20,8 +20,8 @@ private: float _radius; float _sigma; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/enhance.h b/src/extension/internal/bitmap/enhance.h index 574781fbe..040d673e2 100644 --- a/src/extension/internal/bitmap/enhance.h +++ b/src/extension/internal/bitmap/enhance.h @@ -17,8 +17,8 @@ namespace Bitmap { class Enhance : public ImageMagick { public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/equalize.h b/src/extension/internal/bitmap/equalize.h index ea897dafb..d66a0f873 100644 --- a/src/extension/internal/bitmap/equalize.h +++ b/src/extension/internal/bitmap/equalize.h @@ -17,8 +17,8 @@ namespace Bitmap { class Equalize : public ImageMagick { public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init (void); }; diff --git a/src/extension/internal/bitmap/gaussianBlur.h b/src/extension/internal/bitmap/gaussianBlur.h index 2227fde5b..e2afb41f8 100644 --- a/src/extension/internal/bitmap/gaussianBlur.h +++ b/src/extension/internal/bitmap/gaussianBlur.h @@ -20,8 +20,8 @@ private: float _width; float _sigma; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp index e476a7370..61503ca95 100644 --- a/src/extension/internal/bitmap/imagemagick.cpp +++ b/src/extension/internal/bitmap/imagemagick.cpp @@ -47,7 +47,7 @@ protected: SPItem** _imageItems; public: ImageMagickDocCache(Inkscape::UI::View::View * view); - ~ImageMagickDocCache ( ); + ~ImageMagickDocCache ( ) override; }; ImageMagickDocCache::ImageMagickDocCache(Inkscape::UI::View::View * view) : diff --git a/src/extension/internal/bitmap/imagemagick.h b/src/extension/internal/bitmap/imagemagick.h index 2793e457e..754e1959e 100644 --- a/src/extension/internal/bitmap/imagemagick.h +++ b/src/extension/internal/bitmap/imagemagick.h @@ -35,10 +35,10 @@ public: virtual void postEffect(Magick::Image */*image*/, SPItem */*item*/) { }; /* Functions implemented from ::Implementation */ - bool load(Inkscape::Extension::Extension *module); - Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc); - void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); - Gtk::Widget* prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + bool load(Inkscape::Extension::Extension *module) override; + Inkscape::Extension::Implementation::ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * doc) override; + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; + Gtk::Widget* prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; }; }; /* namespace Bitmap */ diff --git a/src/extension/internal/bitmap/implode.h b/src/extension/internal/bitmap/implode.h index 24218dc9f..e6649ced2 100644 --- a/src/extension/internal/bitmap/implode.h +++ b/src/extension/internal/bitmap/implode.h @@ -19,8 +19,8 @@ class Implode : public ImageMagick private: float _factor; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/level.h b/src/extension/internal/bitmap/level.h index 600a82a79..fc4159b7c 100644 --- a/src/extension/internal/bitmap/level.h +++ b/src/extension/internal/bitmap/level.h @@ -21,8 +21,8 @@ private: float _white_point; float _mid_point; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/levelChannel.h b/src/extension/internal/bitmap/levelChannel.h index 5e2b20ca7..42b8917cd 100644 --- a/src/extension/internal/bitmap/levelChannel.h +++ b/src/extension/internal/bitmap/levelChannel.h @@ -22,8 +22,8 @@ private: float _mid_point; const gchar * _channelName; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/medianFilter.h b/src/extension/internal/bitmap/medianFilter.h index 343a11d3c..69ea58a85 100644 --- a/src/extension/internal/bitmap/medianFilter.h +++ b/src/extension/internal/bitmap/medianFilter.h @@ -19,8 +19,8 @@ class MedianFilter : public ImageMagick private: float _radius; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/modulate.h b/src/extension/internal/bitmap/modulate.h index 1eb69cbdb..911df8154 100644 --- a/src/extension/internal/bitmap/modulate.h +++ b/src/extension/internal/bitmap/modulate.h @@ -21,8 +21,8 @@ private: float _saturation; float _hue; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/negate.h b/src/extension/internal/bitmap/negate.h index c8464664a..81423ac1e 100644 --- a/src/extension/internal/bitmap/negate.h +++ b/src/extension/internal/bitmap/negate.h @@ -17,8 +17,8 @@ namespace Bitmap { class Negate : public ImageMagick { public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/normalize.h b/src/extension/internal/bitmap/normalize.h index 5da81ed38..64e8c3e4b 100644 --- a/src/extension/internal/bitmap/normalize.h +++ b/src/extension/internal/bitmap/normalize.h @@ -17,8 +17,8 @@ namespace Bitmap { class Normalize : public ImageMagick { public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/oilPaint.h b/src/extension/internal/bitmap/oilPaint.h index 77d4ad10e..a45f91666 100644 --- a/src/extension/internal/bitmap/oilPaint.h +++ b/src/extension/internal/bitmap/oilPaint.h @@ -19,8 +19,8 @@ class OilPaint : public ImageMagick private: float _radius; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/opacity.h b/src/extension/internal/bitmap/opacity.h index 287b10f8c..f389bc650 100644 --- a/src/extension/internal/bitmap/opacity.h +++ b/src/extension/internal/bitmap/opacity.h @@ -19,8 +19,8 @@ class Opacity : public ImageMagick private: float _opacity; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/raise.h b/src/extension/internal/bitmap/raise.h index fca23ccb1..bc402828e 100644 --- a/src/extension/internal/bitmap/raise.h +++ b/src/extension/internal/bitmap/raise.h @@ -21,8 +21,8 @@ private: int _height; bool _raisedFlag; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/reduceNoise.h b/src/extension/internal/bitmap/reduceNoise.h index f7270db25..9a41d8463 100644 --- a/src/extension/internal/bitmap/reduceNoise.h +++ b/src/extension/internal/bitmap/reduceNoise.h @@ -19,8 +19,8 @@ class ReduceNoise : public ImageMagick private: int _order; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/sample.h b/src/extension/internal/bitmap/sample.h index a87929ea8..48908326d 100644 --- a/src/extension/internal/bitmap/sample.h +++ b/src/extension/internal/bitmap/sample.h @@ -20,8 +20,8 @@ private: int _width; int _height; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/shade.h b/src/extension/internal/bitmap/shade.h index a7580a23c..f94cb62e1 100644 --- a/src/extension/internal/bitmap/shade.h +++ b/src/extension/internal/bitmap/shade.h @@ -21,8 +21,8 @@ private: float _elevation; bool _colorShading; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/sharpen.h b/src/extension/internal/bitmap/sharpen.h index 56baff42b..6fac5681e 100644 --- a/src/extension/internal/bitmap/sharpen.h +++ b/src/extension/internal/bitmap/sharpen.h @@ -20,8 +20,8 @@ private: float _radius; float _sigma; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/solarize.h b/src/extension/internal/bitmap/solarize.h index 8e161c532..45515f3fc 100644 --- a/src/extension/internal/bitmap/solarize.h +++ b/src/extension/internal/bitmap/solarize.h @@ -19,8 +19,8 @@ class Solarize : public ImageMagick private: float _factor; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/spread.h b/src/extension/internal/bitmap/spread.h index dd6591336..f7ec0cb3f 100644 --- a/src/extension/internal/bitmap/spread.h +++ b/src/extension/internal/bitmap/spread.h @@ -19,8 +19,8 @@ class Spread : public ImageMagick private: int _amount; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/swirl.h b/src/extension/internal/bitmap/swirl.h index 320c31214..64dcafe7e 100644 --- a/src/extension/internal/bitmap/swirl.h +++ b/src/extension/internal/bitmap/swirl.h @@ -19,8 +19,8 @@ class Swirl : public ImageMagick private: float _degrees; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/threshold.h b/src/extension/internal/bitmap/threshold.h index 13221ed33..94ef145dd 100644 --- a/src/extension/internal/bitmap/threshold.h +++ b/src/extension/internal/bitmap/threshold.h @@ -19,8 +19,8 @@ class Threshold : public ImageMagick private: double _threshold; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/unsharpmask.h b/src/extension/internal/bitmap/unsharpmask.h index 29c0c4253..442f19cf8 100644 --- a/src/extension/internal/bitmap/unsharpmask.h +++ b/src/extension/internal/bitmap/unsharpmask.h @@ -22,8 +22,8 @@ private: float _amount; float _threshold; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; diff --git a/src/extension/internal/bitmap/wave.h b/src/extension/internal/bitmap/wave.h index d88ce68d6..49131e558 100644 --- a/src/extension/internal/bitmap/wave.h +++ b/src/extension/internal/bitmap/wave.h @@ -20,8 +20,8 @@ private: float _amplitude; float _wavelength; public: - void applyEffect(Magick::Image *image); - void refreshParameters(Inkscape::Extension::Effect *module); + void applyEffect(Magick::Image *image) override; + void refreshParameters(Inkscape::Extension::Effect *module) override; static void init(void); }; |
