summaryrefslogtreecommitdiffstats
path: root/src/extension/internal
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-14 22:45:10 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:00 +0000
commit7654fc11a6442e6ee2a463d6dee6458c0f53768f (patch)
tree7eb16a57b879747842bb0401dfee7fb47cd16f95 /src/extension/internal
parentFix build issue caused by f09962028d017896279b717a6621a4de772d1b4f on GTK+ <3... (diff)
downloadinkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.tar.gz
inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.zip
Run clang-tidy’s modernize-use-override pass.
This adds the override specifier on all methods which override a virtual method, whether they were already virtual or missing this specifier.
Diffstat (limited to 'src/extension/internal')
-rw-r--r--src/extension/internal/bluredge.h6
-rw-r--r--src/extension/internal/cairo-png-out.h4
-rw-r--r--src/extension/internal/cairo-ps-out.h12
-rw-r--r--src/extension/internal/cairo-renderer-pdf-out.h4
-rw-r--r--src/extension/internal/cdr-input.cpp2
-rw-r--r--src/extension/internal/cdr-input.h2
-rw-r--r--src/extension/internal/emf-inout.h10
-rw-r--r--src/extension/internal/emf-print.h32
-rw-r--r--src/extension/internal/filter/bevels.h12
-rw-r--r--src/extension/internal/filter/blurs.h20
-rw-r--r--src/extension/internal/filter/bumps.h8
-rw-r--r--src/extension/internal/filter/color.h76
-rw-r--r--src/extension/internal/filter/distort.h8
-rw-r--r--src/extension/internal/filter/filter-file.cpp6
-rw-r--r--src/extension/internal/filter/filter.h8
-rw-r--r--src/extension/internal/filter/image.h4
-rw-r--r--src/extension/internal/filter/morphology.h8
-rw-r--r--src/extension/internal/filter/overlays.h4
-rw-r--r--src/extension/internal/filter/paint.h32
-rw-r--r--src/extension/internal/filter/protrusions.h4
-rw-r--r--src/extension/internal/filter/shadows.h4
-rw-r--r--src/extension/internal/filter/textures.h4
-rw-r--r--src/extension/internal/filter/transparency.h20
-rw-r--r--src/extension/internal/gdkpixbuf-input.h2
-rw-r--r--src/extension/internal/gimpgrad.h6
-rw-r--r--src/extension/internal/grid.h6
-rw-r--r--src/extension/internal/javafx-out.h6
-rw-r--r--src/extension/internal/latex-pstricks-out.h6
-rw-r--r--src/extension/internal/latex-pstricks.h24
-rw-r--r--src/extension/internal/metafile-inout.h2
-rw-r--r--src/extension/internal/metafile-print.h8
-rw-r--r--src/extension/internal/odf.h4
-rw-r--r--src/extension/internal/pdfinput/pdf-input.h6
-rw-r--r--src/extension/internal/pov-out.h4
-rw-r--r--src/extension/internal/svg.h8
-rw-r--r--src/extension/internal/vsd-input.cpp2
-rw-r--r--src/extension/internal/vsd-input.h2
-rw-r--r--src/extension/internal/wmf-inout.h10
-rw-r--r--src/extension/internal/wmf-print.h32
-rw-r--r--src/extension/internal/wpg-input.h2
40 files changed, 210 insertions, 210 deletions
diff --git a/src/extension/internal/bluredge.h b/src/extension/internal/bluredge.h
index d8fe056f7..c30372d99 100644
--- a/src/extension/internal/bluredge.h
+++ b/src/extension/internal/bluredge.h
@@ -23,9 +23,9 @@ namespace Internal {
class BlurEdge : public Inkscape::Extension::Implementation::Implementation {
public:
- bool load(Inkscape::Extension::Extension *module);
- 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;
+ 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;
static void init (void);
};
diff --git a/src/extension/internal/cairo-png-out.h b/src/extension/internal/cairo-png-out.h
index 93e3ab37f..6a66d7f3e 100644
--- a/src/extension/internal/cairo-png-out.h
+++ b/src/extension/internal/cairo-png-out.h
@@ -25,10 +25,10 @@ namespace Internal {
class CairoRendererOutput : Inkscape::Extension::Implementation::Implementation {
public:
- bool check(Inkscape::Extension::Extension *module);
+ bool check(Inkscape::Extension::Extension *module) override;
void save(Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
static void init();
};
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index 3c273f6d4..e15931de4 100644
--- a/src/extension/internal/cairo-ps-out.h
+++ b/src/extension/internal/cairo-ps-out.h
@@ -27,24 +27,24 @@ namespace Internal {
class CairoPsOutput : Inkscape::Extension::Implementation::Implementation {
public:
- bool check(Inkscape::Extension::Extension *module);
+ bool check(Inkscape::Extension::Extension *module) override;
void save(Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
static void init();
- bool textToPath(Inkscape::Extension::Print *ext);
+ bool textToPath(Inkscape::Extension::Print *ext) override;
};
class CairoEpsOutput : Inkscape::Extension::Implementation::Implementation {
public:
- bool check(Inkscape::Extension::Extension *module);
+ bool check(Inkscape::Extension::Extension *module) override;
void save(Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *uri);
+ gchar const *uri) override;
static void init();
- bool textToPath(Inkscape::Extension::Print *ext);
+ bool textToPath(Inkscape::Extension::Print *ext) override;
};
diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h
index 5cb61444b..7910266e7 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.h
+++ b/src/extension/internal/cairo-renderer-pdf-out.h
@@ -25,10 +25,10 @@ namespace Internal {
class CairoRendererPdfOutput : Inkscape::Extension::Implementation::Implementation {
public:
- bool check(Inkscape::Extension::Extension *module);
+ bool check(Inkscape::Extension::Extension *module) override;
void save(Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
static void init();
};
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index bfba67282..e6e7d4ed4 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -67,7 +67,7 @@ namespace Internal {
class CdrImportDialog : public Gtk::Dialog {
public:
CdrImportDialog(const std::vector<RVNGString> &vec);
- virtual ~CdrImportDialog();
+ ~CdrImportDialog() override;
bool showDialog();
unsigned getSelectedPage();
diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h
index 10af41d5a..9b7ef75db 100644
--- a/src/extension/internal/cdr-input.h
+++ b/src/extension/internal/cdr-input.h
@@ -31,7 +31,7 @@ class CdrInput : public Inkscape::Extension::Implementation::Implementation {
CdrInput () { };
public:
SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ const gchar *uri ) override;
static void init( void );
};
diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h
index 6cc4ceffb..3c2a814aa 100644
--- a/src/extension/internal/emf-inout.h
+++ b/src/extension/internal/emf-inout.h
@@ -179,16 +179,16 @@ public:
Emf(); // Empty constructor
- virtual ~Emf();//Destructor
+ ~Emf() override;//Destructor
- bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now)
+ bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now)
void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
- virtual SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ SPDocument *open( Inkscape::Extension::Input *mod,
+ const gchar *uri ) override;
static void init(void);//Initialize the class
diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h
index 5e9a67ca1..43267dd2d 100644
--- a/src/extension/internal/emf-print.h
+++ b/src/extension/internal/emf-print.h
@@ -37,32 +37,32 @@ public:
PrintEmf();
/* Print functions */
- virtual unsigned int setup (Inkscape::Extension::Print * module);
+ unsigned int setup (Inkscape::Extension::Print * module) override;
- virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
- virtual unsigned int finish (Inkscape::Extension::Print * module);
+ unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override;
+ unsigned int finish (Inkscape::Extension::Print * module) override;
/* Rendering methods */
- virtual unsigned int fill (Inkscape::Extension::Print *module,
+ unsigned int fill (Inkscape::Extension::Print *module,
Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int stroke (Inkscape::Extension::Print * module,
+ Geom::OptRect const &bbox) override;
+ unsigned int stroke (Inkscape::Extension::Print * module,
Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int image(Inkscape::Extension::Print *module,
+ Geom::OptRect const &bbox) override;
+ unsigned int image(Inkscape::Extension::Print *module,
unsigned char *px,
unsigned int w,
unsigned int h,
unsigned int rs,
Geom::Affine const &transform,
- SPStyle const *style);
- virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment);
- virtual unsigned int text(Inkscape::Extension::Print *module, char const *text,
- Geom::Point const &p, SPStyle const *style);
+ SPStyle const *style) override;
+ unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override;
+ unsigned int text(Inkscape::Extension::Print *module, char const *text,
+ Geom::Point const &p, SPStyle const *style) override;
static void init (void);
protected:
@@ -77,10 +77,10 @@ protected:
Geom::Point get_pathrect_corner(Geom::Path pathRect, double angle, int corner);
U_TRIVERTEX make_trivertex(Geom::Point Pt, U_COLORREF uc);
int vector_rect_alignment(double angle, Geom::Point vtest);
- int create_brush(SPStyle const *style, PU_COLORREF fcolor);
- void destroy_brush();
- int create_pen(SPStyle const *style, const Geom::Affine &transform);
- void destroy_pen();
+ int create_brush(SPStyle const *style, PU_COLORREF fcolor) override;
+ void destroy_brush() override;
+ int create_pen(SPStyle const *style, const Geom::Affine &transform) override;
+ void destroy_pen() override;
};
} /* namespace Internal */
diff --git a/src/extension/internal/filter/bevels.h b/src/extension/internal/filter/bevels.h
index 68e94ad3d..91fe2f8cf 100644
--- a/src/extension/internal/filter/bevels.h
+++ b/src/extension/internal/filter/bevels.h
@@ -41,11 +41,11 @@ namespace Filter {
class DiffuseLight : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
DiffuseLight ( ) : Filter() { };
- virtual ~DiffuseLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~DiffuseLight ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -121,11 +121,11 @@ DiffuseLight::get_filter_text (Inkscape::Extension::Extension * ext)
class MatteJelly : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
MatteJelly ( ) : Filter() { };
- virtual ~MatteJelly ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~MatteJelly ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -205,11 +205,11 @@ MatteJelly::get_filter_text (Inkscape::Extension::Extension * ext)
class SpecularLight : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
SpecularLight ( ) : Filter() { };
- virtual ~SpecularLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~SpecularLight ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h
index 859fadb87..0956b23b6 100644
--- a/src/extension/internal/filter/blurs.h
+++ b/src/extension/internal/filter/blurs.h
@@ -42,11 +42,11 @@ namespace Filter {
class Blur : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Blur ( ) : Filter() { };
- virtual ~Blur ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Blur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -113,11 +113,11 @@ Blur::get_filter_text (Inkscape::Extension::Extension * ext)
class CleanEdges : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
CleanEdges ( ) : Filter() { };
- virtual ~CleanEdges ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~CleanEdges ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -173,11 +173,11 @@ CleanEdges::get_filter_text (Inkscape::Extension::Extension * ext)
class CrossBlur : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
CrossBlur ( ) : Filter() { };
- virtual ~CrossBlur ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~CrossBlur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -248,11 +248,11 @@ CrossBlur::get_filter_text (Inkscape::Extension::Extension * ext)
class Feather : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Feather ( ) : Filter() { };
- virtual ~Feather ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Feather ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -313,11 +313,11 @@ Feather::get_filter_text (Inkscape::Extension::Extension * ext)
class ImageBlur : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ImageBlur ( ) : Filter() { };
- virtual ~ImageBlur ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ImageBlur ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index cbda5ea35..95f6170f3 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -68,11 +68,11 @@ namespace Filter {
class Bump : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Bump ( ) : Filter() { };
- virtual ~Bump ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Bump ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -297,11 +297,11 @@ Bump::get_filter_text (Inkscape::Extension::Extension * ext)
class WaxBump : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
WaxBump ( ) : Filter() { };
- virtual ~WaxBump ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~WaxBump ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 921ff3171..063073267 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -62,11 +62,11 @@ namespace Filter {
*/
class Brilliance : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Brilliance ( ) : Filter() { };
- virtual ~Brilliance ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Brilliance ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -142,11 +142,11 @@ Brilliance::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class ChannelPaint : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ChannelPaint ( ) : Filter() { };
- virtual ~ChannelPaint ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ChannelPaint ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -243,11 +243,11 @@ ChannelPaint::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class ColorBlindness : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ColorBlindness ( ) : Filter() { };
- virtual ~ColorBlindness ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ColorBlindness ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -318,11 +318,11 @@ ColorBlindness::get_filter_text (Inkscape::Extension::Extension * ext)
class ColorShift : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ColorShift ( ) : Filter() { };
- virtual ~ColorShift ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ColorShift ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -381,11 +381,11 @@ ColorShift::get_filter_text (Inkscape::Extension::Extension * ext)
class Colorize : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Colorize ( ) : Filter() { };
- virtual ~Colorize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Colorize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -488,11 +488,11 @@ Colorize::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class ComponentTransfer : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ComponentTransfer ( ) : Filter() { };
- virtual ~ComponentTransfer ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ComponentTransfer ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -573,11 +573,11 @@ ComponentTransfer::get_filter_text (Inkscape::Extension::Extension * ext)
class Duochrome : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Duochrome ( ) : Filter() { };
- virtual ~Duochrome ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Duochrome ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -698,11 +698,11 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class ExtractChannel : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ExtractChannel ( ) : Filter() { };
- virtual ~ExtractChannel ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ExtractChannel ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -804,11 +804,11 @@ ExtractChannel::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class FadeToBW : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
FadeToBW ( ) : Filter() { };
- virtual ~FadeToBW ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~FadeToBW ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -883,11 +883,11 @@ FadeToBW::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class Greyscale : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Greyscale ( ) : Filter() { };
- virtual ~Greyscale ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Greyscale ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -969,11 +969,11 @@ Greyscale::get_filter_text (Inkscape::Extension::Extension * ext)
class Invert : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Invert ( ) : Filter() { };
- virtual ~Invert ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Invert ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1104,11 +1104,11 @@ Invert::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class Lighting : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Lighting ( ) : Filter() { };
- virtual ~Lighting ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Lighting ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1175,11 +1175,11 @@ Lighting::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class LightnessContrast : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
LightnessContrast ( ) : Filter() { };
- virtual ~LightnessContrast ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~LightnessContrast ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1254,11 +1254,11 @@ LightnessContrast::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class NudgeRGB : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
NudgeRGB ( ) : Filter() { };
- virtual ~NudgeRGB ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~NudgeRGB ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1366,11 +1366,11 @@ NudgeRGB::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class NudgeCMY : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
NudgeCMY ( ) : Filter() { };
- virtual ~NudgeCMY ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~NudgeCMY ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1472,11 +1472,11 @@ NudgeCMY::get_filter_text (Inkscape::Extension::Extension * ext)
class Quadritone : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Quadritone ( ) : Filter() { };
- virtual ~Quadritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Quadritone ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1555,11 +1555,11 @@ Quadritone::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class SimpleBlend : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
SimpleBlend ( ) : Filter() { };
- virtual ~SimpleBlend ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~SimpleBlend ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1641,11 +1641,11 @@ SimpleBlend::get_filter_text (Inkscape::Extension::Extension * ext)
class Solarize : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Solarize ( ) : Filter() { };
- virtual ~Solarize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Solarize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -1728,11 +1728,11 @@ Solarize::get_filter_text (Inkscape::Extension::Extension * ext)
class Tritone : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Tritone ( ) : Filter() { };
- virtual ~Tritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Tritone ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h
index 56aab51f5..6d1fc0a75 100644
--- a/src/extension/internal/filter/distort.h
+++ b/src/extension/internal/filter/distort.h
@@ -55,11 +55,11 @@ namespace Filter {
class FeltFeather : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
FeltFeather ( ) : Filter() { };
- virtual ~FeltFeather ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~FeltFeather ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -178,11 +178,11 @@ FeltFeather::get_filter_text (Inkscape::Extension::Extension * ext)
class Roughen : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Roughen ( ) : Filter() { };
- virtual ~Roughen ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Roughen ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index c18879430..07a7eb0af 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -78,9 +78,9 @@ void Filter::filters_all_files(void)
class mywriter : public Inkscape::IO::BasicWriter {
Glib::ustring _str;
public:
- void close(void);
- void flush(void);
- void put (gunichar ch);
+ void close(void) override;
+ void flush(void) override;
+ void put (gunichar ch) override;
gchar const * c_str (void) { return _str.c_str(); }
};
diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h
index 8fa086b69..ea4ae2302 100644
--- a/src/extension/internal/filter/filter.h
+++ b/src/extension/internal/filter/filter.h
@@ -42,11 +42,11 @@ private:
public:
Filter();
Filter(gchar const * filter);
- virtual ~Filter();
+ ~Filter() override;
- 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);
+ 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;
static void filter_init(gchar const * id, gchar const * name, gchar const * submenu, gchar const * tip, gchar const * filter);
static void filters_all(void);
diff --git a/src/extension/internal/filter/image.h b/src/extension/internal/filter/image.h
index 868588f80..9cbe05e2f 100644
--- a/src/extension/internal/filter/image.h
+++ b/src/extension/internal/filter/image.h
@@ -37,11 +37,11 @@ namespace Filter {
*/
class EdgeDetect : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
EdgeDetect ( ) : Filter() { };
- virtual ~EdgeDetect ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~EdgeDetect ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index e1785f7d3..025cca8fe 100644
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -46,11 +46,11 @@ namespace Filter {
class Crosssmooth : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Crosssmooth ( ) : Filter() { };
- virtual ~Crosssmooth ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Crosssmooth ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -154,11 +154,11 @@ Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext)
class Outline : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Outline ( ) : Filter() { };
- virtual ~Outline ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Outline ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h
index f6c0509c8..a0436e2ad 100644
--- a/src/extension/internal/filter/overlays.h
+++ b/src/extension/internal/filter/overlays.h
@@ -44,11 +44,11 @@ namespace Filter {
class NoiseFill : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
NoiseFill ( ) : Filter() { };
- virtual ~NoiseFill ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~NoiseFill ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index 43f4b6c90..653008fc6 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -59,11 +59,11 @@ namespace Filter {
*/
class Chromolitho : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Chromolitho ( ) : Filter() { };
- virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Chromolitho ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -220,11 +220,11 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class CrossEngraving : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
CrossEngraving ( ) : Filter() { };
- virtual ~CrossEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~CrossEngraving ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -319,11 +319,11 @@ CrossEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
class Drawing : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Drawing ( ) : Filter() { };
- virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Drawing ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -482,11 +482,11 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class Electrize : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Electrize ( ) : Filter() { };
- virtual ~Electrize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Electrize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -572,11 +572,11 @@ Electrize::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class NeonDraw : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
NeonDraw ( ) : Filter() { };
- virtual ~NeonDraw ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~NeonDraw ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -675,11 +675,11 @@ NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext)
class PointEngraving : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
PointEngraving ( ) : Filter() { };
- virtual ~PointEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~PointEngraving ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -838,11 +838,11 @@ PointEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class Posterize : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Posterize ( ) : Filter() { };
- virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Posterize ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -961,11 +961,11 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class PosterizeBasic : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
PosterizeBasic ( ) : Filter() { };
- virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~PosterizeBasic ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/protrusions.h b/src/extension/internal/filter/protrusions.h
index d6fd315db..c4cd2a688 100644
--- a/src/extension/internal/filter/protrusions.h
+++ b/src/extension/internal/filter/protrusions.h
@@ -35,11 +35,11 @@ namespace Filter {
*/
class Snow : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Snow ( ) : Filter() { };
- virtual ~Snow ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Snow ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
public:
static void init (void) {
diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h
index e69e05669..cca34e2a2 100644
--- a/src/extension/internal/filter/shadows.h
+++ b/src/extension/internal/filter/shadows.h
@@ -45,11 +45,11 @@ namespace Filter {
*/
class ColorizableDropShadow : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ColorizableDropShadow ( ) : Filter() { };
- virtual ~ColorizableDropShadow ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ColorizableDropShadow ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h
index a2584c627..39b1789b3 100644
--- a/src/extension/internal/filter/textures.h
+++ b/src/extension/internal/filter/textures.h
@@ -49,11 +49,11 @@ namespace Filter {
*/
class InkBlot : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
InkBlot ( ) : Filter() { };
- virtual ~InkBlot ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~InkBlot ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
public:
static void init (void) {
diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h
index da89498bb..b3498a638 100644
--- a/src/extension/internal/filter/transparency.h
+++ b/src/extension/internal/filter/transparency.h
@@ -41,11 +41,11 @@ namespace Filter {
class Blend : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Blend ( ) : Filter() { };
- virtual ~Blend ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Blend ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -118,11 +118,11 @@ Blend::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class ChannelTransparency : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
ChannelTransparency ( ) : Filter() { };
- virtual ~ChannelTransparency ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~ChannelTransparency ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -193,11 +193,11 @@ ChannelTransparency::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class LightEraser : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
LightEraser ( ) : Filter() { };
- virtual ~LightEraser ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~LightEraser ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -267,11 +267,11 @@ LightEraser::get_filter_text (Inkscape::Extension::Extension * ext)
*/
class Opacity : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Opacity ( ) : Filter() { };
- virtual ~Opacity ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Opacity ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
@@ -329,11 +329,11 @@ Opacity::get_filter_text (Inkscape::Extension::Extension * ext)
class Silhouette : public Inkscape::Extension::Internal::Filter::Filter {
protected:
- virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+ gchar const * get_filter_text (Inkscape::Extension::Extension * ext) override;
public:
Silhouette ( ) : Filter() { };
- virtual ~Silhouette ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+ ~Silhouette ( ) override { if (_filter != NULL) g_free((void *)_filter); return; }
static void init (void) {
Inkscape::Extension::build_from_mem(
diff --git a/src/extension/internal/gdkpixbuf-input.h b/src/extension/internal/gdkpixbuf-input.h
index 2e03a96db..347277e90 100644
--- a/src/extension/internal/gdkpixbuf-input.h
+++ b/src/extension/internal/gdkpixbuf-input.h
@@ -10,7 +10,7 @@ namespace Internal {
class GdkpixbufInput : Inkscape::Extension::Implementation::Implementation {
public:
SPDocument *open(Inkscape::Extension::Input *mod,
- char const *uri);
+ char const *uri) override;
static void init();
};
diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h
index c34de840d..790c43b75 100644
--- a/src/extension/internal/gimpgrad.h
+++ b/src/extension/internal/gimpgrad.h
@@ -25,9 +25,9 @@ namespace Internal {
class GimpGrad : public Inkscape::Extension::Implementation::Implementation
{
public:
- bool load(Inkscape::Extension::Extension *module);
- void unload(Inkscape::Extension::Extension *module);
- SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename);
+ bool load(Inkscape::Extension::Extension *module) override;
+ void unload(Inkscape::Extension::Extension *module) override;
+ SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename) override;
static void init();
};
diff --git a/src/extension/internal/grid.h b/src/extension/internal/grid.h
index c54135d81..7d25c7b20 100644
--- a/src/extension/internal/grid.h
+++ b/src/extension/internal/grid.h
@@ -23,9 +23,9 @@ namespace Internal {
class Grid : public Inkscape::Extension::Implementation::Implementation {
public:
- bool load(Inkscape::Extension::Extension *module);
- 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;
+ 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;
static void init (void);
};
diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h
index ec1cde032..f9d209b86 100644
--- a/src/extension/internal/javafx-out.h
+++ b/src/extension/internal/javafx-out.h
@@ -51,13 +51,13 @@ public:
/**
* Check whether we can actually output using this module
*/
- virtual bool check (Inkscape::Extension::Extension * module);
+ bool check (Inkscape::Extension::Extension * module) override;
/**
* API call to perform the output to a file
*/
- virtual void save(Inkscape::Extension::Output *mod,
- SPDocument *doc, gchar const *filename);
+ void save(Inkscape::Extension::Output *mod,
+ SPDocument *doc, gchar const *filename) override;
/**
* Inkscape runtime startup call.
diff --git a/src/extension/internal/latex-pstricks-out.h b/src/extension/internal/latex-pstricks-out.h
index a12cdc3c1..842a52655 100644
--- a/src/extension/internal/latex-pstricks-out.h
+++ b/src/extension/internal/latex-pstricks-out.h
@@ -22,13 +22,13 @@ class LatexOutput : Inkscape::Extension::Implementation::Implementation { //This
public:
LatexOutput(); // Empty constructor
- virtual ~LatexOutput();//Destructor
+ ~LatexOutput() override;//Destructor
- bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now)
+ bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now)
void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
static void init(void);//Initialize the class
};
diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h
index 5bc6eeb22..9b9519c55 100644
--- a/src/extension/internal/latex-pstricks.h
+++ b/src/extension/internal/latex-pstricks.h
@@ -38,28 +38,28 @@ class PrintLatex : public Inkscape::Extension::Implementation::Implementation {
public:
PrintLatex (void);
- virtual ~PrintLatex (void);
+ ~PrintLatex (void) override;
/* Print functions */
- virtual unsigned int setup (Inkscape::Extension::Print * module);
+ unsigned int setup (Inkscape::Extension::Print * module) override;
- virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
- virtual unsigned int finish (Inkscape::Extension::Print * module);
+ unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override;
+ unsigned int finish (Inkscape::Extension::Print * module) override;
/* Rendering methods */
- virtual unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity);
- virtual unsigned int release(Inkscape::Extension::Print *module);
+ unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity) override;
+ unsigned int release(Inkscape::Extension::Print *module) override;
- virtual unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv,
+ unsigned int fill (Inkscape::Extension::Print *module, Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int stroke (Inkscape::Extension::Print *module, Geom::PathVector const &pathv,
+ Geom::OptRect const &bbox) override;
+ unsigned int stroke (Inkscape::Extension::Print *module, Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment);
- bool textToPath (Inkscape::Extension::Print * ext);
+ Geom::OptRect const &bbox) override;
+ unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override;
+ bool textToPath (Inkscape::Extension::Print * ext) override;
static void init (void);
};
diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h
index fd6ef28a8..f8562839e 100644
--- a/src/extension/internal/metafile-inout.h
+++ b/src/extension/internal/metafile-inout.h
@@ -63,7 +63,7 @@ class Metafile
{
public:
Metafile() {}
- ~Metafile();
+ ~Metafile() override;
protected:
static uint32_t sethexcolor(U_COLORREF color);
diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h
index eac93cbda..156610657 100644
--- a/src/extension/internal/metafile-print.h
+++ b/src/extension/internal/metafile-print.h
@@ -49,11 +49,11 @@ class PrintMetafile
{
public:
PrintMetafile() {}
- ~PrintMetafile();
+ ~PrintMetafile() override;
- bool textToPath (Inkscape::Extension::Print * ext);
- unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity);
- unsigned int release(Inkscape::Extension::Print *module);
+ bool textToPath (Inkscape::Extension::Print * ext) override;
+ unsigned int bind(Inkscape::Extension::Print *module, Geom::Affine const &transform, float opacity) override;
+ unsigned int release(Inkscape::Extension::Print *module) override;
protected:
struct GRADVALUES {
diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h
index 2e01d2e49..1c1d7c6f6 100644
--- a/src/extension/internal/odf.h
+++ b/src/extension/internal/odf.h
@@ -266,11 +266,11 @@ class OdfOutput : public Inkscape::Extension::Implementation::Implementation
public:
- bool check (Inkscape::Extension::Extension * module);
+ bool check (Inkscape::Extension::Extension * module) override;
void save (Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
static void init (void);
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index a70d40a23..ae820946d 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -63,7 +63,7 @@ class PdfImportDialog : public Gtk::Dialog
{
public:
PdfImportDialog(PDFDoc *doc, const gchar *uri);
- virtual ~PdfImportDialog();
+ ~PdfImportDialog() override;
bool showDialog();
int getSelectedPage();
@@ -135,9 +135,9 @@ class PdfInput: public Inkscape::Extension::Implementation::Implementation {
PdfInput () { };
public:
SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ const gchar *uri ) override;
static void init( void );
- virtual bool wasCancelled();
+ bool wasCancelled() override;
private:
bool _cancelled;
};
diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h
index 3f7aa7e90..75ae0460d 100644
--- a/src/extension/internal/pov-out.h
+++ b/src/extension/internal/pov-out.h
@@ -54,13 +54,13 @@ public:
/**
* Check whether we can actually output using this module
*/
- bool check (Inkscape::Extension::Extension * module);
+ bool check (Inkscape::Extension::Extension * module) override;
/**
* API call to perform the output to a file
*/
void save(Inkscape::Extension::Output *mod,
- SPDocument *doc, gchar const *filename);
+ SPDocument *doc, gchar const *filename) override;
/**
* Inkscape runtime startup call.
diff --git a/src/extension/internal/svg.h b/src/extension/internal/svg.h
index b97735dd8..a7b593d54 100644
--- a/src/extension/internal/svg.h
+++ b/src/extension/internal/svg.h
@@ -24,11 +24,11 @@ namespace Internal {
class Svg : public Inkscape::Extension::Implementation::Implementation {
public:
- virtual void save( Inkscape::Extension::Output *mod,
+ void save( Inkscape::Extension::Output *mod,
SPDocument *doc,
- gchar const *filename );
- virtual SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ gchar const *filename ) override;
+ SPDocument *open( Inkscape::Extension::Input *mod,
+ const gchar *uri ) override;
static void init( void );
};
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 7c92a895d..b650e2876 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -66,7 +66,7 @@ namespace Internal {
class VsdImportDialog : public Gtk::Dialog {
public:
VsdImportDialog(const std::vector<RVNGString> &vec);
- virtual ~VsdImportDialog();
+ ~VsdImportDialog() override;
bool showDialog();
unsigned getSelectedPage();
diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h
index acc52debf..2cc20747a 100644
--- a/src/extension/internal/vsd-input.h
+++ b/src/extension/internal/vsd-input.h
@@ -31,7 +31,7 @@ class VsdInput : public Inkscape::Extension::Implementation::Implementation {
VsdInput () { };
public:
SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ const gchar *uri ) override;
static void init( void );
};
diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h
index 19cf53956..02280f6d8 100644
--- a/src/extension/internal/wmf-inout.h
+++ b/src/extension/internal/wmf-inout.h
@@ -172,16 +172,16 @@ class Wmf : public Metafile
public:
Wmf(); // Empty constructor
- virtual ~Wmf();//Destructor
+ ~Wmf() override;//Destructor
- bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now)
+ bool check(Inkscape::Extension::Extension *module) override; //Can this module load (always yes for now)
void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename
SPDocument *doc,
- gchar const *filename);
+ gchar const *filename) override;
- virtual SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ SPDocument *open( Inkscape::Extension::Input *mod,
+ const gchar *uri ) override;
static void init(void);//Initialize the class
diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h
index be35da717..c271e3cf7 100644
--- a/src/extension/internal/wmf-print.h
+++ b/src/extension/internal/wmf-print.h
@@ -37,41 +37,41 @@ public:
PrintWmf();
/* Print functions */
- virtual unsigned int setup (Inkscape::Extension::Print * module);
+ unsigned int setup (Inkscape::Extension::Print * module) override;
- virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
- virtual unsigned int finish (Inkscape::Extension::Print * module);
+ unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc) override;
+ unsigned int finish (Inkscape::Extension::Print * module) override;
/* Rendering methods */
- virtual unsigned int fill (Inkscape::Extension::Print *module,
+ unsigned int fill (Inkscape::Extension::Print *module,
Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int stroke (Inkscape::Extension::Print * module,
+ Geom::OptRect const &bbox) override;
+ unsigned int stroke (Inkscape::Extension::Print * module,
Geom::PathVector const &pathv,
Geom::Affine const &ctm, SPStyle const *style,
Geom::OptRect const &pbox, Geom::OptRect const &dbox,
- Geom::OptRect const &bbox);
- virtual unsigned int image(Inkscape::Extension::Print *module,
+ Geom::OptRect const &bbox) override;
+ unsigned int image(Inkscape::Extension::Print *module,
unsigned char *px,
unsigned int w,
unsigned int h,
unsigned int rs,
Geom::Affine const &transform,
- SPStyle const *style);
- virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment);
- virtual unsigned int text(Inkscape::Extension::Print *module, char const *text,
- Geom::Point const &p, SPStyle const *style);
+ SPStyle const *style) override;
+ unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override;
+ unsigned int text(Inkscape::Extension::Print *module, char const *text,
+ Geom::Point const &p, SPStyle const *style) override;
static void init (void);
protected:
static void smuggle_adxky_out(const char *string, int16_t **adx, double *ky, int *rtl, int *ndx, float scale);
- int create_brush(SPStyle const *style, PU_COLORREF fcolor);
- void destroy_brush();
- int create_pen(SPStyle const *style, const Geom::Affine &transform);
- void destroy_pen();
+ int create_brush(SPStyle const *style, PU_COLORREF fcolor) override;
+ void destroy_brush() override;
+ int create_pen(SPStyle const *style, const Geom::Affine &transform) override;
+ void destroy_pen() override;
};
} /* namespace Internal */
diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h
index ca882039b..4ee041eb9 100644
--- a/src/extension/internal/wpg-input.h
+++ b/src/extension/internal/wpg-input.h
@@ -25,7 +25,7 @@ class WpgInput : public Inkscape::Extension::Implementation::Implementation {
WpgInput () { };
public:
SPDocument *open( Inkscape::Extension::Input *mod,
- const gchar *uri );
+ const gchar *uri ) override;
static void init( void );
};