diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-15 17:02:56 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:01 +0000 |
| commit | 004e50d84773242a000f5cadb89466bbc793e1a8 (patch) | |
| tree | 019c32e65caa08fe7cf90b521787531a7b1d2225 /src/extension | |
| parent | Run clang-tidy’s modernize-use-nullptr pass. (diff) | |
| download | inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.tar.gz inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.zip | |
Run clang-tidy’s modernize-use-equals-default pass.
This replaces empty constructors and destructors with the default
keyword.
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/db.cpp | 3 | ||||
| -rw-r--r-- | src/extension/implementation/implementation.h | 4 | ||||
| -rw-r--r-- | src/extension/implementation/script.cpp | 3 | ||||
| -rw-r--r-- | src/extension/input.h | 6 | ||||
| -rw-r--r-- | src/extension/internal/cairo-renderer.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/cdr-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/cdr-input.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/metafile-inout.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/metafile-print.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/odf.h | 6 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.cpp | 3 | ||||
| -rw-r--r-- | src/extension/internal/pov-out.h | 4 | ||||
| -rw-r--r-- | src/extension/internal/vsd-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/vsd-input.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/wpg-input.h | 2 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 2 | ||||
| -rw-r--r-- | src/extension/patheffect.cpp | 4 | ||||
| -rw-r--r-- | src/extension/print.cpp | 2 |
19 files changed, 25 insertions, 30 deletions
diff --git a/src/extension/db.cpp b/src/extension/db.cpp index 8d6ad7e0e..caa23775d 100644 --- a/src/extension/db.cpp +++ b/src/extension/db.cpp @@ -32,8 +32,7 @@ DB db; /* Types */ -DB::DB (void) { -} +DB::DB (void) = default; struct ModuleInputCmp { diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index 52542064b..7658e5a83 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -70,9 +70,9 @@ public: class Implementation { public: // ----- Constructor / destructor ----- - Implementation() {} + Implementation() = default; - virtual ~Implementation() {} + virtual ~Implementation() = default; // ----- Basic functions for all Extension ----- virtual bool load(Inkscape::Extension::Extension * /*module*/) { return true; } diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index a8490fe73..90269c557 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -164,8 +164,7 @@ Script::Script() * \brief Destructor */ Script::~Script() -{ -} += default; diff --git a/src/extension/input.h b/src/extension/input.h index de3d9c0f8..426f77ccc 100644 --- a/src/extension/input.h +++ b/src/extension/input.h @@ -31,15 +31,15 @@ public: /* this is a hack for this release, this will be private shortly */ public: struct open_failed : public std::exception { - ~open_failed() throw() override {} + ~open_failed() throw() override = default; const char *what() const throw() override { return "Open failed"; } }; struct no_extension_found : public std::exception { - ~no_extension_found() throw() override {} + ~no_extension_found() throw() override = default; const char *what() const throw() override { return "No suitable input extension found"; } }; struct open_cancelled : public std::exception { - ~open_cancelled() throw() override {} + ~open_cancelled() throw() override = default; const char *what() const throw() override { return "Open was cancelled"; } }; diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 05605a9d9..eca17966e 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -101,7 +101,7 @@ namespace Extension { namespace Internal { CairoRenderer::CairoRenderer(void) -{} += default; CairoRenderer::~CairoRenderer(void) { diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index bf573cfac..e1f67dc85 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -164,7 +164,7 @@ CdrImportDialog::CdrImportDialog(const std::vector<RVNGString> &vec) _setPreviewPage(); } -CdrImportDialog::~CdrImportDialog() {} +CdrImportDialog::~CdrImportDialog() = default; bool CdrImportDialog::showDialog() { diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h index 9b7ef75db..25b9e8425 100644 --- a/src/extension/internal/cdr-input.h +++ b/src/extension/internal/cdr-input.h @@ -28,7 +28,7 @@ namespace Extension { namespace Internal { class CdrInput : public Inkscape::Extension::Implementation::Implementation { - CdrInput () { }; + CdrInput () = default;; public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index f8562839e..d3e870a25 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -62,7 +62,7 @@ class Metafile : public Inkscape::Extension::Implementation::Implementation { public: - Metafile() {} + Metafile() = default; ~Metafile() override; protected: diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index 156610657..6209d3f73 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -48,7 +48,7 @@ class PrintMetafile : public Inkscape::Extension::Implementation::Implementation { public: - PrintMetafile() {} + PrintMetafile() = default; ~PrintMetafile() override; bool textToPath (Inkscape::Extension::Print * ext) override; diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 1c1d7c6f6..e92bc1249 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -91,7 +91,7 @@ public: } virtual ~StyleInfo() - {} + = default; //used for eliminating duplicates in the styleTable bool equals(const StyleInfo &other) @@ -131,7 +131,7 @@ public: GradientStop(unsigned long rgbArg, double opacityArg) { rgb = rgbArg; opacity = opacityArg; } virtual ~GradientStop() - {} + = default; GradientStop(const GradientStop &other) { assign(other); } virtual GradientStop& operator=(const GradientStop &other) @@ -200,7 +200,7 @@ public: } virtual ~GradientInfo() - {} + = default; //used for eliminating duplicates in the styleTable bool equals(const GradientInfo &other) diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index ae820946d..4cf1d01a0 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -132,7 +132,7 @@ private: class PdfInput: public Inkscape::Extension::Implementation::Implementation { - PdfInput () { }; + PdfInput () = default;; public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 59481b9eb..c8e24a5e1 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -105,8 +105,7 @@ SvgBuilder::SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root) { _init(); } -SvgBuilder::~SvgBuilder() { -} +SvgBuilder::~SvgBuilder() = default; void SvgBuilder::_init() { _font_style = nullptr; diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h index 75ae0460d..f38027a4b 100644 --- a/src/extension/internal/pov-out.h +++ b/src/extension/internal/pov-out.h @@ -139,13 +139,13 @@ private: { public: PovShapeInfo() - {} + = default; PovShapeInfo(const PovShapeInfo &other) { assign(other); } PovShapeInfo& operator=(const PovShapeInfo &other) { assign(other); return *this; } virtual ~PovShapeInfo() - {} + = default; String id; String color; diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 765e67648..e4982a02c 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -164,7 +164,7 @@ VsdImportDialog::VsdImportDialog(const std::vector<RVNGString> &vec) _setPreviewPage(); } -VsdImportDialog::~VsdImportDialog() {} +VsdImportDialog::~VsdImportDialog() = default; bool VsdImportDialog::showDialog() { diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h index 2cc20747a..5d8daddb2 100644 --- a/src/extension/internal/vsd-input.h +++ b/src/extension/internal/vsd-input.h @@ -28,7 +28,7 @@ namespace Extension { namespace Internal { class VsdInput : public Inkscape::Extension::Implementation::Implementation { - VsdInput () { }; + VsdInput () = default;; public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h index 4ee041eb9..92404a9e7 100644 --- a/src/extension/internal/wpg-input.h +++ b/src/extension/internal/wpg-input.h @@ -22,7 +22,7 @@ namespace Extension { namespace Internal { class WpgInput : public Inkscape::Extension::Implementation::Implementation { - WpgInput () { }; + WpgInput () = default;; public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 45869378a..4a479687b 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -237,7 +237,7 @@ public: { this->signal_changed().connect(sigc::mem_fun(this, &ComboWdg::changed)); } - ~ComboWdg() override {} + ~ComboWdg() override = default; void changed (void); }; diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp index 82d75dcb3..34c2be075 100644 --- a/src/extension/patheffect.cpp +++ b/src/extension/patheffect.cpp @@ -24,9 +24,7 @@ PathEffect::PathEffect (Inkscape::XML::Node * in_repr, Implementation::Implement } PathEffect::~PathEffect (void) -{ - -} += default; void PathEffect::processPath (SPDocument * /*doc*/, Inkscape::XML::Node * /*path*/, Inkscape::XML::Node * /*def*/) diff --git a/src/extension/print.cpp b/src/extension/print.cpp index ad9836a66..7337f77fb 100644 --- a/src/extension/print.cpp +++ b/src/extension/print.cpp @@ -25,7 +25,7 @@ Print::Print (Inkscape::XML::Node *in_repr, Implementation::Implementation *in_i } Print::~Print () -{} += default; bool Print::check () |
