summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 17:02:56 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commit004e50d84773242a000f5cadb89466bbc793e1a8 (patch)
tree019c32e65caa08fe7cf90b521787531a7b1d2225
parentRun clang-tidy’s modernize-use-nullptr pass. (diff)
downloadinkscape-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.
-rw-r--r--src/cms-color-types.h6
-rw-r--r--src/composite-undo-stack-observer.cpp2
-rw-r--r--src/console-output-undo-observer.h2
-rw-r--r--src/debug/event.h4
-rw-r--r--src/debug/heap.h2
-rw-r--r--src/debug/sysv-heap.h2
-rw-r--r--src/desktop.cpp3
-rw-r--r--src/device-manager.cpp7
-rw-r--r--src/display/curve.cpp3
-rw-r--r--src/display/drawing-text.cpp2
-rw-r--r--src/display/nr-filter-blend.cpp2
-rw-r--r--src/display/nr-filter-colormatrix.cpp5
-rw-r--r--src/display/nr-filter-component-transfer.cpp5
-rw-r--r--src/display/nr-filter-composite.cpp2
-rw-r--r--src/display/nr-filter-convolve-matrix.cpp4
-rw-r--r--src/display/nr-filter-diffuselighting.cpp2
-rw-r--r--src/display/nr-filter-displacement-map.cpp4
-rw-r--r--src/display/nr-filter-flood.cpp4
-rw-r--r--src/display/nr-filter-merge.cpp2
-rw-r--r--src/display/nr-filter-morphology.cpp5
-rw-r--r--src/display/nr-filter-offset.cpp2
-rw-r--r--src/display/nr-filter-specularlighting.cpp2
-rw-r--r--src/display/nr-filter-tile.cpp5
-rw-r--r--src/display/nr-filter-units.cpp13
-rw-r--r--src/display/nr-light.cpp6
-rw-r--r--src/extension/db.cpp3
-rw-r--r--src/extension/implementation/implementation.h4
-rw-r--r--src/extension/implementation/script.cpp3
-rw-r--r--src/extension/input.h6
-rw-r--r--src/extension/internal/cairo-renderer.cpp2
-rw-r--r--src/extension/internal/cdr-input.cpp2
-rw-r--r--src/extension/internal/cdr-input.h2
-rw-r--r--src/extension/internal/metafile-inout.h2
-rw-r--r--src/extension/internal/metafile-print.h2
-rw-r--r--src/extension/internal/odf.h6
-rw-r--r--src/extension/internal/pdfinput/pdf-input.h2
-rw-r--r--src/extension/internal/pdfinput/svg-builder.cpp3
-rw-r--r--src/extension/internal/pov-out.h4
-rw-r--r--src/extension/internal/vsd-input.cpp2
-rw-r--r--src/extension/internal/vsd-input.h2
-rw-r--r--src/extension/internal/wpg-input.h2
-rw-r--r--src/extension/param/radiobutton.cpp2
-rw-r--r--src/extension/patheffect.cpp4
-rw-r--r--src/extension/print.cpp2
-rw-r--r--src/gc-anchored.h2
-rw-r--r--src/helper/geom-satellite.cpp4
-rw-r--r--src/inkgc/gc-alloc.h2
-rw-r--r--src/inkscape.cpp2
-rw-r--r--src/io/bufferstream.cpp7
-rw-r--r--src/io/inkscapestream.h26
-rw-r--r--src/io/stringstream.cpp10
-rw-r--r--src/libnrtype/FontFactory.h2
-rw-r--r--src/libnrtype/Layout-TNG-Scanline-Maker.h2
-rw-r--r--src/libnrtype/Layout-TNG-Scanline-Makers.cpp3
-rw-r--r--src/libnrtype/Layout-TNG.h2
-rw-r--r--src/libnrtype/OpenTypeUtil.h2
-rw-r--r--src/line-geometry.cpp18
-rw-r--r--src/line-geometry.h2
-rw-r--r--src/livarot/float-line.cpp3
-rw-r--r--src/livarot/path-description.h2
-rw-r--r--src/live_effects/effect.cpp3
-rw-r--r--src/live_effects/lpe-angle_bisector.cpp3
-rw-r--r--src/live_effects/lpe-attach-path.cpp4
-rw-r--r--src/live_effects/lpe-bendpath.cpp4
-rw-r--r--src/live_effects/lpe-bool.cpp4
-rw-r--r--src/live_effects/lpe-bounding-box.cpp4
-rw-r--r--src/live_effects/lpe-bspline.cpp2
-rw-r--r--src/live_effects/lpe-circle_3pts.cpp3
-rw-r--r--src/live_effects/lpe-circle_with_radius.cpp4
-rw-r--r--src/live_effects/lpe-constructgrid.cpp4
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp4
-rw-r--r--src/live_effects/lpe-curvestitch.cpp4
-rw-r--r--src/live_effects/lpe-dash-stroke.cpp2
-rw-r--r--src/live_effects/lpe-dynastroke.cpp4
-rw-r--r--src/live_effects/lpe-ellipse_5pts.cpp3
-rw-r--r--src/live_effects/lpe-embrodery-stitch.cpp4
-rw-r--r--src/live_effects/lpe-envelope.cpp4
-rw-r--r--src/live_effects/lpe-extrude.cpp4
-rw-r--r--src/live_effects/lpe-fill-between-many.cpp4
-rw-r--r--src/live_effects/lpe-fill-between-strokes.cpp4
-rw-r--r--src/live_effects/lpe-gears.cpp4
-rw-r--r--src/live_effects/lpe-interpolate.cpp4
-rw-r--r--src/live_effects/lpe-interpolate_points.cpp3
-rw-r--r--src/live_effects/lpe-jointype.cpp3
-rw-r--r--src/live_effects/lpe-knot.cpp4
-rw-r--r--src/live_effects/lpe-lattice.cpp4
-rw-r--r--src/live_effects/lpe-lattice2.cpp3
-rw-r--r--src/live_effects/lpe-line_segment.cpp4
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp3
-rw-r--r--src/live_effects/lpe-offset.cpp3
-rw-r--r--src/live_effects/lpe-parallel.cpp4
-rw-r--r--src/live_effects/lpe-path_length.cpp4
-rw-r--r--src/live_effects/lpe-patternalongpath.cpp4
-rw-r--r--src/live_effects/lpe-perp_bisector.cpp3
-rw-r--r--src/live_effects/lpe-perspective-envelope.cpp3
-rw-r--r--src/live_effects/lpe-perspective_path.cpp4
-rw-r--r--src/live_effects/lpe-powerclip.cpp2
-rw-r--r--src/live_effects/lpe-powermask.cpp2
-rw-r--r--src/live_effects/lpe-powerstroke-interpolators.h24
-rw-r--r--src/live_effects/lpe-powerstroke.cpp4
-rw-r--r--src/live_effects/lpe-pts2ellipse.cpp3
-rw-r--r--src/live_effects/lpe-recursiveskeleton.cpp4
-rw-r--r--src/live_effects/lpe-rough-hatches.cpp4
-rw-r--r--src/live_effects/lpe-roughen.cpp2
-rw-r--r--src/live_effects/lpe-ruler.cpp4
-rw-r--r--src/live_effects/lpe-show_handles.h2
-rw-r--r--src/live_effects/lpe-simplify.cpp2
-rw-r--r--src/live_effects/lpe-skeleton.cpp4
-rw-r--r--src/live_effects/lpe-sketch.cpp4
-rw-r--r--src/live_effects/lpe-spiro.cpp3
-rw-r--r--src/live_effects/lpe-tangent_to_curve.cpp3
-rw-r--r--src/live_effects/lpe-taperstroke.h2
-rw-r--r--src/live_effects/lpe-test-doEffect-stack.cpp4
-rw-r--r--src/live_effects/lpe-text_label.cpp4
-rw-r--r--src/live_effects/lpe-transform_2pts.cpp3
-rw-r--r--src/live_effects/lpe-vonkoch.cpp4
-rw-r--r--src/live_effects/lpe-vonkoch.h4
-rw-r--r--src/live_effects/lpeobject.cpp3
-rw-r--r--src/live_effects/parameter/array.h4
-rw-r--r--src/live_effects/parameter/bool.cpp3
-rw-r--r--src/live_effects/parameter/colorpicker.h2
-rw-r--r--src/live_effects/parameter/enum.h2
-rw-r--r--src/live_effects/parameter/fontbutton.h2
-rw-r--r--src/live_effects/parameter/hidden.h2
-rw-r--r--src/live_effects/parameter/message.h2
-rw-r--r--src/live_effects/parameter/originalitem.cpp4
-rw-r--r--src/live_effects/parameter/originalitemarray.cpp2
-rw-r--r--src/live_effects/parameter/originalpath.cpp4
-rw-r--r--src/live_effects/parameter/originalpatharray.cpp2
-rw-r--r--src/live_effects/parameter/parameter.cpp3
-rw-r--r--src/live_effects/parameter/parameter.h2
-rw-r--r--src/live_effects/parameter/powerstrokepointarray.cpp3
-rw-r--r--src/live_effects/parameter/powerstrokepointarray.h2
-rw-r--r--src/live_effects/parameter/random.cpp3
-rw-r--r--src/live_effects/parameter/text.h2
-rw-r--r--src/live_effects/parameter/transformedpoint.cpp6
-rw-r--r--src/live_effects/parameter/unit.cpp3
-rw-r--r--src/live_effects/parameter/vector.cpp8
-rw-r--r--src/live_effects/spiro-converters.h4
-rw-r--r--src/object/box3d-side.cpp3
-rw-r--r--src/object/box3d.cpp3
-rw-r--r--src/object/color-profile.cpp6
-rw-r--r--src/object/filters/blend.cpp3
-rw-r--r--src/object/filters/colormatrix.cpp3
-rw-r--r--src/object/filters/componenttransfer-funcnode.cpp3
-rw-r--r--src/object/filters/componenttransfer.cpp3
-rw-r--r--src/object/filters/composite.cpp3
-rw-r--r--src/object/filters/convolvematrix.cpp3
-rw-r--r--src/object/filters/diffuselighting.cpp3
-rw-r--r--src/object/filters/displacementmap.cpp3
-rw-r--r--src/object/filters/distantlight.cpp3
-rw-r--r--src/object/filters/flood.cpp3
-rw-r--r--src/object/filters/gaussian-blur.cpp3
-rw-r--r--src/object/filters/image.cpp3
-rw-r--r--src/object/filters/merge.cpp3
-rw-r--r--src/object/filters/mergenode.cpp3
-rw-r--r--src/object/filters/morphology.cpp3
-rw-r--r--src/object/filters/offset.cpp3
-rw-r--r--src/object/filters/pointlight.cpp3
-rw-r--r--src/object/filters/sp-filter-primitive.cpp3
-rw-r--r--src/object/filters/specularlighting.cpp3
-rw-r--r--src/object/filters/spotlight.cpp3
-rw-r--r--src/object/filters/tile.cpp3
-rw-r--r--src/object/filters/turbulence.cpp3
-rw-r--r--src/object/persp3d.cpp3
-rw-r--r--src/object/sp-anchor.cpp3
-rw-r--r--src/object/sp-clippath.cpp3
-rw-r--r--src/object/sp-defs.cpp3
-rw-r--r--src/object/sp-desc.cpp3
-rw-r--r--src/object/sp-ellipse.cpp3
-rw-r--r--src/object/sp-filter.cpp3
-rw-r--r--src/object/sp-flowdiv.cpp15
-rw-r--r--src/object/sp-flowtext.cpp3
-rw-r--r--src/object/sp-font-face.cpp3
-rw-r--r--src/object/sp-font.cpp3
-rw-r--r--src/object/sp-glyph-kerning.h6
-rw-r--r--src/object/sp-glyph.h2
-rw-r--r--src/object/sp-gradient.cpp3
-rw-r--r--src/object/sp-guide.h2
-rw-r--r--src/object/sp-hatch-path.cpp3
-rw-r--r--src/object/sp-hatch.cpp6
-rw-r--r--src/object/sp-image.cpp3
-rw-r--r--src/object/sp-item-group.cpp3
-rw-r--r--src/object/sp-item.cpp3
-rw-r--r--src/object/sp-line.cpp3
-rw-r--r--src/object/sp-linear-gradient.cpp3
-rw-r--r--src/object/sp-lpe-item.cpp3
-rw-r--r--src/object/sp-marker.cpp5
-rw-r--r--src/object/sp-mask.cpp3
-rw-r--r--src/object/sp-mesh-patch.cpp3
-rw-r--r--src/object/sp-mesh-row.cpp3
-rw-r--r--src/object/sp-metadata.cpp3
-rw-r--r--src/object/sp-missing-glyph.cpp3
-rw-r--r--src/object/sp-namedview.cpp3
-rw-r--r--src/object/sp-object-group.cpp3
-rw-r--r--src/object/sp-paint-server.cpp3
-rw-r--r--src/object/sp-path.cpp3
-rw-r--r--src/object/sp-pattern.cpp2
-rw-r--r--src/object/sp-polygon.cpp3
-rw-r--r--src/object/sp-polyline.cpp3
-rw-r--r--src/object/sp-radial-gradient.cpp3
-rw-r--r--src/object/sp-rect.cpp3
-rw-r--r--src/object/sp-root.cpp3
-rw-r--r--src/object/sp-script.cpp3
-rw-r--r--src/object/sp-solid-color.cpp3
-rw-r--r--src/object/sp-spiral.cpp3
-rw-r--r--src/object/sp-star.cpp3
-rw-r--r--src/object/sp-stop.cpp3
-rw-r--r--src/object/sp-string.cpp3
-rw-r--r--src/object/sp-style-elem.cpp3
-rw-r--r--src/object/sp-symbol.cpp3
-rw-r--r--src/object/sp-tag.h4
-rw-r--r--src/object/sp-text.cpp3
-rw-r--r--src/object/sp-title.cpp3
-rw-r--r--src/object/sp-tspan.cpp3
-rw-r--r--src/preferences.cpp2
-rw-r--r--src/preferences.h6
-rw-r--r--src/pure-transform.h16
-rw-r--r--src/resource-manager.cpp6
-rw-r--r--src/snap-candidate.h6
-rw-r--r--src/snapped-curve.cpp3
-rw-r--r--src/snapped-line.cpp6
-rw-r--r--src/snapped-point.cpp3
-rw-r--r--src/snapper.h2
-rw-r--r--src/style-internal.h134
-rw-r--r--src/text-tag-attributes.h2
-rw-r--r--src/trace/siox.cpp10
-rw-r--r--src/trace/siox.h6
-rw-r--r--src/trace/trace.cpp2
-rw-r--r--src/trace/trace.h8
-rw-r--r--src/ui/cache/svg_preview_cache.cpp3
-rw-r--r--src/ui/clipboard.cpp6
-rw-r--r--src/ui/contextmenu.cpp3
-rw-r--r--src/ui/control-manager.cpp7
-rw-r--r--src/ui/dialog/align-and-distribute.cpp6
-rw-r--r--src/ui/dialog/align-and-distribute.h2
-rw-r--r--src/ui/dialog/arrange-tab.h4
-rw-r--r--src/ui/dialog/behavior.h2
-rw-r--r--src/ui/dialog/calligraphic-profile-rename.h2
-rw-r--r--src/ui/dialog/color-item.cpp3
-rw-r--r--src/ui/dialog/debug.cpp3
-rw-r--r--src/ui/dialog/debug.h4
-rw-r--r--src/ui/dialog/dock-behavior.cpp3
-rw-r--r--src/ui/dialog/extension-editor.cpp3
-rw-r--r--src/ui/dialog/filedialog.h8
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.cpp9
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.h4
-rw-r--r--src/ui/dialog/filter-editor.cpp2
-rw-r--r--src/ui/dialog/font-substitution.cpp6
-rw-r--r--src/ui/dialog/grid-arrange-tab.h2
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp3
-rw-r--r--src/ui/dialog/inkscape-preferences.h3
-rw-r--r--src/ui/dialog/input.cpp9
-rw-r--r--src/ui/dialog/input.h2
-rw-r--r--src/ui/dialog/layer-properties.h4
-rw-r--r--src/ui/dialog/layers.cpp2
-rw-r--r--src/ui/dialog/livepatheffect-add.h4
-rw-r--r--src/ui/dialog/livepatheffect-editor.h2
-rw-r--r--src/ui/dialog/messages.cpp3
-rw-r--r--src/ui/dialog/objects.cpp2
-rw-r--r--src/ui/dialog/ocaldialogs.h2
-rw-r--r--src/ui/dialog/panel-dialog.h6
-rw-r--r--src/ui/dialog/pixelartdialog.h2
-rw-r--r--src/ui/dialog/polar-arrange-tab.h2
-rw-r--r--src/ui/dialog/spellcheck.h2
-rw-r--r--src/ui/dialog/styledialog.cpp5
-rw-r--r--src/ui/dialog/svg-fonts-dialog.cpp5
-rw-r--r--src/ui/dialog/tags.cpp2
-rw-r--r--src/ui/dialog/template-load-tab.cpp3
-rw-r--r--src/ui/dialog/tile.h2
-rw-r--r--src/ui/dialog/tracedialog.h2
-rw-r--r--src/ui/dialog/undo-history.h2
-rw-r--r--src/ui/previewable.h2
-rw-r--r--src/ui/previewholder.cpp3
-rw-r--r--src/ui/selected-color.cpp4
-rw-r--r--src/ui/selected-color.h3
-rw-r--r--src/ui/shape-editor-knotholders.cpp16
-rw-r--r--src/ui/tool/manipulator.h2
-rw-r--r--src/ui/tools/dropper-tool.cpp3
-rw-r--r--src/ui/tools/eraser-tool.cpp3
-rw-r--r--src/ui/tools/zoom-tool.cpp3
-rw-r--r--src/ui/uxmanager.cpp9
-rw-r--r--src/ui/view/edit-widget-interface.h4
-rw-r--r--src/ui/widget/addtoicon.h2
-rw-r--r--src/ui/widget/attr-widget.h2
-rw-r--r--src/ui/widget/clipmaskicon.h2
-rw-r--r--src/ui/widget/color-scales.cpp2
-rw-r--r--src/ui/widget/highlight-picker.cpp3
-rw-r--r--src/ui/widget/imagetoggler.h2
-rw-r--r--src/ui/widget/ink-spinscale.h4
-rw-r--r--src/ui/widget/insertordericon.h2
-rw-r--r--src/ui/widget/layertypeicon.h2
-rw-r--r--src/ui/widget/page-sizer.cpp3
-rw-r--r--src/ui/widget/page-sizer.h2
-rw-r--r--src/ui/widget/panel.cpp3
-rw-r--r--src/ui/widget/preferences-widget.h2
-rw-r--r--src/ui/widget/registered-widget.h2
-rw-r--r--src/ui/widget/registry.cpp2
-rw-r--r--src/ui/widget/rotateable.cpp3
-rw-r--r--src/ui/widget/selected-style.cpp6
-rw-r--r--src/ui/widget/spinbutton.h2
-rw-r--r--src/ui/widget/style-subject.cpp9
-rw-r--r--src/ui/widget/unit-menu.cpp3
-rw-r--r--src/undo-stack-observer.h4
-rw-r--r--src/util/ege-tags.cpp9
-rw-r--r--src/util/expression-evaluator.h2
-rw-r--r--src/util/fixed_point.h2
-rw-r--r--src/util/forward-pointer-iterator.h2
-rw-r--r--src/util/list-container.h2
-rw-r--r--src/util/list.h4
-rw-r--r--src/util/share.h7
-rw-r--r--src/util/units.cpp2
-rw-r--r--src/util/ziptool.cpp19
-rw-r--r--src/vanishing-point.h7
-rw-r--r--src/widgets/desktop-widget.cpp2
-rw-r--r--src/widgets/ege-paint-def.cpp3
-rw-r--r--src/widgets/gradient-selector.h2
-rw-r--r--src/widgets/sp-color-selector.cpp3
-rw-r--r--src/widgets/sp-widget.cpp3
-rw-r--r--src/widgets/toolbox.cpp3
-rw-r--r--src/xml/event.h2
-rw-r--r--src/xml/node-observer.h4
-rw-r--r--src/xml/node.h4
323 files changed, 485 insertions, 848 deletions
diff --git a/src/cms-color-types.h b/src/cms-color-types.h
index b94c96029..0a49a1d21 100644
--- a/src/cms-color-types.h
+++ b/src/cms-color-types.h
@@ -58,7 +58,7 @@ namespace Inkscape {
*/
class FourCCSig {
public:
- FourCCSig( FourCCSig const &other ) : value(other.value) {};
+ FourCCSig( FourCCSig const &other ) = default;
protected:
FourCCSig( guint32 value ) : value(value) {};
@@ -68,7 +68,7 @@ protected:
class ColorSpaceSig : public FourCCSig {
public:
- ColorSpaceSig( ColorSpaceSig const &other ) : FourCCSig(other) {};
+ ColorSpaceSig( ColorSpaceSig const &other ) = default;
protected:
ColorSpaceSig( guint32 value ) : FourCCSig(value) {};
@@ -76,7 +76,7 @@ protected:
class ColorProfileClassSig : public FourCCSig {
public:
- ColorProfileClassSig( ColorProfileClassSig const &other ) : FourCCSig(other) {};
+ ColorProfileClassSig( ColorProfileClassSig const &other ) = default;
protected:
ColorProfileClassSig( guint32 value ) : FourCCSig(value) {};
diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp
index 81a0b27c7..621ab4306 100644
--- a/src/composite-undo-stack-observer.cpp
+++ b/src/composite-undo-stack-observer.cpp
@@ -17,7 +17,7 @@
namespace Inkscape {
CompositeUndoStackObserver::CompositeUndoStackObserver() : _iterating(0) { }
-CompositeUndoStackObserver::~CompositeUndoStackObserver() { }
+CompositeUndoStackObserver::~CompositeUndoStackObserver() = default;
void
CompositeUndoStackObserver::add(UndoStackObserver& observer)
diff --git a/src/console-output-undo-observer.h b/src/console-output-undo-observer.h
index 09eab5868..675706e08 100644
--- a/src/console-output-undo-observer.h
+++ b/src/console-output-undo-observer.h
@@ -23,7 +23,7 @@ namespace Inkscape {
class ConsoleOutputUndoObserver : public UndoStackObserver {
public:
ConsoleOutputUndoObserver() : UndoStackObserver() { }
- ~ConsoleOutputUndoObserver() override { }
+ ~ConsoleOutputUndoObserver() override = default;
void notifyUndoEvent(Event* log) override;
void notifyRedoEvent(Event* log) override;
diff --git a/src/debug/event.h b/src/debug/event.h
index 2d3751ff5..1ddcb8b55 100644
--- a/src/debug/event.h
+++ b/src/debug/event.h
@@ -21,7 +21,7 @@ namespace Debug {
class Event {
public:
- virtual ~Event() {}
+ virtual ~Event() = default;
enum Category {
CORE=0,
@@ -39,7 +39,7 @@ public:
struct PropertyPair {
public:
- PropertyPair() {}
+ PropertyPair() = default;
PropertyPair(Util::ptr_shared n, Util::ptr_shared v)
: name(n), value(v) {}
PropertyPair(char const *n, Util::ptr_shared v)
diff --git a/src/debug/heap.h b/src/debug/heap.h
index d7d39efb9..959578893 100644
--- a/src/debug/heap.h
+++ b/src/debug/heap.h
@@ -21,7 +21,7 @@ namespace Debug {
class Heap {
public:
- virtual ~Heap() {}
+ virtual ~Heap() = default;
struct Stats {
std::size_t size;
diff --git a/src/debug/sysv-heap.h b/src/debug/sysv-heap.h
index baab0af5f..6f95b74c4 100644
--- a/src/debug/sysv-heap.h
+++ b/src/debug/sysv-heap.h
@@ -19,7 +19,7 @@ namespace Debug {
class SysVHeap : public Heap {
public:
- SysVHeap() {}
+ SysVHeap() = default;
int features() const override;
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 8e71d0d5a..ad75a441d 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -379,8 +379,7 @@ void SPDesktop::destroy()
}
SPDesktop::~SPDesktop()
-{
-}
+= default;
Inkscape::UI::Tools::ToolBase* SPDesktop::getEventContext() const {
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index cbc67238e..da85860c2 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -163,12 +163,12 @@ InputDevice::InputDevice()
: Glib::Object()
{}
-InputDevice::~InputDevice() {}
+InputDevice::~InputDevice() = default;
class InputDeviceImpl : public InputDevice {
public:
InputDeviceImpl(Glib::RefPtr<Gdk::Device> device, std::set<Glib::ustring> &knownIDs);
- ~InputDeviceImpl() override {}
+ ~InputDeviceImpl() override = default;
Glib::ustring getId() const override {return id;}
Glib::ustring getName() const override {return name;}
@@ -611,8 +611,7 @@ DeviceManager::DeviceManager()
{
}
-DeviceManager::~DeviceManager() {
-}
+DeviceManager::~DeviceManager() = default;
DeviceManager& DeviceManager::getManager() {
if ( !theInstance ) {
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index e424fee05..ca7666ee0 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -73,8 +73,7 @@ SPCurve::new_from_rect(Geom::Rect const &rect, bool all_four_sides)
}
SPCurve::~SPCurve()
-{
-}
+= default;
/* Methods */
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index a51e00606..edfd5eca2 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -205,7 +205,7 @@ DrawingText::DrawingText(Drawing &drawing)
{}
DrawingText::~DrawingText()
-{}
+= default;
void
DrawingText::clear()
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 49dfc7ec4..8ee05dda4 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -53,7 +53,7 @@ FilterPrimitive * FilterBlend::create() {
}
FilterBlend::~FilterBlend()
-{}
+= default;
static inline cairo_operator_t get_cairo_op(FilterBlendMode _blend_mode)
{
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 5f477ae9b..e50536ff5 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -22,15 +22,14 @@ namespace Inkscape {
namespace Filters {
FilterColorMatrix::FilterColorMatrix()
-{
-}
+= default;
FilterPrimitive * FilterColorMatrix::create() {
return new FilterColorMatrix();
}
FilterColorMatrix::~FilterColorMatrix()
-{}
+= default;
FilterColorMatrix::ColorMatrixMatrix::ColorMatrixMatrix(std::vector<double> const &values) {
unsigned limit = std::min(static_cast<size_t>(20), values.size());
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index b2545b76f..e796d1792 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -20,15 +20,14 @@ namespace Inkscape {
namespace Filters {
FilterComponentTransfer::FilterComponentTransfer()
-{
-}
+= default;
FilterPrimitive * FilterComponentTransfer::create() {
return new FilterComponentTransfer();
}
FilterComponentTransfer::~FilterComponentTransfer()
-{}
+= default;
struct UnmultiplyAlpha {
guint32 operator()(guint32 in) {
diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp
index 04f81f857..0eabde3ae 100644
--- a/src/display/nr-filter-composite.cpp
+++ b/src/display/nr-filter-composite.cpp
@@ -30,7 +30,7 @@ FilterPrimitive * FilterComposite::create() {
}
FilterComposite::~FilterComposite()
-{}
+= default;
struct ComposeArithmetic {
ComposeArithmetic(double k1, double k2, double k3, double k4)
diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index 2aad528a6..3ab5f74f7 100644
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -22,14 +22,14 @@ namespace Inkscape {
namespace Filters {
FilterConvolveMatrix::FilterConvolveMatrix()
-{}
+= default;
FilterPrimitive * FilterConvolveMatrix::create() {
return new FilterConvolveMatrix();
}
FilterConvolveMatrix::~FilterConvolveMatrix()
-{}
+= default;
enum PreserveAlphaMode {
PRESERVE_ALPHA,
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index ed5afa82a..183f76676 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -40,7 +40,7 @@ FilterPrimitive * FilterDiffuseLighting::create() {
}
FilterDiffuseLighting::~FilterDiffuseLighting()
-{}
+= default;
struct DiffuseLight : public SurfaceSynth {
DiffuseLight(cairo_surface_t *bumpmap, double scale, double kd)
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index fb2f3a0f0..18b6c2810 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -19,14 +19,14 @@ namespace Inkscape {
namespace Filters {
FilterDisplacementMap::FilterDisplacementMap()
-{}
+= default;
FilterPrimitive * FilterDisplacementMap::create() {
return new FilterDisplacementMap();
}
FilterDisplacementMap::~FilterDisplacementMap()
-{}
+= default;
struct Displace {
Displace(cairo_surface_t *texture, cairo_surface_t *map,
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index d1fe3e13f..463b7e0c3 100644
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -25,14 +25,14 @@ namespace Inkscape {
namespace Filters {
FilterFlood::FilterFlood()
-{}
+= default;
FilterPrimitive * FilterFlood::create() {
return new FilterFlood();
}
FilterFlood::~FilterFlood()
-{}
+= default;
void FilterFlood::render_cairo(FilterSlot &slot)
{
diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp
index 316df84f0..1dc8bad82 100644
--- a/src/display/nr-filter-merge.cpp
+++ b/src/display/nr-filter-merge.cpp
@@ -27,7 +27,7 @@ FilterPrimitive * FilterMerge::create() {
}
FilterMerge::~FilterMerge()
-{}
+= default;
void FilterMerge::render_cairo(FilterSlot &slot)
{
diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index a06033e80..22b73228e 100644
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -23,15 +23,14 @@ namespace Inkscape {
namespace Filters {
FilterMorphology::FilterMorphology()
-{
-}
+= default;
FilterPrimitive * FilterMorphology::create() {
return new FilterMorphology();
}
FilterMorphology::~FilterMorphology()
-{}
+= default;
enum MorphologyOp {
ERODE,
diff --git a/src/display/nr-filter-offset.cpp b/src/display/nr-filter-offset.cpp
index 718dc4e2c..01c3e4c5c 100644
--- a/src/display/nr-filter-offset.cpp
+++ b/src/display/nr-filter-offset.cpp
@@ -29,7 +29,7 @@ FilterPrimitive * FilterOffset::create() {
}
FilterOffset::~FilterOffset()
-{}
+= default;
void FilterOffset::render_cairo(FilterSlot &slot)
{
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index e8d03d42e..f989119b7 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -41,7 +41,7 @@ FilterPrimitive * FilterSpecularLighting::create() {
}
FilterSpecularLighting::~FilterSpecularLighting()
-{}
+= default;
struct SpecularLight : public SurfaceSynth {
SpecularLight(cairo_surface_t *bumpmap, double scale, double specular_constant,
diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index ad4e64768..bff404b4e 100644
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -20,15 +20,14 @@ namespace Inkscape {
namespace Filters {
FilterTile::FilterTile()
-{
-}
+= default;
FilterPrimitive * FilterTile::create() {
return new FilterTile();
}
FilterTile::~FilterTile()
-{}
+= default;
void FilterTile::render_cairo(FilterSlot &slot)
{
diff --git a/src/display/nr-filter-units.cpp b/src/display/nr-filter-units.cpp
index a0cbe80ef..e924b6c90 100644
--- a/src/display/nr-filter-units.cpp
+++ b/src/display/nr-filter-units.cpp
@@ -157,18 +157,7 @@ Geom::IntRect FilterUnits::get_pixblock_filterarea_paraller() const {
return ir;
}
-FilterUnits& FilterUnits::operator=(FilterUnits const &other) {
- filterUnits = other.filterUnits;
- primitiveUnits = other.primitiveUnits;
- resolution_x = other.resolution_x;
- resolution_y = other.resolution_y;
- paraller_axis = other.paraller_axis;
- automatic_resolution = other.automatic_resolution;
- ctm = other.ctm;
- item_bbox = other.item_bbox;
- filter_area = other.filter_area;
- return *this;
-}
+FilterUnits& FilterUnits::operator=(FilterUnits const &other) = default;
} /* namespace Filters */
} /* namespace Inkscape */
diff --git a/src/display/nr-light.cpp b/src/display/nr-light.cpp
index 47938f00c..271e4f967 100644
--- a/src/display/nr-light.cpp
+++ b/src/display/nr-light.cpp
@@ -27,7 +27,7 @@ DistantLight::DistantLight(SPFeDistantLight *light, guint32 lighting_color) {
elevation = M_PI / 180 * light->elevation;
}
-DistantLight::~DistantLight() {}
+DistantLight::~DistantLight() = default;
void DistantLight::light_vector(NR::Fvector &v) {
v[X_3D] = std::cos(azimuth)*std::cos(elevation);
@@ -49,7 +49,7 @@ PointLight::PointLight(SPFePointLight *light, guint32 lighting_color, const Geom
NR::convert_coord(l_x, l_y, l_z, trans);
}
-PointLight::~PointLight() {}
+PointLight::~PointLight() = default;
void PointLight::light_vector(NR::Fvector &v, double x, double y, double z) {
v[X_3D] = l_x - x;
@@ -84,7 +84,7 @@ SpotLight::SpotLight(SPFeSpotLight *light, guint32 lighting_color, const Geom::A
}
-SpotLight::~SpotLight() {}
+SpotLight::~SpotLight() = default;
void SpotLight::light_vector(NR::Fvector &v, double x, double y, double z) {
v[X_3D] = l_x - x;
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 ()
diff --git a/src/gc-anchored.h b/src/gc-anchored.h
index 04fb93436..b8494254b 100644
--- a/src/gc-anchored.h
+++ b/src/gc-anchored.h
@@ -56,7 +56,7 @@ public:
protected:
Anchored() : _anchor(nullptr) { anchor(); } // initial refcount of one
- virtual ~Anchored() {}
+ virtual ~Anchored() = default;
private:
struct Anchor : public Managed<SCANNED, MANUAL> {
diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp
index b54738a38..04df199d3 100644
--- a/src/helper/geom-satellite.cpp
+++ b/src/helper/geom-satellite.cpp
@@ -24,7 +24,7 @@
#endif
///@brief Satellite a per node holder of data.
-Satellite::Satellite() {}
+Satellite::Satellite() = default;
Satellite::Satellite(SatelliteType satellite_type)
@@ -38,7 +38,7 @@ Satellite::Satellite(SatelliteType satellite_type)
steps(0)
{}
-Satellite::~Satellite() {}
+Satellite::~Satellite() = default;
///Calculate the time in curve_in with a size of A
//TODO: find a better place to it
diff --git a/src/inkgc/gc-alloc.h b/src/inkgc/gc-alloc.h
index 7a48bfa43..5600c1ead 100644
--- a/src/inkgc/gc-alloc.h
+++ b/src/inkgc/gc-alloc.h
@@ -37,7 +37,7 @@ public:
template <typename U>
struct rebind { typedef Alloc<U, collect> other; };
- Alloc() {}
+ Alloc() = default;
template <typename U> Alloc(Alloc<U, collect> const &) {}
pointer address(reference r) { return &r; }
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index b2b67e754..2a2fa4f86 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -99,7 +99,7 @@ public:
InkErrorHandler(bool useGui) : Inkscape::ErrorReporter(),
_useGui(useGui)
{}
- ~InkErrorHandler() override {}
+ ~InkErrorHandler() override = default;
void handleError( Glib::ustring const& primary, Glib::ustring const& secondary ) const override
{
diff --git a/src/io/bufferstream.cpp b/src/io/bufferstream.cpp
index ba440254f..9a79f4e1b 100644
--- a/src/io/bufferstream.cpp
+++ b/src/io/bufferstream.cpp
@@ -56,9 +56,7 @@ BufferInputStream::BufferInputStream(
*
*/
BufferInputStream::~BufferInputStream()
-{
-
-}
+= default;
/**
* Returns the number of bytes that can be read (or skipped over) from
@@ -114,8 +112,7 @@ BufferOutputStream::BufferOutputStream()
*
*/
BufferOutputStream::~BufferOutputStream()
-{
-}
+= default;
/**
* Closes this output stream and releases any system resources
diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index 536a121ce..da6d320d8 100644
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -26,7 +26,7 @@ public:
StreamException(Glib::ustring &theReason) throw()
{ reason = theReason; }
~StreamException() throw() override
- { }
+ = default;
char const *what() const throw() override
{ return reason.c_str(); }
@@ -54,12 +54,12 @@ public:
/**
* Constructor.
*/
- InputStream() {}
+ InputStream() = default;
/**
* Destructor
*/
- virtual ~InputStream() {}
+ virtual ~InputStream() = default;
/**
* Return the number of bytes that are currently available
@@ -102,7 +102,7 @@ public:
BasicInputStream(InputStream &sourceStream);
- ~BasicInputStream() override {}
+ ~BasicInputStream() override = default;
int available() override;
@@ -164,12 +164,12 @@ public:
/**
* Constructor.
*/
- OutputStream() {}
+ OutputStream() = default;
/**
* Destructor
*/
- virtual ~OutputStream() {}
+ virtual ~OutputStream() = default;
/**
* This call should
@@ -206,7 +206,7 @@ public:
BasicOutputStream(OutputStream &destinationStream);
- ~BasicOutputStream() override {}
+ ~BasicOutputStream() override = default;
void close() override;
@@ -263,12 +263,12 @@ public:
/**
* Constructor.
*/
- Reader() {}
+ Reader() = default;
/**
* Destructor
*/
- virtual ~Reader() {}
+ virtual ~Reader() = default;
virtual int available() = 0;
@@ -324,7 +324,7 @@ public:
BasicReader(Reader &sourceStream);
- ~BasicReader() override {}
+ ~BasicReader() override = default;
int available() override;
@@ -459,12 +459,12 @@ public:
/**
* Constructor.
*/
- Writer() {}
+ Writer() = default;
/**
* Destructor
*/
- virtual ~Writer() {}
+ virtual ~Writer() = default;
virtual void close() = 0;
@@ -517,7 +517,7 @@ public:
BasicWriter(Writer &destinationWriter);
- ~BasicWriter() override {}
+ ~BasicWriter() override = default;
/*Overload these 3 for your implementation*/
void close() override;
diff --git a/src/io/stringstream.cpp b/src/io/stringstream.cpp
index 5a76e24a3..62918ffa5 100644
--- a/src/io/stringstream.cpp
+++ b/src/io/stringstream.cpp
@@ -37,9 +37,7 @@ StringInputStream::StringInputStream(Glib::ustring &sourceString)
*
*/
StringInputStream::~StringInputStream()
-{
-
-}
+= default;
/**
* Returns the number of bytes that can be read (or skipped over) from
@@ -82,15 +80,13 @@ int StringInputStream::get()
*
*/
StringOutputStream::StringOutputStream()
-{
-}
+= default;
/**
*
*/
StringOutputStream::~StringOutputStream()
-{
-}
+= default;
/**
* Closes this output stream and releases any system resources
diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h
index 2f8907e27..eb1651f27 100644
--- a/src/libnrtype/FontFactory.h
+++ b/src/libnrtype/FontFactory.h
@@ -59,7 +59,7 @@ const char *sp_font_description_get_family(PangoFontDescription const *fontDescr
class StyleNames {
public:
- StyleNames() {};
+ StyleNames() = default;;
StyleNames( Glib::ustring name ) :
CssName( name ), DisplayName( name ) {};
StyleNames( Glib::ustring cssname, Glib::ustring displayname ) :
diff --git a/src/libnrtype/Layout-TNG-Scanline-Maker.h b/src/libnrtype/Layout-TNG-Scanline-Maker.h
index 786f44e51..dea9aa3c5 100644
--- a/src/libnrtype/Layout-TNG-Scanline-Maker.h
+++ b/src/libnrtype/Layout-TNG-Scanline-Maker.h
@@ -32,7 +32,7 @@ is a rectangle.
class Layout::ScanlineMaker
{
public:
- virtual ~ScanlineMaker() {}
+ virtual ~ScanlineMaker() = default;
struct ScanRun {
double y; /// that's the top of the scan run, not the baseline
diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
index a57aaa3e4..f95846279 100644
--- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
+++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
@@ -37,8 +37,7 @@ Layout::InfiniteScanlineMaker::InfiniteScanlineMaker(double initial_x, double in
}
Layout::InfiniteScanlineMaker::~InfiniteScanlineMaker()
-{
-}
+= default;
std::vector<Layout::ScanlineMaker::ScanRun> Layout::InfiniteScanlineMaker::makeScanline(Layout::FontMetrics const &line_height)
{
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index 6db6c1221..678f04e6c 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -694,7 +694,7 @@ private:
class InputStreamItem {
public:
- virtual ~InputStreamItem() {}
+ virtual ~InputStreamItem() = default;
virtual InputStreamItemType Type() =0;
void *source_cookie;
};
diff --git a/src/libnrtype/OpenTypeUtil.h b/src/libnrtype/OpenTypeUtil.h
index 0a249f123..ef32e76f3 100644
--- a/src/libnrtype/OpenTypeUtil.h
+++ b/src/libnrtype/OpenTypeUtil.h
@@ -21,7 +21,7 @@
// OpenType substitution
class OTSubstitution {
public:
- OTSubstitution() {};
+ OTSubstitution() = default;;
Glib::ustring before;
Glib::ustring input;
Glib::ustring after;
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index 6e0f82d45..822b24d59 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -38,22 +38,10 @@ Line::Line(Geom::Point const &start, Geom::Point const &vec, bool is_endpoint):
d0 = Geom::dot(normal, pt);
}
-Line::Line(Line const &line):
- pt(line.pt),
- v_dir(line.v_dir),
- normal(line.normal),
- d0(line.d0)
-{
-}
+Line::Line(Line const &line)
+= default;
-Line &Line::operator=(Line const &line) {
- pt = line.pt;
- v_dir = line.v_dir;
- normal = line.normal;
- d0 = line.d0;
-
- return *this;
-}
+Line &Line::operator=(Line const &line) = default;
boost::optional<Geom::Point> Line::intersect(Line const &line) {
Geom::Coord denom = Geom::dot(v_dir, line.normal);
diff --git a/src/line-geometry.h b/src/line-geometry.h
index 34c79d9dd..7c9958a90 100644
--- a/src/line-geometry.h
+++ b/src/line-geometry.h
@@ -27,7 +27,7 @@ class Line {
public:
Line(Geom::Point const &start, Geom::Point const &vec, bool is_endpoint = true);
Line(Line const &line);
- virtual ~Line() {}
+ virtual ~Line() = default;
Line &operator=(Line const &line);
virtual boost::optional<Geom::Point> intersect(Line const &line);
inline Geom::Point direction () { return v_dir; }
diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index e5350edc6..aa2db08fc 100644
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -24,8 +24,7 @@ FloatLigne::FloatLigne()
FloatLigne::~FloatLigne()
-{
-}
+= default;
/// Reset the line to empty (boundaries and runs).
void FloatLigne::Reset()
diff --git a/src/livarot/path-description.h b/src/livarot/path-description.h
index ed978d4c2..5ded5167e 100644
--- a/src/livarot/path-description.h
+++ b/src/livarot/path-description.h
@@ -27,7 +27,7 @@ struct PathDescr
{
PathDescr() : flags(0), associated(-1), tSt(0), tEn(1) {}
PathDescr(int f) : flags(f), associated(-1), tSt(0), tEn(1) {}
- virtual ~PathDescr() {}
+ virtual ~PathDescr() = default;
int getType() const { return flags & descr_type_mask; }
void setType(int t) {
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index bef7a1e3f..6251740d5 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -410,8 +410,7 @@ Effect::Effect(LivePathEffectObject *lpeobject)
}
Effect::~Effect()
-{
-}
+= default;
Glib::ustring
Effect::getName() const
diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp
index 150bb4124..f7c7928c6 100644
--- a/src/live_effects/lpe-angle_bisector.cpp
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -50,8 +50,7 @@ LPEAngleBisector::LPEAngleBisector(LivePathEffectObject *lpeobject) :
}
LPEAngleBisector::~LPEAngleBisector()
-{
-}
+= default;
Geom::PathVector
LPEAngleBisector::doEffect_path (Geom::PathVector const & path_in)
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index ea2965c6a..9ab832c5e 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -42,9 +42,7 @@ LPEAttachPath::LPEAttachPath(LivePathEffectObject *lpeobject) :
}
LPEAttachPath::~LPEAttachPath()
-{
-
-}
+= default;
void LPEAttachPath::resetDefaults(SPItem const * /*item*/)
{
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 69415cf4e..6bf555156 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -78,9 +78,7 @@ LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) :
}
LPEBendPath::~LPEBendPath()
-{
-
-}
+= default;
void
LPEBendPath::doBeforeEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp
index 865968b30..eb8918555 100644
--- a/src/live_effects/lpe-bool.cpp
+++ b/src/live_effects/lpe-bool.cpp
@@ -86,9 +86,7 @@ LPEBool::LPEBool(LivePathEffectObject *lpeobject) :
}
LPEBool::~LPEBool()
-{
-
-}
+= default;
void LPEBool::resetDefaults(SPItem const * /*item*/)
{
diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp
index ba519f1c6..b7b2e596d 100644
--- a/src/live_effects/lpe-bounding-box.cpp
+++ b/src/live_effects/lpe-bounding-box.cpp
@@ -25,9 +25,7 @@ LPEBoundingBox::LPEBoundingBox(LivePathEffectObject *lpeobject) :
}
LPEBoundingBox::~LPEBoundingBox()
-{
-
-}
+= default;
void LPEBoundingBox::doEffect (SPCurve * curve)
{
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index 04182e84b..77c5ae66c 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -56,7 +56,7 @@ LPEBSpline::LPEBSpline(LivePathEffectObject *lpeobject)
helper_size.param_set_digits(2);
}
-LPEBSpline::~LPEBSpline() {}
+LPEBSpline::~LPEBSpline() = default;
void LPEBSpline::doBeforeEffect (SPLPEItem const* /*lpeitem*/)
{
diff --git a/src/live_effects/lpe-circle_3pts.cpp b/src/live_effects/lpe-circle_3pts.cpp
index c49d5ca4d..2f601fb00 100644
--- a/src/live_effects/lpe-circle_3pts.cpp
+++ b/src/live_effects/lpe-circle_3pts.cpp
@@ -29,8 +29,7 @@ LPECircle3Pts::LPECircle3Pts(LivePathEffectObject *lpeobject) :
}
LPECircle3Pts::~LPECircle3Pts()
-{
-}
+= default;
static void _circle3(Geom::Point const &A, Geom::Point const &B, Geom::Point const &C, Geom::PathVector &path_out) {
using namespace Geom;
diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp
index fcefc4ec6..99ade0da1 100644
--- a/src/live_effects/lpe-circle_with_radius.cpp
+++ b/src/live_effects/lpe-circle_with_radius.cpp
@@ -35,9 +35,7 @@ LPECircleWithRadius::LPECircleWithRadius(LivePathEffectObject *lpeobject) :
}
LPECircleWithRadius::~LPECircleWithRadius()
-{
-
-}
+= default;
Geom::PathVector
LPECircleWithRadius::doEffect_path (Geom::PathVector const & path_in)
diff --git a/src/live_effects/lpe-constructgrid.cpp b/src/live_effects/lpe-constructgrid.cpp
index db620fa95..4759dde5f 100644
--- a/src/live_effects/lpe-constructgrid.cpp
+++ b/src/live_effects/lpe-constructgrid.cpp
@@ -34,9 +34,7 @@ LPEConstructGrid::LPEConstructGrid(LivePathEffectObject *lpeobject) :
}
LPEConstructGrid::~LPEConstructGrid()
-{
-
-}
+= default;
Geom::PathVector
LPEConstructGrid::doEffect_path (Geom::PathVector const & path_in)
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 909bd411e..f74e76211 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -104,9 +104,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) :
}
LPECopyRotate::~LPECopyRotate()
-{
-
-}
+= default;
void
LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index 1ee29bbaf..d5947be4d 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -60,9 +60,7 @@ LPECurveStitch::LPECurveStitch(LivePathEffectObject *lpeobject) :
}
LPECurveStitch::~LPECurveStitch()
-{
-
-}
+= default;
Geom::PathVector
LPECurveStitch::doEffect_path (Geom::PathVector const & path_in)
diff --git a/src/live_effects/lpe-dash-stroke.cpp b/src/live_effects/lpe-dash-stroke.cpp
index 43aa04e11..dd30d05a4 100644
--- a/src/live_effects/lpe-dash-stroke.cpp
+++ b/src/live_effects/lpe-dash-stroke.cpp
@@ -36,7 +36,7 @@ LPEDashStroke::LPEDashStroke(LivePathEffectObject *lpeobject)
message.param_set_min_height(30);
}
-LPEDashStroke::~LPEDashStroke() {}
+LPEDashStroke::~LPEDashStroke() = default;
void
LPEDashStroke::doBeforeEffect (SPLPEItem const* lpeitem){
diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp
index d0655d9bd..276fd10df 100644
--- a/src/live_effects/lpe-dynastroke.cpp
+++ b/src/live_effects/lpe-dynastroke.cpp
@@ -77,9 +77,7 @@ LPEDynastroke::LPEDynastroke(LivePathEffectObject *lpeobject) :
}
LPEDynastroke::~LPEDynastroke()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPEDynastroke::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
diff --git a/src/live_effects/lpe-ellipse_5pts.cpp b/src/live_effects/lpe-ellipse_5pts.cpp
index 28e7058d7..5f89644f5 100644
--- a/src/live_effects/lpe-ellipse_5pts.cpp
+++ b/src/live_effects/lpe-ellipse_5pts.cpp
@@ -31,8 +31,7 @@ LPEEllipse5Pts::LPEEllipse5Pts(LivePathEffectObject *lpeobject) :
}
LPEEllipse5Pts::~LPEEllipse5Pts()
-{
-}
+= default;
static double _det3(double (*mat)[3])
{
diff --git a/src/live_effects/lpe-embrodery-stitch.cpp b/src/live_effects/lpe-embrodery-stitch.cpp
index 972d29b9c..00d1928d7 100644
--- a/src/live_effects/lpe-embrodery-stitch.cpp
+++ b/src/live_effects/lpe-embrodery-stitch.cpp
@@ -81,9 +81,7 @@ LPEEmbroderyStitch::LPEEmbroderyStitch(LivePathEffectObject *lpeobject) :
}
LPEEmbroderyStitch::~LPEEmbroderyStitch()
-{
-
-}
+= default;
double LPEEmbroderyStitch::GetPatternInitialStep(int pattern, int line)
{
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index 0dcae51e4..6fc9084f8 100644
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -34,9 +34,7 @@ LPEEnvelope::LPEEnvelope(LivePathEffectObject *lpeobject) :
}
LPEEnvelope::~LPEEnvelope()
-{
-
-}
+= default;
void
LPEEnvelope::doBeforeEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp
index 0b144053e..53ecc8dfd 100644
--- a/src/live_effects/lpe-extrude.cpp
+++ b/src/live_effects/lpe-extrude.cpp
@@ -31,9 +31,7 @@ LPEExtrude::LPEExtrude(LivePathEffectObject *lpeobject) :
}
LPEExtrude::~LPEExtrude()
-{
-
-}
+= default;
static bool are_colinear(Geom::Point a, Geom::Point b) {
return Geom::are_near(cross(a,b), 0., 0.5);
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index 389ddf007..886b840e6 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -51,9 +51,7 @@ LPEFillBetweenMany::LPEFillBetweenMany(LivePathEffectObject *lpeobject) :
}
LPEFillBetweenMany::~LPEFillBetweenMany()
-{
-
-}
+= default;
void LPEFillBetweenMany::doOnApply (SPLPEItem const* lpeitem)
{
diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp
index 5f327b6a4..22dfe7e54 100644
--- a/src/live_effects/lpe-fill-between-strokes.cpp
+++ b/src/live_effects/lpe-fill-between-strokes.cpp
@@ -34,9 +34,7 @@ LPEFillBetweenStrokes::LPEFillBetweenStrokes(LivePathEffectObject *lpeobject) :
}
LPEFillBetweenStrokes::~LPEFillBetweenStrokes()
-{
-
-}
+= default;
void LPEFillBetweenStrokes::doEffect (SPCurve * curve)
{
diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp
index dad520041..4566869fe 100644
--- a/src/live_effects/lpe-gears.cpp
+++ b/src/live_effects/lpe-gears.cpp
@@ -225,9 +225,7 @@ LPEGears::LPEGears(LivePathEffectObject *lpeobject) :
}
LPEGears::~LPEGears()
-{
-
-}
+= default;
Geom::PathVector
LPEGears::doEffect_path (Geom::PathVector const &path_in)
diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp
index 70bc92a27..dabad013f 100644
--- a/src/live_effects/lpe-interpolate.cpp
+++ b/src/live_effects/lpe-interpolate.cpp
@@ -41,9 +41,7 @@ LPEInterpolate::LPEInterpolate(LivePathEffectObject *lpeobject) :
}
LPEInterpolate::~LPEInterpolate()
-{
-
-}
+= default;
/*
* interpolate path_in[0] to path_in[1]
diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp
index 7d4c88dc1..937b92837 100644
--- a/src/live_effects/lpe-interpolate_points.cpp
+++ b/src/live_effects/lpe-interpolate_points.cpp
@@ -43,8 +43,7 @@ LPEInterpolatePoints::LPEInterpolatePoints(LivePathEffectObject *lpeobject)
}
LPEInterpolatePoints::~LPEInterpolatePoints()
-{
-}
+= default;
Geom::PathVector
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index b58fd01da..3b233fb51 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -80,8 +80,7 @@ LPEJoinType::LPEJoinType(LivePathEffectObject *lpeobject) :
}
LPEJoinType::~LPEJoinType()
-{
-}
+= default;
//from LPEPowerStroke -- sets fill if stroke color because we will
//be converting to a fill to make the new join.
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index 8522444c6..3640e8e43 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -368,9 +368,7 @@ LPEKnot::LPEKnot(LivePathEffectObject *lpeobject) :
}
LPEKnot::~LPEKnot()
-{
-
-}
+= default;
void
LPEKnot::updateSwitcher(){
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index df4da4590..223afa4cd 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -71,9 +71,7 @@ LPELattice::LPELattice(LivePathEffectObject *lpeobject) :
}
LPELattice::~LPELattice()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index ae9ec0361..79cb1e32a 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -98,8 +98,7 @@ LPELattice2::LPELattice2(LivePathEffectObject *lpeobject) :
}
LPELattice2::~LPELattice2()
-{
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp
index fd23da804..535fc2f47 100644
--- a/src/live_effects/lpe-line_segment.cpp
+++ b/src/live_effects/lpe-line_segment.cpp
@@ -36,9 +36,7 @@ LPELineSegment::LPELineSegment(LivePathEffectObject *lpeobject) :
}
LPELineSegment::~LPELineSegment()
-{
-
-}
+= default;
void
LPELineSegment::doBeforeEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 66f00689a..ae205dfc0 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -84,8 +84,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) :
}
LPEMirrorSymmetry::~LPEMirrorSymmetry()
-{
-}
+= default;
void
LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 91ea9df74..aa72ef195 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -96,8 +96,7 @@ LPEOffset::LPEOffset(LivePathEffectObject *lpeobject) :
}
LPEOffset::~LPEOffset()
-{
-}
+= default;
static void
sp_flatten(Geom::PathVector &pathvector, bool evenodd)
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 7c6de10bb..e927d758f 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -57,9 +57,7 @@ LPEParallel::LPEParallel(LivePathEffectObject *lpeobject) :
}
LPEParallel::~LPEParallel()
-{
-
-}
+= default;
void
LPEParallel::doOnApply (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-path_length.cpp b/src/live_effects/lpe-path_length.cpp
index 61818a73b..b9a5282b2 100644
--- a/src/live_effects/lpe-path_length.cpp
+++ b/src/live_effects/lpe-path_length.cpp
@@ -33,9 +33,7 @@ LPEPathLength::LPEPathLength(LivePathEffectObject *lpeobject) :
}
LPEPathLength::~LPEPathLength()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPEPathLength::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index dd052c796..41b0b144a 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -112,9 +112,7 @@ LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
}
LPEPatternAlongPath::~LPEPatternAlongPath()
-{
-
-}
+= default;
void
LPEPatternAlongPath::doBeforeEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index 6fa874a4d..48a7f5278 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -105,8 +105,7 @@ LPEPerpBisector::LPEPerpBisector(LivePathEffectObject *lpeobject) :
}
LPEPerpBisector::~LPEPerpBisector()
-{
-}
+= default;
void
LPEPerpBisector::doOnApply (SPLPEItem const*/*lpeitem*/)
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index dcbf3fee7..24b0e8b01 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -64,8 +64,7 @@ LPEPerspectiveEnvelope::LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject)
}
LPEPerspectiveEnvelope::~LPEPerspectiveEnvelope()
-{
-}
+= default;
void LPEPerspectiveEnvelope::doEffect(SPCurve *curve)
{
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index 857bd2952..8699731f1 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -66,9 +66,7 @@ LPEPerspectivePath::LPEPerspectivePath(LivePathEffectObject *lpeobject) :
}
LPEPerspectivePath::~LPEPerspectivePath()
-{
-
-}
+= default;
void
LPEPerspectivePath::doOnApply(SPLPEItem const* lpeitem)
{
diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp
index 35da3bd26..9e5da13cd 100644
--- a/src/live_effects/lpe-powerclip.cpp
+++ b/src/live_effects/lpe-powerclip.cpp
@@ -42,7 +42,7 @@ LPEPowerClip::LPEPowerClip(LivePathEffectObject *lpeobject)
convert_shapes = false;
}
-LPEPowerClip::~LPEPowerClip() {}
+LPEPowerClip::~LPEPowerClip() = default;
void
LPEPowerClip::doBeforeEffect (SPLPEItem const* lpeitem){
diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp
index ac3a1dd76..72cb75dab 100644
--- a/src/live_effects/lpe-powermask.cpp
+++ b/src/live_effects/lpe-powermask.cpp
@@ -46,7 +46,7 @@ LPEPowerMask::LPEPowerMask(LivePathEffectObject *lpeobject)
previous_color = background_color.get_value();
}
-LPEPowerMask::~LPEPowerMask() {}
+LPEPowerMask::~LPEPowerMask() = default;
void
LPEPowerMask::doBeforeEffect (SPLPEItem const* lpeitem){
diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h
index ce792302f..33c587a53 100644
--- a/src/live_effects/lpe-powerstroke-interpolators.h
+++ b/src/live_effects/lpe-powerstroke-interpolators.h
@@ -34,8 +34,8 @@ enum InterpolatorType {
class Interpolator {
public:
- Interpolator() {};
- virtual ~Interpolator() {};
+ Interpolator() = default;;
+ virtual ~Interpolator() = default;;
static Interpolator* create(InterpolatorType type);
@@ -48,8 +48,8 @@ private:
class Linear : public Interpolator {
public:
- Linear() {};
- ~Linear() override {};
+ Linear() = default;;
+ ~Linear() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
Path path;
@@ -68,8 +68,8 @@ private:
// this class is terrible
class CubicBezierFit : public Interpolator {
public:
- CubicBezierFit() {};
- ~CubicBezierFit() override {};
+ CubicBezierFit() = default;;
+ ~CubicBezierFit() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
unsigned int n_points = points.size();
@@ -110,7 +110,7 @@ public:
CubicBezierJohan(double beta = 0.2) {
_beta = beta;
};
- ~CubicBezierJohan() override {};
+ ~CubicBezierJohan() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
Path fit;
@@ -141,7 +141,7 @@ public:
CubicBezierSmooth(double beta = 0.2) {
_beta = beta;
};
- ~CubicBezierSmooth() override {};
+ ~CubicBezierSmooth() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
Path fit;
@@ -175,8 +175,8 @@ private:
class SpiroInterpolator : public Interpolator {
public:
- SpiroInterpolator() {};
- ~SpiroInterpolator() override {};
+ SpiroInterpolator() = default;;
+ ~SpiroInterpolator() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
Path fit;
@@ -209,8 +209,8 @@ private:
// Quick mockup for testing the behavior for powerstroke controlpoint interpolation
class CentripetalCatmullRomInterpolator : public Interpolator {
public:
- CentripetalCatmullRomInterpolator() {};
- ~CentripetalCatmullRomInterpolator() override {};
+ CentripetalCatmullRomInterpolator() = default;;
+ ~CentripetalCatmullRomInterpolator() override = default;;
Path interpolateToPath(std::vector<Point> const &points) const override {
unsigned int n_points = points.size();
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index ce240ab1e..32f9a6b82 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -200,9 +200,7 @@ LPEPowerStroke::LPEPowerStroke(LivePathEffectObject *lpeobject) :
}
LPEPowerStroke::~LPEPowerStroke()
-{
-
-}
+= default;
void
LPEPowerStroke::doBeforeEffect(SPLPEItem const *lpeItem)
{
diff --git a/src/live_effects/lpe-pts2ellipse.cpp b/src/live_effects/lpe-pts2ellipse.cpp
index 4fd145646..2df3b2001 100644
--- a/src/live_effects/lpe-pts2ellipse.cpp
+++ b/src/live_effects/lpe-pts2ellipse.cpp
@@ -69,8 +69,7 @@ LPEPts2Ellipse::LPEPts2Ellipse(LivePathEffectObject *lpeobject) :
}
LPEPts2Ellipse::~LPEPts2Ellipse()
-{
-}
+= default;
// helper function, transforms a given value into range [0, 2pi]
inline double
diff --git a/src/live_effects/lpe-recursiveskeleton.cpp b/src/live_effects/lpe-recursiveskeleton.cpp
index 47613f58e..75a08c250 100644
--- a/src/live_effects/lpe-recursiveskeleton.cpp
+++ b/src/live_effects/lpe-recursiveskeleton.cpp
@@ -33,9 +33,7 @@ LPERecursiveSkeleton::LPERecursiveSkeleton(LivePathEffectObject *lpeobject) :
}
LPERecursiveSkeleton::~LPERecursiveSkeleton()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 79ce89c9f..80dbbc54e 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -282,9 +282,7 @@ LPERoughHatches::LPERoughHatches(LivePathEffectObject *lpeobject) :
}
LPERoughHatches::~LPERoughHatches()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPERoughHatches::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in){
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index 37a94343b..de3ccef25 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -88,7 +88,7 @@ LPERoughen::LPERoughen(LivePathEffectObject *lpeobject)
apply_to_clippath_and_mask = true;
}
-LPERoughen::~LPERoughen() {}
+LPERoughen::~LPERoughen() = default;
void LPERoughen::doBeforeEffect(SPLPEItem const *lpeitem)
{
diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index 0cda15b81..8d625f88e 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -65,9 +65,7 @@ LPERuler::LPERuler(LivePathEffectObject *lpeobject) :
}
LPERuler::~LPERuler()
-{
-
-}
+= default;
Geom::Point LPERuler::n_major;
Geom::Point LPERuler::n_minor;
diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h
index a5256548c..0ea9c142f 100644
--- a/src/live_effects/lpe-show_handles.h
+++ b/src/live_effects/lpe-show_handles.h
@@ -20,7 +20,7 @@ class LPEShowHandles : public Effect , GroupBBoxEffect {
public:
LPEShowHandles(LivePathEffectObject *lpeobject);
- ~LPEShowHandles() override {}
+ ~LPEShowHandles() override = default;
void doOnApply(SPLPEItem const* lpeitem) override;
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index e640475dc..bcd0e1009 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -55,7 +55,7 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject)
apply_to_clippath_and_mask = true;
}
-LPESimplify::~LPESimplify() {}
+LPESimplify::~LPESimplify() = default;
void
LPESimplify::doBeforeEffect (SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-skeleton.cpp b/src/live_effects/lpe-skeleton.cpp
index d3c94269a..266ba2204 100644
--- a/src/live_effects/lpe-skeleton.cpp
+++ b/src/live_effects/lpe-skeleton.cpp
@@ -41,9 +41,7 @@ LPESkeleton::LPESkeleton(LivePathEffectObject *lpeobject) :
}
LPESkeleton::~LPESkeleton()
-{
-
-}
+= default;
/* ########################
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index 1d8f7703e..4ddc56803 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -113,9 +113,7 @@ LPESketch::LPESketch(LivePathEffectObject *lpeobject) :
}
LPESketch::~LPESketch()
-{
-
-}
+= default;
/*
Geom::Piecewise<Geom::D2<Geom::SBasis> >
diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp
index 8ea57bee4..9d0c9476f 100644
--- a/src/live_effects/lpe-spiro.cpp
+++ b/src/live_effects/lpe-spiro.cpp
@@ -26,8 +26,7 @@ LPESpiro::LPESpiro(LivePathEffectObject *lpeobject) :
}
LPESpiro::~LPESpiro()
-{
-}
+= default;
void
LPESpiro::doEffect(SPCurve * curve)
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index 6c34fc9e6..38410d45e 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -69,8 +69,7 @@ LPETangentToCurve::LPETangentToCurve(LivePathEffectObject *lpeobject) :
}
LPETangentToCurve::~LPETangentToCurve()
-{
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPETangentToCurve::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h
index 5e650b9ac..518f7a1d0 100644
--- a/src/live_effects/lpe-taperstroke.h
+++ b/src/live_effects/lpe-taperstroke.h
@@ -28,7 +28,7 @@ class KnotHolderEntityAttachEnd;
class LPETaperStroke : public Effect {
public:
LPETaperStroke(LivePathEffectObject *lpeobject);
- ~LPETaperStroke() override {}
+ ~LPETaperStroke() override = default;
void doOnApply(SPLPEItem const* lpeitem) override;
void doOnRemove(SPLPEItem const* lpeitem) override;
diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index c484c88a2..d02a26fe4 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -30,9 +30,7 @@ LPEdoEffectStackTest::LPEdoEffectStackTest(LivePathEffectObject *lpeobject) :
}
LPEdoEffectStackTest::~LPEdoEffectStackTest()
-{
-
-}
+= default;
void
LPEdoEffectStackTest::doEffect (SPCurve * curve)
diff --git a/src/live_effects/lpe-text_label.cpp b/src/live_effects/lpe-text_label.cpp
index 0c1db2f04..b2845930c 100644
--- a/src/live_effects/lpe-text_label.cpp
+++ b/src/live_effects/lpe-text_label.cpp
@@ -27,9 +27,7 @@ LPETextLabel::LPETextLabel(LivePathEffectObject *lpeobject) :
}
LPETextLabel::~LPETextLabel()
-{
-
-}
+= default;
Geom::Piecewise<Geom::D2<Geom::SBasis> >
LPETextLabel::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index 47f8864ce..eac52943a 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -82,8 +82,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
}
LPETransform2Pts::~LPETransform2Pts()
-{
-}
+= default;
void
LPETransform2Pts::doOnApply(SPLPEItem const* lpeitem)
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 33460aa2d..33db7c14a 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -70,9 +70,7 @@ LPEVonKoch::LPEVonKoch(LivePathEffectObject *lpeobject) :
}
LPEVonKoch::~LPEVonKoch()
-{
-
-}
+= default;
Geom::PathVector
LPEVonKoch::doEffect_path (Geom::PathVector const & path_in)
diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h
index 1ee9acce0..6ff5b6ae3 100644
--- a/src/live_effects/lpe-vonkoch.h
+++ b/src/live_effects/lpe-vonkoch.h
@@ -26,7 +26,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){}
- ~VonKochPathParam() override{}
+ ~VonKochPathParam() override= default;
void param_setup_nodepath(Inkscape::NodePath::Path *np) override;
};
@@ -39,7 +39,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const gchar * default_value = "M0,0 L1,1"):PathParam(label,tip,key,wr,effect,default_value){}
- ~VonKochRefPathParam() override{}
+ ~VonKochRefPathParam() override= default;
void param_setup_nodepath(Inkscape::NodePath::Path *np) override;
bool param_readSVGValue(const gchar * strvalue) override;
};
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index c05d00d60..561f4e79a 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -39,8 +39,7 @@ LivePathEffectObject::LivePathEffectObject()
#endif
}
-LivePathEffectObject::~LivePathEffectObject() {
-}
+LivePathEffectObject::~LivePathEffectObject() = default;
/**
* Virtual build: set livepatheffect attributes from its associated XML node.
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 156de2f81..3f4baf8b4 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -37,9 +37,7 @@ public:
}
- ~ArrayParam() override {
-
- };
+ ~ArrayParam() override = default;;
std::vector<StorageType> const & data() const {
return _vector;
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 2e8c4dbcc..9b8435941 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -26,8 +26,7 @@ BoolParam::BoolParam( const Glib::ustring& label, const Glib::ustring& tip,
}
BoolParam::~BoolParam()
-{
-}
+= default;
void
BoolParam::param_set_default()
diff --git a/src/live_effects/parameter/colorpicker.h b/src/live_effects/parameter/colorpicker.h
index 965435fba..7fa1556a3 100644
--- a/src/live_effects/parameter/colorpicker.h
+++ b/src/live_effects/parameter/colorpicker.h
@@ -22,7 +22,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const guint32 default_color = 0x000000ff);
- ~ColorPickerParam() override {}
+ ~ColorPickerParam() override = default;
Gtk::Widget * param_newWidget() override;
bool param_readSVGValue(const gchar * strvalue) override;
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index 354eb74f6..0360a5f0a 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -37,7 +37,7 @@ public:
sorted = sort;
};
- ~EnumParam() override { };
+ ~EnumParam() override = default;;
Gtk::Widget * param_newWidget() override {
Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage (
diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h
index 466202ee1..27c982159 100644
--- a/src/live_effects/parameter/fontbutton.h
+++ b/src/live_effects/parameter/fontbutton.h
@@ -22,7 +22,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const Glib::ustring default_value = "Sans 10");
- ~FontButtonParam() override {}
+ ~FontButtonParam() override = default;
Gtk::Widget * param_newWidget() override;
bool param_readSVGValue(const gchar * strvalue) override;
diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h
index df55bfb5a..ecc5039b2 100644
--- a/src/live_effects/parameter/hidden.h
+++ b/src/live_effects/parameter/hidden.h
@@ -31,7 +31,7 @@ public:
Effect* effect,
const Glib::ustring default_value = "",
bool widget_is_visible = false);
- ~HiddenParam() override {}
+ ~HiddenParam() override = default;
Gtk::Widget * param_newWidget() override;
diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h
index bbee74998..3d9ddf62b 100644
--- a/src/live_effects/parameter/message.h
+++ b/src/live_effects/parameter/message.h
@@ -22,7 +22,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const gchar * default_message = "Default message");
- ~MessageParam() override {}
+ ~MessageParam() override = default;
Gtk::Widget * param_newWidget() override;
bool param_readSVGValue(const gchar * strvalue) override;
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index 820c4d6b9..b415dd52a 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -38,9 +38,7 @@ OriginalItemParam::OriginalItemParam( const Glib::ustring& label, const Glib::us
}
OriginalItemParam::~OriginalItemParam()
-{
-
-}
+= default;
Gtk::Widget *
OriginalItemParam::param_newWidget()
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index 3116b1f9c..23d9f96cd 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -46,7 +46,7 @@ public:
add(_colLabel);
add(_colActive);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<ItemAndActive*> _colObject;
Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 5ad5546da..e17ef74e4 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -41,9 +41,7 @@ OriginalPathParam::OriginalPathParam( const Glib::ustring& label, const Glib::us
}
OriginalPathParam::~OriginalPathParam()
-{
-
-}
+= default;
Gtk::Widget *
OriginalPathParam::param_newWidget()
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index f9e56c8f3..cc4408218 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -57,7 +57,7 @@ public:
add(_colReverse);
add(_colVisible);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<PathAndDirectionAndVisible*> _colObject;
Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index acfe159ab..7ca3f04c8 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -71,8 +71,7 @@ ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
}
ScalarParam::~ScalarParam()
-{
-}
+= default;
bool
ScalarParam::param_readSVGValue(const gchar * strvalue)
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index a956a9ed4..7454558db 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -53,7 +53,7 @@ public:
const Glib::ustring& key,
Inkscape::UI::Widget::Registry* wr,
Effect* effect);
- virtual ~Parameter() {};
+ virtual ~Parameter() = default;;
virtual bool param_readSVGValue(const gchar * strvalue) = 0; // returns true if new value is valid / accepted.
virtual gchar * param_getSVGValue() const = 0;
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index 0857deab5..12f72a143 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -33,8 +33,7 @@ PowerStrokePointArrayParam::PowerStrokePointArrayParam( const Glib::ustring& lab
}
PowerStrokePointArrayParam::~PowerStrokePointArrayParam()
-{
-}
+= default;
Gtk::Widget *
PowerStrokePointArrayParam::param_newWidget()
diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h
index a3712c2d2..e21945e7c 100644
--- a/src/live_effects/parameter/powerstrokepointarray.h
+++ b/src/live_effects/parameter/powerstrokepointarray.h
@@ -67,7 +67,7 @@ private:
class PowerStrokePointArrayParamKnotHolderEntity : public KnotHolderEntity {
public:
PowerStrokePointArrayParamKnotHolderEntity(PowerStrokePointArrayParam *p, unsigned int index);
- ~PowerStrokePointArrayParamKnotHolderEntity() override {}
+ ~PowerStrokePointArrayParamKnotHolderEntity() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) override;
Geom::Point knot_get() const override;
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 23912bedb..fe99285a0 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -39,8 +39,7 @@ RandomParam::RandomParam( const Glib::ustring& label, const Glib::ustring& tip,
}
RandomParam::~RandomParam()
-{
-}
+= default;
bool
RandomParam::param_readSVGValue(const gchar * strvalue)
diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
index fda470638..6591c54c8 100644
--- a/src/live_effects/parameter/text.h
+++ b/src/live_effects/parameter/text.h
@@ -32,7 +32,7 @@ public:
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
const Glib::ustring default_value = "");
- ~TextParam() override {}
+ ~TextParam() override = default;
Gtk::Widget * param_newWidget() override;
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index d94f8964c..e35cbc04d 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -37,9 +37,7 @@ TransformedPointParam::TransformedPointParam( const Glib::ustring& label, const
}
TransformedPointParam::~TransformedPointParam()
-{
-
-}
+= default;
void
TransformedPointParam::param_set_default()
@@ -165,7 +163,7 @@ TransformedPointParam::set_oncanvas_color(guint32 color)
class TransformedPointParamKnotHolderEntity_Vector : public KnotHolderEntity {
public:
TransformedPointParamKnotHolderEntity_Vector(TransformedPointParam *p) : param(p) { }
- ~TransformedPointParamKnotHolderEntity_Vector() override {}
+ ~TransformedPointParamKnotHolderEntity_Vector() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override {
Geom::Point const s = p - param->origin;
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 9199e592d..9dbbaffac 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -29,8 +29,7 @@ UnitParam::UnitParam( const Glib::ustring& label, const Glib::ustring& tip,
}
UnitParam::~UnitParam()
-{
-}
+= default;
bool
UnitParam::param_readSVGValue(const gchar * strvalue)
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 8018ed618..0e8948268 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -37,9 +37,7 @@ VectorParam::VectorParam( const Glib::ustring& label, const Glib::ustring& tip,
}
VectorParam::~VectorParam()
-{
-
-}
+= default;
void
VectorParam::param_set_default()
@@ -172,7 +170,7 @@ VectorParam::set_oncanvas_color(guint32 color)
class VectorParamKnotHolderEntity_Origin : public KnotHolderEntity {
public:
VectorParamKnotHolderEntity_Origin(VectorParam *p) : param(p) { }
- ~VectorParamKnotHolderEntity_Origin() override {}
+ ~VectorParamKnotHolderEntity_Origin() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) override {
Geom::Point const s = snap_knot_position(p, state);
@@ -193,7 +191,7 @@ private:
class VectorParamKnotHolderEntity_Vector : public KnotHolderEntity {
public:
VectorParamKnotHolderEntity_Vector(VectorParam *p) : param(p) { }
- ~VectorParamKnotHolderEntity_Vector() override {}
+ ~VectorParamKnotHolderEntity_Vector() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override {
Geom::Point const s = p - param->origin;
diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h
index 7def6d23d..ec53e085b 100644
--- a/src/live_effects/spiro-converters.h
+++ b/src/live_effects/spiro-converters.h
@@ -8,8 +8,8 @@ namespace Spiro {
class ConverterBase {
public:
- ConverterBase() {};
- virtual ~ConverterBase() {};
+ ConverterBase() = default;;
+ virtual ~ConverterBase() = default;;
virtual void moveto(double x, double y) = 0;
virtual void lineto(double x, double y, bool close_last) = 0;
diff --git a/src/object/box3d-side.cpp b/src/object/box3d-side.cpp
index b085b88ae..d3ea2c890 100644
--- a/src/object/box3d-side.cpp
+++ b/src/object/box3d-side.cpp
@@ -32,8 +32,7 @@ Box3DSide::Box3DSide() : SPPolygon() {
this->front_or_rear = Box3D::FRONT;
}
-Box3DSide::~Box3DSide() {
-}
+Box3DSide::~Box3DSide() = default;
void Box3DSide::build(SPDocument * document, Inkscape::XML::Node * repr) {
SPPolygon::build(document, repr);
diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp
index 08190edfd..7b5e44f65 100644
--- a/src/object/box3d.cpp
+++ b/src/object/box3d.cpp
@@ -53,8 +53,7 @@ SPBox3D::SPBox3D() : SPGroup() {
}
}
-SPBox3D::~SPBox3D() {
-}
+SPBox3D::~SPBox3D() = default;
void SPBox3D::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPGroup::build(document, repr);
diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp
index 4b12df21b..15cdf11fe 100644
--- a/src/object/color-profile.cpp
+++ b/src/object/color-profile.cpp
@@ -215,8 +215,7 @@ ColorProfile::ColorProfile() : SPObject() {
this->rendering_intent = Inkscape::RENDERING_INTENT_UNKNOWN;
}
-ColorProfile::~ColorProfile() {
-}
+ColorProfile::~ColorProfile() = default;
bool ColorProfile::operator<(ColorProfile const &other) const {
gchar *a_name_casefold = g_utf8_casefold(this->name, -1 );
@@ -1211,8 +1210,7 @@ MemProfile::MemProfile() :
}
MemProfile::~MemProfile()
-{
-}
+= default;
static std::vector<MemProfile> perMonitorProfiles;
diff --git a/src/object/filters/blend.cpp b/src/object/filters/blend.cpp
index 6137843a3..400520e5b 100644
--- a/src/object/filters/blend.cpp
+++ b/src/object/filters/blend.cpp
@@ -32,8 +32,7 @@ SPFeBlend::SPFeBlend()
{
}
-SPFeBlend::~SPFeBlend() {
-}
+SPFeBlend::~SPFeBlend() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeBlend variables. For this to get called,
diff --git a/src/object/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp
index ebeab56c1..4f4498e32 100644
--- a/src/object/filters/colormatrix.cpp
+++ b/src/object/filters/colormatrix.cpp
@@ -29,8 +29,7 @@ SPFeColorMatrix::SPFeColorMatrix()
{
}
-SPFeColorMatrix::~SPFeColorMatrix() {
-}
+SPFeColorMatrix::~SPFeColorMatrix() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeColorMatrix variables. For this to get called,
diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp
index 23c8dbd96..5fb454075 100644
--- a/src/object/filters/componenttransfer-funcnode.cpp
+++ b/src/object/filters/componenttransfer-funcnode.cpp
@@ -31,8 +31,7 @@ SPFeFuncNode::SPFeFuncNode(SPFeFuncNode::Channel channel)
slope(1), intercept(0), amplitude(1), exponent(1), offset(0), channel(channel) {
}
-SPFeFuncNode::~SPFeFuncNode() {
-}
+SPFeFuncNode::~SPFeFuncNode() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPDistantLight variables. For this to get called,
diff --git a/src/object/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp
index fe488ce74..b7a85fbae 100644
--- a/src/object/filters/componenttransfer.cpp
+++ b/src/object/filters/componenttransfer.cpp
@@ -28,8 +28,7 @@ SPFeComponentTransfer::SPFeComponentTransfer()
{
}
-SPFeComponentTransfer::~SPFeComponentTransfer() {
-}
+SPFeComponentTransfer::~SPFeComponentTransfer() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeComponentTransfer variables. For this to get called,
diff --git a/src/object/filters/composite.cpp b/src/object/filters/composite.cpp
index 2b5cdf75e..9954cd7a1 100644
--- a/src/object/filters/composite.cpp
+++ b/src/object/filters/composite.cpp
@@ -32,8 +32,7 @@ SPFeComposite::SPFeComposite()
{
}
-SPFeComposite::~SPFeComposite() {
-}
+SPFeComposite::~SPFeComposite() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeComposite variables. For this to get called,
diff --git a/src/object/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp
index 4f2588695..2466fe396 100644
--- a/src/object/filters/convolvematrix.cpp
+++ b/src/object/filters/convolvematrix.cpp
@@ -44,8 +44,7 @@ SPFeConvolveMatrix::SPFeConvolveMatrix() : SPFilterPrimitive() {
this->kernelMatrixIsSet = false;
}
-SPFeConvolveMatrix::~SPFeConvolveMatrix() {
-}
+SPFeConvolveMatrix::~SPFeConvolveMatrix() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeConvolveMatrix variables. For this to get called,
diff --git a/src/object/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp
index a11ddf507..bad591a22 100644
--- a/src/object/filters/diffuselighting.cpp
+++ b/src/object/filters/diffuselighting.cpp
@@ -49,8 +49,7 @@ SPFeDiffuseLighting::SPFeDiffuseLighting() : SPFilterPrimitive() {
this->lighting_color_set = FALSE;
}
-SPFeDiffuseLighting::~SPFeDiffuseLighting() {
-}
+SPFeDiffuseLighting::~SPFeDiffuseLighting() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeDiffuseLighting variables. For this to get called,
diff --git a/src/object/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp
index 7d4106648..dccd78dcd 100644
--- a/src/object/filters/displacementmap.cpp
+++ b/src/object/filters/displacementmap.cpp
@@ -33,8 +33,7 @@ SPFeDisplacementMap::SPFeDisplacementMap() : SPFilterPrimitive() {
this->in2 = Inkscape::Filters::NR_FILTER_SLOT_NOT_SET;
}
-SPFeDisplacementMap::~SPFeDisplacementMap() {
-}
+SPFeDisplacementMap::~SPFeDisplacementMap() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeDisplacementMap variables. For this to get called,
diff --git a/src/object/filters/distantlight.cpp b/src/object/filters/distantlight.cpp
index bec28f66f..382cba4eb 100644
--- a/src/object/filters/distantlight.cpp
+++ b/src/object/filters/distantlight.cpp
@@ -32,8 +32,7 @@ SPFeDistantLight::SPFeDistantLight()
: SPObject(), azimuth(0), azimuth_set(FALSE), elevation(0), elevation_set(FALSE) {
}
-SPFeDistantLight::~SPFeDistantLight() {
-}
+SPFeDistantLight::~SPFeDistantLight() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPDistantLight variables. For this to get called,
diff --git a/src/object/filters/flood.cpp b/src/object/filters/flood.cpp
index da0af4737..6b7cac482 100644
--- a/src/object/filters/flood.cpp
+++ b/src/object/filters/flood.cpp
@@ -32,8 +32,7 @@ SPFeFlood::SPFeFlood() : SPFilterPrimitive() {
this->icc = nullptr;
}
-SPFeFlood::~SPFeFlood() {
-}
+SPFeFlood::~SPFeFlood() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeFlood variables. For this to get called,
diff --git a/src/object/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp
index 81addb8e1..19eb532b4 100644
--- a/src/object/filters/gaussian-blur.cpp
+++ b/src/object/filters/gaussian-blur.cpp
@@ -31,8 +31,7 @@
SPGaussianBlur::SPGaussianBlur() : SPFilterPrimitive() {
}
-SPGaussianBlur::~SPGaussianBlur() {
-}
+SPGaussianBlur::~SPGaussianBlur() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPGaussianBlur variables. For this to get called,
diff --git a/src/object/filters/image.cpp b/src/object/filters/image.cpp
index 25ac3024a..4b58ce464 100644
--- a/src/object/filters/image.cpp
+++ b/src/object/filters/image.cpp
@@ -43,8 +43,7 @@ SPFeImage::SPFeImage() : SPFilterPrimitive() {
this->aspect_clip = SP_ASPECT_MEET; // Default
}
-SPFeImage::~SPFeImage() {
-}
+SPFeImage::~SPFeImage() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeImage variables. For this to get called,
diff --git a/src/object/filters/merge.cpp b/src/object/filters/merge.cpp
index ddd19e732..d96834d73 100644
--- a/src/object/filters/merge.cpp
+++ b/src/object/filters/merge.cpp
@@ -23,8 +23,7 @@
SPFeMerge::SPFeMerge() : SPFilterPrimitive() {
}
-SPFeMerge::~SPFeMerge() {
-}
+SPFeMerge::~SPFeMerge() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeMerge variables. For this to get called,
diff --git a/src/object/filters/mergenode.cpp b/src/object/filters/mergenode.cpp
index 04ab2af95..a6824c061 100644
--- a/src/object/filters/mergenode.cpp
+++ b/src/object/filters/mergenode.cpp
@@ -26,8 +26,7 @@ SPFeMergeNode::SPFeMergeNode()
: SPObject(), input(Inkscape::Filters::NR_FILTER_SLOT_NOT_SET) {
}
-SPFeMergeNode::~SPFeMergeNode() {
-}
+SPFeMergeNode::~SPFeMergeNode() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeMergeNode variables. For this to get called,
diff --git a/src/object/filters/morphology.cpp b/src/object/filters/morphology.cpp
index 6f1006372..ee7b1eaaa 100644
--- a/src/object/filters/morphology.cpp
+++ b/src/object/filters/morphology.cpp
@@ -28,8 +28,7 @@ SPFeMorphology::SPFeMorphology() : SPFilterPrimitive() {
this->radius.set("0");
}
-SPFeMorphology::~SPFeMorphology() {
-}
+SPFeMorphology::~SPFeMorphology() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeMorphology variables. For this to get called,
diff --git a/src/object/filters/offset.cpp b/src/object/filters/offset.cpp
index ed674afbf..699a0bfb9 100644
--- a/src/object/filters/offset.cpp
+++ b/src/object/filters/offset.cpp
@@ -30,8 +30,7 @@ SPFeOffset::SPFeOffset() : SPFilterPrimitive() {
this->dy = 0;
}
-SPFeOffset::~SPFeOffset() {
-}
+SPFeOffset::~SPFeOffset() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeOffset variables. For this to get called,
diff --git a/src/object/filters/pointlight.cpp b/src/object/filters/pointlight.cpp
index c12d68ceb..8c8101356 100644
--- a/src/object/filters/pointlight.cpp
+++ b/src/object/filters/pointlight.cpp
@@ -33,8 +33,7 @@ SPFePointLight::SPFePointLight()
: SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE) {
}
-SPFePointLight::~SPFePointLight() {
-}
+SPFePointLight::~SPFePointLight() = default;
/**
diff --git a/src/object/filters/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp
index 7f93754b9..f418bcb4e 100644
--- a/src/object/filters/sp-filter-primitive.cpp
+++ b/src/object/filters/sp-filter-primitive.cpp
@@ -48,8 +48,7 @@ SPFilterPrimitive::SPFilterPrimitive() : SPObject() {
this->height.unset(SVGLength::PERCENT, 1, 0);
}
-SPFilterPrimitive::~SPFilterPrimitive() {
-}
+SPFilterPrimitive::~SPFilterPrimitive() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFilterPrimitive variables. For this to get called,
diff --git a/src/object/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp
index 3e66d6f95..81b574fdd 100644
--- a/src/object/filters/specularlighting.cpp
+++ b/src/object/filters/specularlighting.cpp
@@ -53,8 +53,7 @@ SPFeSpecularLighting::SPFeSpecularLighting() : SPFilterPrimitive() {
this->lighting_color_set = FALSE;
}
-SPFeSpecularLighting::~SPFeSpecularLighting() {
-}
+SPFeSpecularLighting::~SPFeSpecularLighting() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeSpecularLighting variables. For this to get called,
diff --git a/src/object/filters/spotlight.cpp b/src/object/filters/spotlight.cpp
index 239391478..9d911047a 100644
--- a/src/object/filters/spotlight.cpp
+++ b/src/object/filters/spotlight.cpp
@@ -33,8 +33,7 @@ SPFeSpotLight::SPFeSpotLight()
{
}
-SPFeSpotLight::~SPFeSpotLight() {
-}
+SPFeSpotLight::~SPFeSpotLight() = default;
/**
diff --git a/src/object/filters/tile.cpp b/src/object/filters/tile.cpp
index f36c5a758..da17fa004 100644
--- a/src/object/filters/tile.cpp
+++ b/src/object/filters/tile.cpp
@@ -25,8 +25,7 @@
SPFeTile::SPFeTile() : SPFilterPrimitive() {
}
-SPFeTile::~SPFeTile() {
-}
+SPFeTile::~SPFeTile() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeTile variables. For this to get called,
diff --git a/src/object/filters/turbulence.cpp b/src/object/filters/turbulence.cpp
index 657e44d6a..b626b2380 100644
--- a/src/object/filters/turbulence.cpp
+++ b/src/object/filters/turbulence.cpp
@@ -31,8 +31,7 @@ SPFeTurbulence::SPFeTurbulence() : SPFilterPrimitive() {
this->updated=false;
}
-SPFeTurbulence::~SPFeTurbulence() {
-}
+SPFeTurbulence::~SPFeTurbulence() = default;
/**
* Reads the Inkscape::XML::Node, and initializes SPFeTurbulence variables. For this to get called,
diff --git a/src/object/persp3d.cpp b/src/object/persp3d.cpp
index 8020d0221..2183b6236 100644
--- a/src/object/persp3d.cpp
+++ b/src/object/persp3d.cpp
@@ -57,8 +57,7 @@ Persp3D::Persp3D() : SPObject() {
this->perspective_impl = new Persp3DImpl();
}
-Persp3D::~Persp3D() {
-}
+Persp3D::~Persp3D() = default;
/**
diff --git a/src/object/sp-anchor.cpp b/src/object/sp-anchor.cpp
index 3baa7b7ca..4af737125 100644
--- a/src/object/sp-anchor.cpp
+++ b/src/object/sp-anchor.cpp
@@ -29,8 +29,7 @@ SPAnchor::SPAnchor() : SPGroup() {
this->page = nullptr;
}
-SPAnchor::~SPAnchor() {
-}
+SPAnchor::~SPAnchor() = default;
void SPAnchor::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPGroup::build(document, repr);
diff --git a/src/object/sp-clippath.cpp b/src/object/sp-clippath.cpp
index 3ef849c14..321f6a80f 100644
--- a/src/object/sp-clippath.cpp
+++ b/src/object/sp-clippath.cpp
@@ -48,8 +48,7 @@ SPClipPath::SPClipPath() : SPObjectGroup() {
this->display = nullptr;
}
-SPClipPath::~SPClipPath() {
-}
+SPClipPath::~SPClipPath() = default;
void SPClipPath::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObjectGroup::build(doc, repr);
diff --git a/src/object/sp-defs.cpp b/src/object/sp-defs.cpp
index 4fb3e6688..ea507fe87 100644
--- a/src/object/sp-defs.cpp
+++ b/src/object/sp-defs.cpp
@@ -23,8 +23,7 @@
SPDefs::SPDefs() : SPObject() {
}
-SPDefs::~SPDefs() {
-}
+SPDefs::~SPDefs() = default;
void SPDefs::release() {
SPObject::release();
diff --git a/src/object/sp-desc.cpp b/src/object/sp-desc.cpp
index 3c75d087a..08a08bb95 100644
--- a/src/object/sp-desc.cpp
+++ b/src/object/sp-desc.cpp
@@ -15,8 +15,7 @@
SPDesc::SPDesc() : SPObject() {
}
-SPDesc::~SPDesc() {
-}
+SPDesc::~SPDesc() = default;
/**
* Writes it's settings to an incoming repr object, if any.
diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index f30a06ca1..7856429e3 100644
--- a/src/object/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
@@ -48,8 +48,7 @@ SPGenericEllipse::SPGenericEllipse()
}
SPGenericEllipse::~SPGenericEllipse()
-{
-}
+= default;
void SPGenericEllipse::build(SPDocument *document, Inkscape::XML::Node *repr)
{
diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp
index a77ef9e24..5668061ba 100644
--- a/src/object/sp-filter.cpp
+++ b/src/object/sp-filter.cpp
@@ -59,8 +59,7 @@ SPFilter::SPFilter()
this->_image_name->clear();
}
-SPFilter::~SPFilter() {
-}
+SPFilter::~SPFilter() = default;
/**
diff --git a/src/object/sp-flowdiv.cpp b/src/object/sp-flowdiv.cpp
index d79ff349d..b4e32d295 100644
--- a/src/object/sp-flowdiv.cpp
+++ b/src/object/sp-flowdiv.cpp
@@ -9,8 +9,7 @@
SPFlowdiv::SPFlowdiv() : SPItem() {
}
-SPFlowdiv::~SPFlowdiv() {
-}
+SPFlowdiv::~SPFlowdiv() = default;
void SPFlowdiv::release() {
SPItem::release();
@@ -137,8 +136,7 @@ Inkscape::XML::Node* SPFlowdiv::write(Inkscape::XML::Document *xml_doc, Inkscape
SPFlowtspan::SPFlowtspan() : SPItem() {
}
-SPFlowtspan::~SPFlowtspan() {
-}
+SPFlowtspan::~SPFlowtspan() = default;
void SPFlowtspan::release() {
SPItem::release();
@@ -259,8 +257,7 @@ Inkscape::XML::Node *SPFlowtspan::write(Inkscape::XML::Document *xml_doc, Inksca
SPFlowpara::SPFlowpara() : SPItem() {
}
-SPFlowpara::~SPFlowpara() {
-}
+SPFlowpara::~SPFlowpara() = default;
void SPFlowpara::release() {
SPItem::release();
@@ -384,8 +381,7 @@ Inkscape::XML::Node *SPFlowpara::write(Inkscape::XML::Document *xml_doc, Inkscap
SPFlowline::SPFlowline() : SPObject() {
}
-SPFlowline::~SPFlowline() {
-}
+SPFlowline::~SPFlowline() = default;
void SPFlowline::release() {
SPObject::release();
@@ -421,8 +417,7 @@ Inkscape::XML::Node *SPFlowline::write(Inkscape::XML::Document *xml_doc, Inkscap
SPFlowregionbreak::SPFlowregionbreak() : SPObject() {
}
-SPFlowregionbreak::~SPFlowregionbreak() {
-}
+SPFlowregionbreak::~SPFlowregionbreak() = default;
void SPFlowregionbreak::release() {
SPObject::release();
diff --git a/src/object/sp-flowtext.cpp b/src/object/sp-flowtext.cpp
index 3811f4072..334282103 100644
--- a/src/object/sp-flowtext.cpp
+++ b/src/object/sp-flowtext.cpp
@@ -39,8 +39,7 @@ SPFlowtext::SPFlowtext() : SPItem(),
{
}
-SPFlowtext::~SPFlowtext() {
-}
+SPFlowtext::~SPFlowtext() = default;
void SPFlowtext::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) {
SPItem::child_added(child, ref);
diff --git a/src/object/sp-font-face.cpp b/src/object/sp-font-face.cpp
index 754956058..a60dd6110 100644
--- a/src/object/sp-font-face.cpp
+++ b/src/object/sp-font-face.cpp
@@ -311,8 +311,7 @@ SPFontFace::SPFontFace() : SPObject() {
this->overline_thickness = 0;
}
-SPFontFace::~SPFontFace() {
-}
+SPFontFace::~SPFontFace() = default;
void SPFontFace::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPObject::build(document, repr);
diff --git a/src/object/sp-font.cpp b/src/object/sp-font.cpp
index 4701e8690..6736da200 100644
--- a/src/object/sp-font.cpp
+++ b/src/object/sp-font.cpp
@@ -38,8 +38,7 @@ SPFont::SPFont() : SPObject() {
this->vert_adv_y = FNT_UNITS_PER_EM;
}
-SPFont::~SPFont() {
-}
+SPFont::~SPFont() = default;
void SPFont::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPObject::build(document, repr);
diff --git a/src/object/sp-glyph-kerning.h b/src/object/sp-glyph-kerning.h
index 10624f17d..0fca561e2 100644
--- a/src/object/sp-glyph-kerning.h
+++ b/src/object/sp-glyph-kerning.h
@@ -35,7 +35,7 @@ private:
class SPGlyphKerning : public SPObject {
public:
SPGlyphKerning();
- ~SPGlyphKerning() override {}
+ ~SPGlyphKerning() override = default;
// FIXME encapsulation
UnicodeRange* u1;
@@ -53,11 +53,11 @@ protected:
};
class SPHkern : public SPGlyphKerning {
- ~SPHkern() override {}
+ ~SPHkern() override = default;
};
class SPVkern : public SPGlyphKerning {
- ~SPVkern() override {}
+ ~SPVkern() override = default;
};
#endif // !SEEN_SP_GLYPH_KERNING_H
diff --git a/src/object/sp-glyph.h b/src/object/sp-glyph.h
index 49c644b21..17a34a664 100644
--- a/src/object/sp-glyph.h
+++ b/src/object/sp-glyph.h
@@ -35,7 +35,7 @@ enum glyphOrientation {
class SPGlyph : public SPObject {
public:
SPGlyph();
- ~SPGlyph() override {}
+ ~SPGlyph() override = default;
// FIXME encapsulation
Glib::ustring unicode;
diff --git a/src/object/sp-gradient.cpp b/src/object/sp-gradient.cpp
index 0dfee1385..1fed2a206 100644
--- a/src/object/sp-gradient.cpp
+++ b/src/object/sp-gradient.cpp
@@ -257,8 +257,7 @@ SPGradient::SPGradient() : SPPaintServer(), units(),
this->vector.stops.clear();
}
-SPGradient::~SPGradient() {
-}
+SPGradient::~SPGradient() = default;
/**
* Virtual build: set gradient attributes from its associated repr.
diff --git a/src/object/sp-guide.h b/src/object/sp-guide.h
index 3ce3cc3de..0d9b8afc2 100644
--- a/src/object/sp-guide.h
+++ b/src/object/sp-guide.h
@@ -35,7 +35,7 @@ struct SPGuideLine;
class SPGuide : public SPObject {
public:
SPGuide();
- ~SPGuide() override {}
+ ~SPGuide() override = default;
void set_color(const unsigned r, const unsigned g, const unsigned b, bool const commit);
void setColor(guint32 c);
diff --git a/src/object/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp
index 649fefe94..25d6face1 100644
--- a/src/object/sp-hatch-path.cpp
+++ b/src/object/sp-hatch-path.cpp
@@ -39,8 +39,7 @@ SPHatchPath::SPHatchPath()
}
SPHatchPath::~SPHatchPath()
-{
-}
+= default;
void SPHatchPath::setCurve(SPCurve *new_curve, bool owner)
{
diff --git a/src/object/sp-hatch.cpp b/src/object/sp-hatch.cpp
index 0675c66ac..92da7dd69 100644
--- a/src/object/sp-hatch.cpp
+++ b/src/object/sp-hatch.cpp
@@ -58,8 +58,7 @@ SPHatch::SPHatch()
_rotate.unset();
}
-SPHatch::~SPHatch() {
-}
+SPHatch::~SPHatch() = default;
void SPHatch::build(SPDocument* doc, Inkscape::XML::Node* repr)
{
@@ -721,8 +720,7 @@ SPHatch::RenderInfo::RenderInfo()
}
SPHatch::RenderInfo::~RenderInfo()
-{
-}
+= default;
//
diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp
index 18e8b6674..a1efef51d 100644
--- a/src/object/sp-image.cpp
+++ b/src/object/sp-image.cpp
@@ -127,8 +127,7 @@ SPImage::SPImage() : SPItem(), SPViewBox() {
this->pixbuf = nullptr;
}
-SPImage::~SPImage() {
-}
+SPImage::~SPImage() = default;
void SPImage::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPItem::build(document, repr);
diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp
index 735248248..f0ff9e4fc 100644
--- a/src/object/sp-item-group.cpp
+++ b/src/object/sp-item-group.cpp
@@ -67,8 +67,7 @@ SPGroup::SPGroup() : SPLPEItem(),
{
}
-SPGroup::~SPGroup() {
-}
+SPGroup::~SPGroup() = default;
void SPGroup::build(SPDocument *document, Inkscape::XML::Node *repr) {
this->readAttr( "inkscape:groupmode" );
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index 4d9b4d7bf..6e4a163dc 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -102,8 +102,7 @@ SPItem::SPItem() : SPObject() {
avoidRef = new SPAvoidRef(this);
}
-SPItem::~SPItem() {
-}
+SPItem::~SPItem() = default;
bool SPItem::isVisibleAndUnlocked() const {
return (!isHidden() && !isLocked());
diff --git a/src/object/sp-line.cpp b/src/object/sp-line.cpp
index 2ba633972..2f06ddeef 100644
--- a/src/object/sp-line.cpp
+++ b/src/object/sp-line.cpp
@@ -27,8 +27,7 @@ SPLine::SPLine() : SPShape() {
this->y2.unset();
}
-SPLine::~SPLine() {
-}
+SPLine::~SPLine() = default;
void SPLine::build(SPDocument * document, Inkscape::XML::Node * repr) {
SPShape::build(document, repr);
diff --git a/src/object/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp
index 29579b617..5e0100251 100644
--- a/src/object/sp-linear-gradient.cpp
+++ b/src/object/sp-linear-gradient.cpp
@@ -15,8 +15,7 @@ SPLinearGradient::SPLinearGradient() : SPGradient() {
this->y2.unset(SVGLength::PERCENT, 0.0, 0.0);
}
-SPLinearGradient::~SPLinearGradient() {
-}
+SPLinearGradient::~SPLinearGradient() = default;
void SPLinearGradient::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPGradient::build(document, repr);
diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp
index 9f81b0307..785644437 100644
--- a/src/object/sp-lpe-item.cpp
+++ b/src/object/sp-lpe-item.cpp
@@ -66,8 +66,7 @@ SPLPEItem::SPLPEItem()
{
}
-SPLPEItem::~SPLPEItem() {
-}
+SPLPEItem::~SPLPEItem() = default;
void SPLPEItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
this->readAttr( "inkscape:path-effect" );
diff --git a/src/object/sp-marker.cpp b/src/object/sp-marker.cpp
index 851a7d54f..3a504db90 100644
--- a/src/object/sp-marker.cpp
+++ b/src/object/sp-marker.cpp
@@ -34,7 +34,7 @@ class SPMarkerView {
public:
- SPMarkerView() {};
+ SPMarkerView() = default;;
~SPMarkerView() {
for (unsigned int i = 0; i < items.size(); ++i) {
delete items[i];
@@ -63,8 +63,7 @@ SPMarker::SPMarker() : SPGroup(), SPViewBox(),
* not set and initializes the marker's c2p identity matrix.
*/
-SPMarker::~SPMarker() {
-}
+SPMarker::~SPMarker() = default;
/**
* Virtual build callback for SPMarker.
diff --git a/src/object/sp-mask.cpp b/src/object/sp-mask.cpp
index 5e6ed29f0..0d225d80a 100644
--- a/src/object/sp-mask.cpp
+++ b/src/object/sp-mask.cpp
@@ -50,8 +50,7 @@ SPMask::SPMask() : SPObjectGroup() {
this->display = nullptr;
}
-SPMask::~SPMask() {
-}
+SPMask::~SPMask() = default;
void SPMask::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObjectGroup::build(doc, repr);
diff --git a/src/object/sp-mesh-patch.cpp b/src/object/sp-mesh-patch.cpp
index 1110e15ca..15149b689 100644
--- a/src/object/sp-mesh-patch.cpp
+++ b/src/object/sp-mesh-patch.cpp
@@ -61,8 +61,7 @@ SPMeshpatch::SPMeshpatch() : SPObject() {
this->tensor_string = nullptr;
}
-SPMeshpatch::~SPMeshpatch() {
-}
+SPMeshpatch::~SPMeshpatch() = default;
void SPMeshpatch::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObject::build(doc, repr);
diff --git a/src/object/sp-mesh-row.cpp b/src/object/sp-mesh-row.cpp
index 03d71c6f5..52e3b326e 100644
--- a/src/object/sp-mesh-row.cpp
+++ b/src/object/sp-mesh-row.cpp
@@ -58,8 +58,7 @@ SPMeshrow* SPMeshrow::getPrevMeshrow()
SPMeshrow::SPMeshrow() : SPObject() {
}
-SPMeshrow::~SPMeshrow() {
-}
+SPMeshrow::~SPMeshrow() = default;
void SPMeshrow::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObject::build(doc, repr);
diff --git a/src/object/sp-metadata.cpp b/src/object/sp-metadata.cpp
index 04cddbb8b..39f42d3ff 100644
--- a/src/object/sp-metadata.cpp
+++ b/src/object/sp-metadata.cpp
@@ -36,8 +36,7 @@
SPMetadata::SPMetadata() : SPObject() {
}
-SPMetadata::~SPMetadata() {
-}
+SPMetadata::~SPMetadata() = default;
namespace {
diff --git a/src/object/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp
index 7b10b4e9a..d3da6ccff 100644
--- a/src/object/sp-missing-glyph.cpp
+++ b/src/object/sp-missing-glyph.cpp
@@ -28,8 +28,7 @@ SPMissingGlyph::SPMissingGlyph() : SPObject() {
this->vert_adv_y = 0;
}
-SPMissingGlyph::~SPMissingGlyph() {
-}
+SPMissingGlyph::~SPMissingGlyph() = default;
void SPMissingGlyph::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObject::build(doc, repr);
diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp
index a384c23c9..0028939d3 100644
--- a/src/object/sp-namedview.cpp
+++ b/src/object/sp-namedview.cpp
@@ -96,8 +96,7 @@ SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) {
this->connector_spacing = defaultConnSpacing;
}
-SPNamedView::~SPNamedView() {
-}
+SPNamedView::~SPNamedView() = default;
static void sp_namedview_generate_old_grid(SPNamedView * /*nv*/, SPDocument *document, Inkscape::XML::Node *repr) {
bool old_grid_settings_present = false;
diff --git a/src/object/sp-object-group.cpp b/src/object/sp-object-group.cpp
index 102eafa83..422e20da4 100644
--- a/src/object/sp-object-group.cpp
+++ b/src/object/sp-object-group.cpp
@@ -19,8 +19,7 @@
SPObjectGroup::SPObjectGroup() : SPObject() {
}
-SPObjectGroup::~SPObjectGroup() {
-}
+SPObjectGroup::~SPObjectGroup() = default;
void SPObjectGroup::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
SPObject::child_added(child, ref);
diff --git a/src/object/sp-paint-server.cpp b/src/object/sp-paint-server.cpp
index 3e685ad24..79e60d116 100644
--- a/src/object/sp-paint-server.cpp
+++ b/src/object/sp-paint-server.cpp
@@ -33,8 +33,7 @@ SPPaintServer::SPPaintServer() : SPObject() {
this->swatch = 0;
}
-SPPaintServer::~SPPaintServer() {
-}
+SPPaintServer::~SPPaintServer() = default;
bool SPPaintServer::isSwatch() const
{
diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp
index 51fa549e7..44070b6a3 100644
--- a/src/object/sp-path.cpp
+++ b/src/object/sp-path.cpp
@@ -112,8 +112,7 @@ void SPPath::convert_to_guides() const {
SPPath::SPPath() : SPShape(), connEndPair(this) {
}
-SPPath::~SPPath() {
-}
+SPPath::~SPPath() = default;
void SPPath::build(SPDocument *document, Inkscape::XML::Node *repr) {
/* Are these calls actually necessary? */
diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp
index 911f0873a..d2167c297 100644
--- a/src/object/sp-pattern.cpp
+++ b/src/object/sp-pattern.cpp
@@ -60,7 +60,7 @@ SPPattern::SPPattern()
this->_height.unset();
}
-SPPattern::~SPPattern() {}
+SPPattern::~SPPattern() = default;
void SPPattern::build(SPDocument *doc, Inkscape::XML::Node *repr)
{
diff --git a/src/object/sp-polygon.cpp b/src/object/sp-polygon.cpp
index 90bc0c731..205120cfa 100644
--- a/src/object/sp-polygon.cpp
+++ b/src/object/sp-polygon.cpp
@@ -24,8 +24,7 @@
SPPolygon::SPPolygon() : SPShape() {
}
-SPPolygon::~SPPolygon() {
-}
+SPPolygon::~SPPolygon() = default;
void SPPolygon::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPPolygon* object = this;
diff --git a/src/object/sp-polyline.cpp b/src/object/sp-polyline.cpp
index aa8dab7e2..083cb3066 100644
--- a/src/object/sp-polyline.cpp
+++ b/src/object/sp-polyline.cpp
@@ -21,8 +21,7 @@
SPPolyLine::SPPolyLine() : SPShape() {
}
-SPPolyLine::~SPPolyLine() {
-}
+SPPolyLine::~SPPolyLine() = default;
void SPPolyLine::build(SPDocument * document, Inkscape::XML::Node * repr) {
SPShape::build(document, repr);
diff --git a/src/object/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp
index fa6355478..4f776d334 100644
--- a/src/object/sp-radial-gradient.cpp
+++ b/src/object/sp-radial-gradient.cpp
@@ -19,8 +19,7 @@ SPRadialGradient::SPRadialGradient() : SPGradient() {
this->fr.unset(SVGLength::PERCENT, 0.5, 0.5);
}
-SPRadialGradient::~SPRadialGradient() {
-}
+SPRadialGradient::~SPRadialGradient() = default;
/**
* Set radial gradient attributes from associated repr.
diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp
index 783ad309a..e3c5bf450 100644
--- a/src/object/sp-rect.cpp
+++ b/src/object/sp-rect.cpp
@@ -33,8 +33,7 @@
SPRect::SPRect() : SPShape() {
}
-SPRect::~SPRect() {
-}
+SPRect::~SPRect() = default;
void SPRect::build(SPDocument* doc, Inkscape::XML::Node* repr) {
#ifdef OBJECT_TRACE
diff --git a/src/object/sp-root.cpp b/src/object/sp-root.cpp
index d1c4b4d35..592aae443 100644
--- a/src/object/sp-root.cpp
+++ b/src/object/sp-root.cpp
@@ -48,8 +48,7 @@ SPRoot::SPRoot() : SPGroup(), SPViewBox()
}
SPRoot::~SPRoot()
-{
-}
+= default;
void SPRoot::unset_x_and_y()
{
diff --git a/src/object/sp-script.cpp b/src/object/sp-script.cpp
index 45cf25bbf..e60789eb0 100644
--- a/src/object/sp-script.cpp
+++ b/src/object/sp-script.cpp
@@ -18,8 +18,7 @@ SPScript::SPScript() : SPObject() {
this->xlinkhref = nullptr;
}
-SPScript::~SPScript() {
-}
+SPScript::~SPScript() = default;
void SPScript::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObject::build(doc, repr);
diff --git a/src/object/sp-solid-color.cpp b/src/object/sp-solid-color.cpp
index 89858c18c..f8694d7c6 100644
--- a/src/object/sp-solid-color.cpp
+++ b/src/object/sp-solid-color.cpp
@@ -22,8 +22,7 @@
SPSolidColor::SPSolidColor() : SPPaintServer() {
}
-SPSolidColor::~SPSolidColor() {
-}
+SPSolidColor::~SPSolidColor() = default;
void SPSolidColor::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPPaintServer::build(doc, repr);
diff --git a/src/object/sp-spiral.cpp b/src/object/sp-spiral.cpp
index 37e68d7c2..442580888 100644
--- a/src/object/sp-spiral.cpp
+++ b/src/object/sp-spiral.cpp
@@ -38,8 +38,7 @@ SPSpiral::SPSpiral()
{
}
-SPSpiral::~SPSpiral() {
-}
+SPSpiral::~SPSpiral() = default;
void SPSpiral::build(SPDocument * document, Inkscape::XML::Node * repr) {
SPShape::build(document, repr);
diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp
index fdb85e392..1375bcecb 100644
--- a/src/object/sp-star.cpp
+++ b/src/object/sp-star.cpp
@@ -43,8 +43,7 @@ SPStar::SPStar() : SPPolygon() ,
this->arg[0] = this->arg[1] = 0.0;
}
-SPStar::~SPStar() {
-}
+SPStar::~SPStar() = default;
void SPStar::build(SPDocument * document, Inkscape::XML::Node * repr) {
// CPPIFY: see header file
diff --git a/src/object/sp-stop.cpp b/src/object/sp-stop.cpp
index d016e6366..197bc519f 100644
--- a/src/object/sp-stop.cpp
+++ b/src/object/sp-stop.cpp
@@ -32,8 +32,7 @@ SPStop::SPStop() : SPObject() {
this->opacity = 1.0;
}
-SPStop::~SPStop() {
-}
+SPStop::~SPStop() = default;
void SPStop::build(SPDocument* doc, Inkscape::XML::Node* repr) {
SPObject::build(doc, repr);
diff --git a/src/object/sp-string.cpp b/src/object/sp-string.cpp
index a01b05e8f..cadc4091c 100644
--- a/src/object/sp-string.cpp
+++ b/src/object/sp-string.cpp
@@ -36,8 +36,7 @@ SPString::SPString() : SPObject() {
// style = nullptr;
}
-SPString::~SPString() {
-}
+SPString::~SPString() = default;
void SPString::build(SPDocument *doc, Inkscape::XML::Node *repr) {
diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index c273c844f..7ccea3ea4 100644
--- a/src/object/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
@@ -22,8 +22,7 @@ SPStyleElem::SPStyleElem() : SPObject() {
this->is_css = false;
}
-SPStyleElem::~SPStyleElem() {
-}
+SPStyleElem::~SPStyleElem() = default;
void SPStyleElem::set(unsigned int key, const gchar* value) {
switch (key) {
diff --git a/src/object/sp-symbol.cpp b/src/object/sp-symbol.cpp
index 07e6f660e..d3a06a60b 100644
--- a/src/object/sp-symbol.cpp
+++ b/src/object/sp-symbol.cpp
@@ -28,8 +28,7 @@
SPSymbol::SPSymbol() : SPGroup(), SPViewBox() {
}
-SPSymbol::~SPSymbol() {
-}
+SPSymbol::~SPSymbol() = default;
void SPSymbol::build(SPDocument *document, Inkscape::XML::Node *repr) {
this->readAttr( "viewBox" );
diff --git a/src/object/sp-tag.h b/src/object/sp-tag.h
index cb06ab2cb..1a1c737d8 100644
--- a/src/object/sp-tag.h
+++ b/src/object/sp-tag.h
@@ -23,8 +23,8 @@ class SPTag;
class SPTag : public SPObject {
public:
- SPTag() {}
- ~SPTag() override {}
+ SPTag() = default;
+ ~SPTag() override = default;
void build(SPDocument * doc, Inkscape::XML::Node *repr) override;
//virtual void release();
diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp
index bd0df6381..245330720 100644
--- a/src/object/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -61,8 +61,7 @@
SPText::SPText() : SPItem() {
}
-SPText::~SPText() {
-}
+SPText::~SPText() = default;
void SPText::build(SPDocument *doc, Inkscape::XML::Node *repr) {
this->readAttr( "x" );
diff --git a/src/object/sp-title.cpp b/src/object/sp-title.cpp
index ba5ae754a..b9e966797 100644
--- a/src/object/sp-title.cpp
+++ b/src/object/sp-title.cpp
@@ -15,8 +15,7 @@
SPTitle::SPTitle() : SPObject() {
}
-SPTitle::~SPTitle() {
-}
+SPTitle::~SPTitle() = default;
Inkscape::XML::Node* SPTitle::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
SPTitle* object = this;
diff --git a/src/object/sp-tspan.cpp b/src/object/sp-tspan.cpp
index 4df068c98..25f9e6764 100644
--- a/src/object/sp-tspan.cpp
+++ b/src/object/sp-tspan.cpp
@@ -55,8 +55,7 @@ SPTSpan::SPTSpan() : SPItem() {
this->role = SP_TSPAN_ROLE_UNSPECIFIED;
}
-SPTSpan::~SPTSpan() {
-}
+SPTSpan::~SPTSpan() = default;
void SPTSpan::build(SPDocument *doc, Inkscape::XML::Node *repr) {
this->readAttr( "x" );
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 6725c1314..b7242a48d 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -75,7 +75,7 @@ public:
_observer(o),
_filter(filter)
{}
- ~PrefNodeObserver() override {}
+ ~PrefNodeObserver() override = default;
void notifyAttributeChanged(XML::Node &node, GQuark name, Util::ptr_shared, Util::ptr_shared) override;
private:
Observer &_observer;
diff --git a/src/preferences.h b/src/preferences.h
index 9ac007528..ac9a268a6 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -28,7 +28,7 @@ namespace Inkscape {
class ErrorReporter {
public:
- virtual ~ErrorReporter() {}
+ virtual ~ErrorReporter() = default;
virtual void handleError(Glib::ustring const& primary, Glib::ustring const& secondary ) const = 0;
};
@@ -121,9 +121,9 @@ public:
class Entry {
friend class Preferences; // Preferences class has to access _value
public:
- ~Entry() {}
+ ~Entry() = default;
Entry() : _pref_path(""), _value(nullptr) {} // needed to enable use in maps
- Entry(Entry const &other) : _pref_path(other._pref_path), _value(other._value) {}
+ Entry(Entry const &other) = default;
/**
* Check whether the received entry is valid.
diff --git a/src/pure-transform.h b/src/pure-transform.h
index a4c84d8d5..9e618639d 100644
--- a/src/pure-transform.h
+++ b/src/pure-transform.h
@@ -30,7 +30,7 @@ protected:
public:
//PureTransform();
- virtual ~PureTransform() {};
+ virtual ~PureTransform() = default;;
// virtual PureTransform * clone () const = 0; // https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Virtual_Constructor
// Snap a group of points
@@ -53,7 +53,7 @@ protected:
public:
// PureTranslate(); // Default constructor
// PureTranslate(PureTranslate const &); // Copy constructor
- ~PureTranslate() override {};
+ ~PureTranslate() override = default;;
PureTranslate(Geom::Point vector = Geom::Point()) : _vector(vector), _vector_snapped(vector) {}
Geom::Point getTranslationSnapped() {return _vector_snapped;}
@@ -68,7 +68,7 @@ protected:
SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override;
public:
- ~PureTranslateConstrained() override {};
+ ~PureTranslateConstrained() override = default;;
PureTranslateConstrained(Geom::Coord displacement, Geom::Dim2 direction):
PureTranslate() {
_vector[direction] = displacement;
@@ -95,7 +95,7 @@ protected:
public:
// PureScale(); // Default constructor
// PureScale(PureScale const &); // Copy constructor
- ~PureScale() override {};
+ ~PureScale() override = default;;
PureScale(Geom::Scale scale, Geom::Point origin, bool uniform) :
_scale (scale),
@@ -114,7 +114,7 @@ protected:
SnappedPoint snap(::SnapManager *sm, SnapCandidatePoint const &p, Geom::Point pt_orig, Geom::OptRect const &bbox_to_snap) const override;
public:
- ~PureScaleConstrained() override {};
+ ~PureScaleConstrained() override = default;;
PureScaleConstrained(Geom::Scale scale, Geom::Point origin):
PureScale(scale, origin, true) {}; // Non-uniform constrained scaling is not supported
@@ -138,7 +138,7 @@ protected:
void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override;
public:
- ~PureStretchConstrained() override {};
+ ~PureStretchConstrained() override = default;;
PureStretchConstrained(Geom::Coord magnitude, Geom::Point origin, Geom::Dim2 direction, bool uniform) :
_magnitude (magnitude),
_stretch_snapped (Geom::Scale(magnitude, magnitude)),
@@ -175,7 +175,7 @@ protected:
void storeTransform(SnapCandidatePoint const &original_point, SnappedPoint &snapped_point) override;
public:
- ~PureSkewConstrained() override {};
+ ~PureSkewConstrained() override = default;;
PureSkewConstrained(Geom::Coord skew, Geom::Coord scale, Geom::Point origin, Geom::Dim2 direction) :
_skew (skew),
_skew_snapped (skew),
@@ -208,7 +208,7 @@ protected:
public:
// PureRotate(); // Default constructor
// PureRotate(PureRotate const &); // Copy constructor
- ~PureRotateConstrained() override {};
+ ~PureRotateConstrained() override = default;;
PureRotateConstrained(double angle, Geom::Point origin) :
_angle (angle), // in radians!
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index 4ca4c4e0b..fb23ffef0 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -157,8 +157,7 @@ ResourceManagerImpl::ResourceManagerImpl()
}
ResourceManagerImpl::~ResourceManagerImpl()
-{
-}
+= default;
bool ResourceManagerImpl::extractFilepath( Glib::ustring const &href, std::string &uri )
{
@@ -421,8 +420,7 @@ ResourceManager::ResourceManager()
{
}
-ResourceManager::~ResourceManager() {
-}
+ResourceManager::~ResourceManager() = default;
ResourceManager& ResourceManager::getManager() {
if ( !theInstance ) {
diff --git a/src/snap-candidate.h b/src/snap-candidate.h
index 54e33e1a8..72fdbec4b 100644
--- a/src/snap-candidate.h
+++ b/src/snap-candidate.h
@@ -28,7 +28,7 @@ namespace Inkscape {
class SnapCandidatePoint
{
public:
- SnapCandidatePoint() {}; // only needed / used for resizing() of a vector in seltrans.cpp; do not use uninitialized instances!
+ SnapCandidatePoint() = default;; // only needed / used for resizing() of a vector in seltrans.cpp; do not use uninitialized instances!
SnapCandidatePoint(Geom::Point const &point, Inkscape::SnapSourceType const source, long const source_num, Inkscape::SnapTargetType const target, Geom::OptRect const &bbox)
: _point(point),
@@ -113,7 +113,7 @@ class SnapCandidateItem
public:
SnapCandidateItem(SPItem* item, bool clip_or_mask, Geom::Affine additional_affine)
: item(item), clip_or_mask(clip_or_mask), additional_affine(additional_affine) {}
- ~SnapCandidateItem() {};
+ ~SnapCandidateItem() = default;;
SPItem* item; // An item that is to be considered for snapping to
bool clip_or_mask; // If true, then item refers to a clipping path or a mask
@@ -132,7 +132,7 @@ class SnapCandidatePath
public:
SnapCandidatePath(Geom::PathVector* path, SnapTargetType target, Geom::OptRect bbox, bool edited = false)
: path_vector(path), target_type(target), target_bbox(bbox), currently_being_edited(edited) {};
- ~SnapCandidatePath() {};
+ ~SnapCandidatePath() = default;;
Geom::PathVector* path_vector;
SnapTargetType target_type;
diff --git a/src/snapped-curve.cpp b/src/snapped-curve.cpp
index 38c2b6855..b2626c004 100644
--- a/src/snapped-curve.cpp
+++ b/src/snapped-curve.cpp
@@ -54,8 +54,7 @@ Inkscape::SnappedCurve::SnappedCurve()
}
Inkscape::SnappedCurve::~SnappedCurve()
-{
-}
+= default;
Inkscape::SnappedPoint Inkscape::SnappedCurve::intersect(SnappedCurve const &curve, Geom::Point const &p, Geom::Affine dt2doc) const
{
diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp
index 8a307783a..149ceb16d 100644
--- a/src/snapped-line.cpp
+++ b/src/snapped-line.cpp
@@ -45,8 +45,7 @@ Inkscape::SnappedLineSegment::SnappedLineSegment()
Inkscape::SnappedLineSegment::~SnappedLineSegment()
-{
-}
+= default;
Inkscape::SnappedPoint Inkscape::SnappedLineSegment::intersect(SnappedLineSegment const &line) const
{
@@ -123,8 +122,7 @@ Inkscape::SnappedLine::SnappedLine()
}
Inkscape::SnappedLine::~SnappedLine()
-{
-}
+= default;
Inkscape::SnappedPoint Inkscape::SnappedLine::intersect(SnappedLine const &line) const
{
diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index f826211fa..6d1d7c2a8 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -117,8 +117,7 @@ Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p):
}
Inkscape::SnappedPoint::~SnappedPoint()
-{
-}
+= default;
void Inkscape::SnappedPoint::getPointIfSnapped(Geom::Point &p) const
{
diff --git a/src/snapper.h b/src/snapper.h
index 6c7995045..7bc878559 100644
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -39,7 +39,7 @@ class Snapper
public:
//Snapper() {} //does not seem to be used somewhere
Snapper(SnapManager *sm, ::Geom::Coord const t);
- virtual ~Snapper() {}
+ virtual ~Snapper() = default;
virtual Geom::Coord getSnapperTolerance() const = 0; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
virtual bool getSnapperAlwaysSnap() const = 0; //if true, then the snapper will always snap, regardless of its tolerance
diff --git a/src/style-internal.h b/src/style-internal.h
index a34c07501..6ec5038f1 100644
--- a/src/style-internal.h
+++ b/src/style-internal.h
@@ -136,7 +136,7 @@ public:
{}
virtual ~SPIBase()
- {}
+ = default;
virtual void read( gchar const *str ) = 0;
virtual void readIfUnset( gchar const *str, SPStyleSrc const &source = SP_STYLE_SRC_STYLE_PROP ) {
@@ -195,16 +195,7 @@ public:
}
// Explicit assignment operator required due to templates.
- SPIBase& operator=(const SPIBase& rhs) {
- name = rhs.name;
- inherits = rhs.inherits;
- set = rhs.set;
- important = rhs.important;
- inherit = rhs.inherit;
- style_src = rhs.style_src;
- style = rhs.style;
- return *this;
- }
+ SPIBase& operator=(const SPIBase& rhs) = default;
// Check apples being compared to apples
virtual bool operator==(const SPIBase& rhs) {
@@ -245,7 +236,7 @@ public:
value_default(value_default)
{}
- ~SPIFloat() override {}
+ ~SPIFloat() override = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
SPStyleSrc const &style_src_req = SP_STYLE_SRC_STYLE_PROP,
@@ -258,12 +249,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIFloat& operator=(const SPIFloat& rhs) {
- SPIBase::operator=(rhs);
- value = rhs.value;
- value_default = rhs.value_default;
- return *this;
- }
+ SPIFloat& operator=(const SPIFloat& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -326,7 +312,7 @@ public:
{}
~SPIScale24() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -340,12 +326,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIScale24& operator=(const SPIScale24& rhs) {
- SPIBase::operator=(rhs);
- value = rhs.value;
- value_default = rhs.value_default;
- return *this;
- }
+ SPIScale24& operator=(const SPIScale24& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -399,7 +380,7 @@ public:
{}
~SPILength() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -414,14 +395,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPILength& operator=(const SPILength& rhs) {
- SPIBase::operator=(rhs);
- unit = rhs.unit;
- value = rhs.value;
- computed = rhs.computed;
- value_default = rhs.value_default;
- return *this;
- }
+ SPILength& operator=(const SPILength& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -456,7 +430,7 @@ public:
{}
~SPILengthOrNormal() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -470,11 +444,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPILengthOrNormal& operator=(const SPILengthOrNormal& rhs) {
- SPILength::operator=(rhs);
- normal = rhs.normal;
- return *this;
- }
+ SPILengthOrNormal& operator=(const SPILengthOrNormal& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -504,7 +474,7 @@ public:
{}
~SPIFontVariationSettings() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -574,7 +544,7 @@ public:
{}
~SPIEnum() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -629,7 +599,7 @@ public:
{}
~SPIEnumBits() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -656,7 +626,7 @@ public:
{}
~SPILigatures() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -680,7 +650,7 @@ public:
{}
~SPINumeric() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -704,7 +674,7 @@ public:
{}
~SPIEastAsian() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -782,7 +752,7 @@ public:
}
~SPIColor() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1017,7 +987,7 @@ public:
{} // Only one instance of SPIDashArray
~SPIDashArray() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1031,11 +1001,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIDashArray& operator=(const SPIDashArray& rhs) {
- SPIBase::operator=(rhs);
- values = rhs.values;
- return *this;
- }
+ SPIDashArray& operator=(const SPIDashArray& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1067,11 +1033,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIFilter& operator=(const SPIFilter& rhs) {
- SPIBase::operator=(rhs);
- href = rhs.href;
- return *this;
- }
+ SPIFilter& operator=(const SPIFilter& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1102,7 +1064,7 @@ public:
}
~SPIFontSize() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1117,15 +1079,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIFontSize& operator=(const SPIFontSize& rhs) {
- SPIBase::operator=(rhs);
- type = rhs.type;
- unit = rhs.unit;
- literal = rhs.literal;
- value = rhs.value;
- computed = rhs.computed;
- return *this;
- }
+ SPIFontSize& operator=(const SPIFontSize& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1159,7 +1113,7 @@ public:
{}
~SPIFont() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1175,10 +1129,7 @@ public:
void merge( const SPIBase* const /*parent*/ ) override
{}
- SPIFont& operator=(const SPIFont& rhs) {
- SPIBase::operator=(rhs);
- return *this;
- }
+ SPIFont& operator=(const SPIFont& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1204,7 +1155,7 @@ public:
}
~SPIBaselineShift() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1219,15 +1170,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPIBaselineShift& operator=(const SPIBaselineShift& rhs) {
- SPIBase::operator=(rhs);
- type = rhs.type;
- unit = rhs.unit;
- literal = rhs.literal;
- value = rhs.value;
- computed = rhs.computed;
- return *this;
- }
+ SPIBaselineShift& operator=(const SPIBaselineShift& rhs) = default;
// This is not used but we have it for completeness, it has not been tested.
bool operator==(const SPIBase& rhs) override;
@@ -1261,7 +1204,7 @@ public:
}
~SPITextDecorationLine() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1275,14 +1218,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPITextDecorationLine& operator=(const SPITextDecorationLine& rhs) {
- SPIBase::operator=(rhs);
- underline = rhs.underline;
- overline = rhs.overline;
- line_through = rhs.line_through;
- blink = rhs.blink;
- return *this;
- }
+ SPITextDecorationLine& operator=(const SPITextDecorationLine& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1309,7 +1245,7 @@ public:
}
~SPITextDecorationStyle() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
@@ -1323,15 +1259,7 @@ public:
void cascade( const SPIBase* const parent ) override;
void merge( const SPIBase* const parent ) override;
- SPITextDecorationStyle& operator=(const SPITextDecorationStyle& rhs) {
- SPIBase::operator=(rhs);
- solid = rhs.solid;
- isdouble = rhs.isdouble;
- dotted = rhs.dotted;
- dashed = rhs.dashed;
- wavy = rhs.wavy;
- return *this;
- }
+ SPITextDecorationStyle& operator=(const SPITextDecorationStyle& rhs) = default;
bool operator==(const SPIBase& rhs) override;
bool operator!=(const SPIBase& rhs) override {
@@ -1366,7 +1294,7 @@ public:
{}
~SPITextDecoration() override
- {}
+ = default;
void read( gchar const *str ) override;
const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET,
diff --git a/src/text-tag-attributes.h b/src/text-tag-attributes.h
index 18edf1267..da054518a 100644
--- a/src/text-tag-attributes.h
+++ b/src/text-tag-attributes.h
@@ -22,7 +22,7 @@ element.
*/
class TextTagAttributes {
public:
- TextTagAttributes() {}
+ TextTagAttributes() = default;
TextTagAttributes(Inkscape::Text::Layout::OptionalTextTagAttrs const &attrs)
: attributes(attrs) {}
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 9501da3c4..e82f272ab 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -308,15 +308,9 @@ public:
indexMinFg = other.indexMinFg;
}
Tupel &operator=(const Tupel &other)
- {
- minBgDist = other.minBgDist;
- indexMinBg = other.indexMinBg;
- minFgDist = other.minFgDist;
- indexMinFg = other.indexMinFg;
- return *this;
- }
+ = default;
virtual ~Tupel()
- {}
+ = default;
float minBgDist;
long indexMinBg;
diff --git a/src/trace/siox.h b/src/trace/siox.h
index 6f3f89a83..49e398397 100644
--- a/src/trace/siox.h
+++ b/src/trace/siox.h
@@ -108,7 +108,7 @@ public:
*
*/
virtual ~CieLab()
- {}
+ = default;
/**
* Retrieve a CieLab value via index.
@@ -329,7 +329,7 @@ public:
private:
SioxImage()
- {}
+ = default;
/**
* Assign values to that of another
@@ -395,7 +395,7 @@ public:
* Destructor
*/
virtual ~SioxObserver()
- { }
+ = default;
/**
* Informs the observer how much has been completed.
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index a76be208e..026bbeed7 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -165,7 +165,7 @@ public:
*
*/
~TraceSioxObserver () override
- { }
+ = default;
/**
* Informs the observer how much has been completed.
diff --git a/src/trace/trace.h b/src/trace/trace.h
index 790298261..10f7c08be 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -59,7 +59,7 @@ public:
*
*/
virtual ~TracingEngineResult()
- { }
+ = default;
/**
@@ -112,13 +112,13 @@ class TracingEngine
*
*/
TracingEngine()
- {}
+ = default;
/**
*
*/
virtual ~TracingEngine()
- {}
+ = default;
/**
* This is the working method of this interface, and all
@@ -177,7 +177,7 @@ public:
*
*/
~Tracer()
- {}
+ = default;
/**
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 0665f474f..5d369c9fa 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -72,8 +72,7 @@ namespace UI {
namespace Cache {
SvgPreview::SvgPreview()
-{
-}
+= default;
SvgPreview::~SvgPreview()
{
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 1da3bf9bc..500da4147 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -188,7 +188,7 @@ ClipboardManagerImpl::ClipboardManagerImpl()
}
-ClipboardManagerImpl::~ClipboardManagerImpl() {}
+ClipboardManagerImpl::~ClipboardManagerImpl() = default;
/**
@@ -1533,8 +1533,8 @@ void ClipboardManagerImpl::_userWarn(SPDesktop *desktop, char const *msg)
ClipboardManager *ClipboardManager::_instance = nullptr;
-ClipboardManager::ClipboardManager() {}
-ClipboardManager::~ClipboardManager() {}
+ClipboardManager::ClipboardManager() = default;
+ClipboardManager::~ClipboardManager() = default;
ClipboardManager *ClipboardManager::get()
{
if ( _instance == nullptr ) {
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index e9ff59f36..f66a71cd8 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -165,8 +165,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) :
}
ContextMenu::~ContextMenu(void)
-{
-}
+= default;
Gtk::SeparatorMenuItem* ContextMenu::AddSeparator(void)
{
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 2f6cf533f..93173aa35 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -65,7 +65,7 @@ class ControlManagerImpl
public:
ControlManagerImpl(ControlManager &manager);
- ~ControlManagerImpl() {}
+ ~ControlManagerImpl() = default;
SPCanvasItem *createControl(SPCanvasGroup *parent, ControlType type);
@@ -92,7 +92,7 @@ private:
{
public:
PrefListener(ControlManagerImpl &manager) : Inkscape::Preferences::Observer("/options/grabsize/value"), _mgr(manager) {}
- ~PrefListener() override {}
+ ~PrefListener() override = default;
void notify(Inkscape::Preferences::Entry const &val) override {
int size = val.getIntLimited(3, 1, 7);
@@ -369,8 +369,7 @@ ControlManager::ControlManager() :
}
ControlManager::~ControlManager()
-{
-}
+= default;
ControlManager &ControlManager::getManager()
{
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 23a925de1..02893d5e1 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -253,13 +253,11 @@ BBoxSort::BBoxSort(SPItem *pItem, Geom::Rect const &bounds, Geom::Dim2 orientati
{
anchor = kBegin * bbox.min()[orientation] + kEnd * bbox.max()[orientation];
}
-BBoxSort::BBoxSort(const BBoxSort &rhs) :
+BBoxSort::BBoxSort(const BBoxSort &rhs)
//NOTE : this copy ctor is called O(sort) when sorting the vector
//this is bad. The vector should be a vector of pointers.
//But I'll wait the bohem GC before doing that
- item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox)
-{
-}
+= default;
bool operator< (const BBoxSort &a, const BBoxSort &b)
{
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index d34bb8cc8..f8099908d 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -145,7 +145,7 @@ public :
Gtk::Grid &parent,
AlignAndDistribute &dialog);
- virtual ~Action(){}
+ virtual ~Action()= default;
AlignAndDistribute &_dialog;
diff --git a/src/ui/dialog/arrange-tab.h b/src/ui/dialog/arrange-tab.h
index 55baf775f..cbc6cfd4f 100644
--- a/src/ui/dialog/arrange-tab.h
+++ b/src/ui/dialog/arrange-tab.h
@@ -25,8 +25,8 @@ namespace Dialog {
class ArrangeTab : public Gtk::VBox
{
public:
- ArrangeTab() {};
- ~ArrangeTab() override {};
+ ArrangeTab() = default;;
+ ~ArrangeTab() override = default;;
/**
* Do the actual work! This method is invoked to actually arrange the
diff --git a/src/ui/dialog/behavior.h b/src/ui/dialog/behavior.h
index fbe47c635..28cbf99a2 100644
--- a/src/ui/dialog/behavior.h
+++ b/src/ui/dialog/behavior.h
@@ -39,7 +39,7 @@ Behavior *create(Dialog &dialog)
class Behavior {
public:
- virtual ~Behavior() { }
+ virtual ~Behavior() = default;
/** Gtk::Dialog methods */
virtual operator Gtk::Widget&() =0;
diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h
index 6d8fa5c64..0e5bce9ba 100644
--- a/src/ui/dialog/calligraphic-profile-rename.h
+++ b/src/ui/dialog/calligraphic-profile-rename.h
@@ -32,7 +32,7 @@ namespace Dialog {
class CalligraphicProfileRename : public Gtk::Dialog {
public:
CalligraphicProfileRename();
- ~CalligraphicProfileRename() override {}
+ ~CalligraphicProfileRename() override = default;
Glib::ustring getName() const {
return "CalligraphicProfileRename";
}
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 04ade3d1e..4ebee6834 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -259,8 +259,7 @@ SwatchPage::SwatchPage()
}
SwatchPage::~SwatchPage()
-{
-}
+= default;
ColorItem::ColorItem(ege::PaintDef::ColorType type) :
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index a34185f49..36f4607fb 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -117,8 +117,7 @@ DebugDialog *DebugDialog::create()
}
DebugDialogImpl::~DebugDialogImpl()
-{
-}
+= default;
void DebugDialogImpl::show()
{
diff --git a/src/ui/dialog/debug.h b/src/ui/dialog/debug.h
index 34785a617..416959fb3 100644
--- a/src/ui/dialog/debug.h
+++ b/src/ui/dialog/debug.h
@@ -27,7 +27,7 @@ namespace Dialog {
class DebugDialog
{
public:
- DebugDialog() {};
+ DebugDialog() = default;;
/**
* Factory method
*/
@@ -36,7 +36,7 @@ public:
/**
* Destructor
*/
- virtual ~DebugDialog() {};
+ virtual ~DebugDialog() = default;;
/**
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index bff2b2b64..7d1131a5f 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -59,8 +59,7 @@ DockBehavior::DockBehavior(Dialog &dialog) :
}
DockBehavior::~DockBehavior()
-{
-}
+= default;
Behavior *
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 2413d51e0..fdbf59c1d 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -94,8 +94,7 @@ ExtensionEditor::ExtensionEditor()
* Destroys the extension editor dialog.
*/
ExtensionEditor::~ExtensionEditor()
-{
-}
+= default;
void
ExtensionEditor::setExtension(Glib::ustring extension_id) {
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index 071824ab9..a652266c7 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -88,7 +88,7 @@ public:
* @param title the title of the dialog
*/
FileOpenDialog()
- {};
+ = default;;
/**
* Factory.
@@ -106,7 +106,7 @@ public:
* Destructor.
* Perform any necessary cleanups.
*/
- virtual ~FileOpenDialog() {};
+ virtual ~FileOpenDialog() = default;;
/**
* Show an OpenFile file selector.
@@ -158,7 +158,7 @@ public:
* @param key a list of file types from which the user can select
*/
FileSaveDialog ()
- {};
+ = default;;
/**
* Factory.
@@ -180,7 +180,7 @@ public:
* Destructor.
* Perform any necessary cleanups.
*/
- virtual ~FileSaveDialog() {};
+ virtual ~FileSaveDialog() = default;;
/**
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 4466c888a..006a59ece 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -595,8 +595,7 @@ SVGPreview::SVGPreview()
}
SVGPreview::~SVGPreview()
-{
-}
+= default;
/*#########################################################################
@@ -739,8 +738,7 @@ FileOpenDialogImplGtk::FileOpenDialogImplGtk(Gtk::Window &parentWindow, const Gl
* Destructor
*/
FileOpenDialogImplGtk::~FileOpenDialogImplGtk()
-{
-}
+= default;
void FileOpenDialogImplGtk::addFilterMenu(Glib::ustring name, Glib::ustring pattern)
{
@@ -1049,8 +1047,7 @@ FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow, const Gl
* Destructor
*/
FileSaveDialogImplGtk::~FileSaveDialogImplGtk()
-{
-}
+= default;
/**
* Callback for fileNameEntry widget
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 65018efa7..771b08df7 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -68,7 +68,7 @@ class FileType
{
public:
FileType(): name(), pattern(),extension(nullptr) {}
- ~FileType() {}
+ ~FileType() = default;
Glib::ustring name;
Glib::ustring pattern;
Inkscape::Extension::Extension *extension;
@@ -170,7 +170,7 @@ public:
*
*/
~FileDialogBaseGtk() override
- {}
+ = default;
protected:
void cleanup( bool showConfirmed );
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index ef702aba4..de1d8f6ae 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -104,7 +104,7 @@ FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("/dialogs/filtereff
}
-FilterEditorDialog::~FilterEditorDialog(){}
+FilterEditorDialog::~FilterEditorDialog()= default;
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 7ec7cb3e1..df7a3349e 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -45,12 +45,10 @@ namespace UI {
namespace Dialog {
FontSubstitution::FontSubstitution()
-{
-}
+= default;
FontSubstitution::~FontSubstitution()
-{
-}
+= default;
void
FontSubstitution::checkFontSubstitutions(SPDocument* doc)
diff --git a/src/ui/dialog/grid-arrange-tab.h b/src/ui/dialog/grid-arrange-tab.h
index 5dff1bcf6..c908d74bf 100644
--- a/src/ui/dialog/grid-arrange-tab.h
+++ b/src/ui/dialog/grid-arrange-tab.h
@@ -39,7 +39,7 @@ class ArrangeDialog;
class GridArrangeTab : public ArrangeTab {
public:
GridArrangeTab(ArrangeDialog *parent);
- ~GridArrangeTab() override {};
+ ~GridArrangeTab() override = default;;
/**
* Do the actual work
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 3261a0376..06309885c 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -179,8 +179,7 @@ InkscapePreferences::InkscapePreferences()
}
InkscapePreferences::~InkscapePreferences()
-{
-}
+= default;
Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, int id)
{
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 2a6e3040c..7aaef90b4 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -468,8 +468,7 @@ protected:
add(shortcutid);
add(user_set);
}
- ~ModelColumns() override {
- }
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> id;
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 34a8c3820..012b76a38 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -377,7 +377,7 @@ static std::map<Glib::ustring, Gdk::InputMode> &getStringToMode()
class InputDialogImpl : public InputDialog {
public:
InputDialogImpl();
- ~InputDialogImpl() override {}
+ ~InputDialogImpl() override = default;
private:
class ConfPanel : public Gtk::VBox
@@ -436,7 +436,7 @@ private:
add(name);
add(value);
}
- ~KeysColumns() override {}
+ ~KeysColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> value;
@@ -743,7 +743,7 @@ InputDialogImpl::InputDialogImpl() :
class TabletTmp {
public:
- TabletTmp() {}
+ TabletTmp() = default;
Glib::ustring name;
std::list<Glib::RefPtr<InputDevice const> > devices;
@@ -1060,8 +1060,7 @@ InputDialogImpl::ConfPanel::ConfPanel() :
}
InputDialogImpl::ConfPanel::~ConfPanel()
-{
-}
+= default;
void InputDialogImpl::ConfPanel::setModeCellString(Gtk::CellRenderer *rndr, Gtk::TreeIter const &iter)
{
diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h
index e79e32854..bd102d8d1 100644
--- a/src/ui/dialog/input.h
+++ b/src/ui/dialog/input.h
@@ -26,7 +26,7 @@ public:
static InputDialog &getInstance();
InputDialog() : UI::Widget::Panel("/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {}
- ~InputDialog() override {}
+ ~InputDialog() override = default;
};
} // namespace Dialog
diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h
index 0e7f8b10d..f263f383b 100644
--- a/src/ui/dialog/layer-properties.h
+++ b/src/ui/dialog/layer-properties.h
@@ -55,7 +55,7 @@ class LayerPropertiesDialog : public Gtk::Dialog {
protected:
struct Strategy {
- virtual ~Strategy() {}
+ virtual ~Strategy() = default;
virtual void setup(LayerPropertiesDialog &)=0;
virtual void perform(LayerPropertiesDialog &)=0;
};
@@ -112,7 +112,7 @@ protected:
add(_colLocked);
add(_colLabel);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<SPObject*> _colObject;
Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index c836f9925..fe528d34d 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -312,7 +312,7 @@ public:
add(_colLocked);
add(_colLabel);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<SPObject*> _colObject;
Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h
index 790feae29..7bfb1ab5d 100644
--- a/src/ui/dialog/livepatheffect-add.h
+++ b/src/ui/dialog/livepatheffect-add.h
@@ -30,7 +30,7 @@ namespace Dialog {
class LivePathEffectAdd : public Gtk::Dialog {
public:
LivePathEffectAdd();
- ~LivePathEffectAdd() override {}
+ ~LivePathEffectAdd() override = default;
/**
* Show the dialog
@@ -86,7 +86,7 @@ private:
//add(desc);
add(data);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> name;
/**
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h
index e355bba6e..26e278071 100644
--- a/src/ui/dialog/livepatheffect-editor.h
+++ b/src/ui/dialog/livepatheffect-editor.h
@@ -88,7 +88,7 @@ private:
add(lperef);
add(col_visible);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> col_name;
Gtk::TreeModelColumn<LivePathEffect::LPEObjectReference *> lperef;
diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp
index 5ff0d24e8..887f77c07 100644
--- a/src/ui/dialog/messages.cpp
+++ b/src/ui/dialog/messages.cpp
@@ -101,8 +101,7 @@ Messages::Messages()
}
Messages::~Messages()
-{
-}
+= default;
//#########################################################################
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index a5b86a561..397f5690e 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -213,7 +213,7 @@ public:
add(_colClipMask);
//add(_colInsertOrder);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<SPItem*> _colObject;
Gtk::TreeModelColumn<Glib::ustring> _colLabel;
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 49befd411..ebae47a1b 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -85,7 +85,7 @@ public:
* Destructor
*/
~FileDialogBase() override
- {}
+ = default;
protected:
void cleanup( bool showConfirmed );
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 47bb8db4f..0a8704445 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -42,7 +42,7 @@ public:
_panel (panel) { }
virtual void present() = 0;
- virtual ~PanelDialogBase() {}
+ virtual ~PanelDialogBase() = default;
virtual UI::Widget::Panel &getPanel() { return _panel; }
@@ -77,7 +77,7 @@ public:
*/
PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num);
- ~PanelDialog() override {}
+ ~PanelDialog() override = default;
template <typename T>
static PanelDialog<Behavior> *create();
@@ -100,7 +100,7 @@ class PanelDialog<Behavior::FloatingBehavior> :
public:
inline PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num);
- ~PanelDialog() override {}
+ ~PanelDialog() override = default;
template <typename T>
static PanelDialog<Behavior::FloatingBehavior> *create();
diff --git a/src/ui/dialog/pixelartdialog.h b/src/ui/dialog/pixelartdialog.h
index d0eac9296..a0add2e94 100644
--- a/src/ui/dialog/pixelartdialog.h
+++ b/src/ui/dialog/pixelartdialog.h
@@ -36,7 +36,7 @@ public:
static PixelArtDialog &getInstance();
- ~PixelArtDialog() override {};
+ ~PixelArtDialog() override = default;;
};
diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h
index aeb8613ee..0df26423a 100644
--- a/src/ui/dialog/polar-arrange-tab.h
+++ b/src/ui/dialog/polar-arrange-tab.h
@@ -35,7 +35,7 @@ class ArrangeDialog;
class PolarArrangeTab : public ArrangeTab {
public:
PolarArrangeTab(ArrangeDialog *parent_);
- ~PolarArrangeTab() override {};
+ ~PolarArrangeTab() override = default;;
/**
* Do the actual arrangement
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index 5156d0e00..a65b25440 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -262,7 +262,7 @@ private:
{
add(suggestions);
}
- ~TreeColumns() override {}
+ ~TreeColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> suggestions;
};
TreeColumns tree_columns;
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 307c6f6a7..db284466d 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -168,8 +168,7 @@ StyleDialog::_nodeChanged( Inkscape::XML::Node &object ) {
}
StyleDialog::TreeStore::TreeStore()
-{
-}
+= default;
/**
@@ -1045,7 +1044,7 @@ bool StyleDialog::_handleButtonEvent(GdkEventButton *event)
class PropertyData
{
public:
- PropertyData() {};
+ PropertyData() = default;;
PropertyData(Glib::ustring name) : _name(name) {};
void _setSheetValue(Glib::ustring value) { _sheetValue = value; };
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1c418a76d..5c3732ff2 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -236,8 +236,7 @@ Gtk::HBox* SvgFontsDialog::AttrSpin(gchar* lbl){
/*** SvgFontsDialog ***/
-GlyphComboBox::GlyphComboBox(){
-}
+GlyphComboBox::GlyphComboBox()= default;
void GlyphComboBox::update(SPFont* spfont){
if (!spfont) return;
@@ -1049,7 +1048,7 @@ SvgFontsDialog::SvgFontsDialog()
_getContents()->show_all();
}
-SvgFontsDialog::~SvgFontsDialog(){}
+SvgFontsDialog::~SvgFontsDialog()= default;
} // namespace Dialog
} // namespace UI
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 720cf0507..ed8c00c61 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -279,7 +279,7 @@ public:
add(_colAddRemove);
add(_colAllowAddRemove);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<SPObject*> _colParentObject;
Gtk::TreeModelColumn<SPObject*> _colObject;
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 8e4a3c667..9e710f0fb 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -65,8 +65,7 @@ TemplateLoadTab::TemplateLoadTab(NewFromTemplate* parent)
TemplateLoadTab::~TemplateLoadTab()
-{
-}
+= default;
void TemplateLoadTab::createTemplate()
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index a368c7072..70e4770f7 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -52,7 +52,7 @@ private:
public:
ArrangeDialog();
- ~ArrangeDialog() override {};
+ ~ArrangeDialog() override = default;;
/**
* Callback from Apply
diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h
index 2a6b7a1a0..9d7138d08 100644
--- a/src/ui/dialog/tracedialog.h
+++ b/src/ui/dialog/tracedialog.h
@@ -44,7 +44,7 @@ public:
/**
* Destructor
*/
- ~TraceDialog() override {};
+ ~TraceDialog() override = default;;
};
diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index ae5be30ff..294479816 100644
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -67,7 +67,7 @@ class CellRendererInt : public Gtk::CellRendererText {
public:
struct Filter : std::unary_function<int, bool> {
- virtual ~Filter() {}
+ virtual ~Filter() = default;
virtual bool operator() (const int&) const =0;
};
diff --git a/src/ui/previewable.h b/src/ui/previewable.h
index 377e109fb..c733c31df 100644
--- a/src/ui/previewable.h
+++ b/src/ui/previewable.h
@@ -40,7 +40,7 @@ class Previewable
{
public:
// TODO need to add some nice parameters
- virtual ~Previewable() {}
+ virtual ~Previewable() = default;
virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border) = 0;
};
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 8198e709c..ae6907cc7 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -65,8 +65,7 @@ PreviewHolder::PreviewHolder() :
}
PreviewHolder::~PreviewHolder()
-{
-}
+= default;
bool PreviewHolder::on_scroll_event(GdkEventScroll *event)
{
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index 422088ed2..f7ba74a5a 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -35,9 +35,7 @@ SelectedColor::SelectedColor()
}
-SelectedColor::~SelectedColor() {
-
-}
+SelectedColor::~SelectedColor() = default;
void SelectedColor::setColor(SPColor const &color)
{
diff --git a/src/ui/selected-color.h b/src/ui/selected-color.h
index 3d5858d3f..36d5e5233 100644
--- a/src/ui/selected-color.h
+++ b/src/ui/selected-color.h
@@ -73,8 +73,7 @@ private:
class ColorSelectorFactory {
public:
- virtual ~ColorSelectorFactory() {
- }
+ virtual ~ColorSelectorFactory() = default;
virtual Gtk::Widget* createWidget(SelectedColor &color) const = 0;
virtual Glib::ustring modeName() const = 0;
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index d3bd6fa1b..abcab90f2 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -41,49 +41,49 @@
class RectKnotHolder : public KnotHolder {
public:
RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~RectKnotHolder() override {};
+ ~RectKnotHolder() override = default;;
};
class Box3DKnotHolder : public KnotHolder {
public:
Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~Box3DKnotHolder() override {};
+ ~Box3DKnotHolder() override = default;;
};
class ArcKnotHolder : public KnotHolder {
public:
ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~ArcKnotHolder() override {};
+ ~ArcKnotHolder() override = default;;
};
class StarKnotHolder : public KnotHolder {
public:
StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~StarKnotHolder() override {};
+ ~StarKnotHolder() override = default;;
};
class SpiralKnotHolder : public KnotHolder {
public:
SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~SpiralKnotHolder() override {};
+ ~SpiralKnotHolder() override = default;;
};
class OffsetKnotHolder : public KnotHolder {
public:
OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~OffsetKnotHolder() override {};
+ ~OffsetKnotHolder() override = default;;
};
class FlowtextKnotHolder : public KnotHolder {
public:
FlowtextKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~FlowtextKnotHolder() override {};
+ ~FlowtextKnotHolder() override = default;;
};
class MiscKnotHolder : public KnotHolder {
public:
MiscKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
- ~MiscKnotHolder() override {};
+ ~MiscKnotHolder() override = default;;
};
namespace {
diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h
index 96861e660..25862a039 100644
--- a/src/ui/tool/manipulator.h
+++ b/src/ui/tool/manipulator.h
@@ -36,7 +36,7 @@ public:
Manipulator(SPDesktop *d)
: _desktop(d)
{}
- virtual ~Manipulator() {}
+ virtual ~Manipulator() = default;
/// Handle input event. Returns true if handled.
virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *)=0;
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 0c81e179c..d11ed1d83 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -78,8 +78,7 @@ DropperTool::DropperTool()
{
}
-DropperTool::~DropperTool() {
-}
+DropperTool::~DropperTool() = default;
void DropperTool::setup() {
ToolBase::setup();
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index a76234aa4..1cd9db6b2 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -103,8 +103,7 @@ EraserTool::EraserTool()
{
}
-EraserTool::~EraserTool() {
-}
+EraserTool::~EraserTool() = default;
void EraserTool::setup() {
DynamicBase::setup();
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index dcd6eac80..5310e0f17 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -42,8 +42,7 @@ ZoomTool::ZoomTool()
{
}
-ZoomTool::~ZoomTool() {
-}
+ZoomTool::~ZoomTool() = default;
void ZoomTool::finish() {
this->enableGrDrag(false);
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 5256ecf88..d7f7ba87b 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -106,12 +106,10 @@ UXManager* UXManager::getInstance()
UXManager::UXManager()
-{
-}
+= default;
UXManager::~UXManager()
-{
-}
+= default;
UXManagerImpl::UXManagerImpl() :
_widescreen(false)
@@ -136,8 +134,7 @@ UXManagerImpl::UXManagerImpl() :
}
UXManagerImpl::~UXManagerImpl()
-{
-}
+= default;
bool UXManagerImpl::isWidescreen() const
{
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index a8f68518f..f2e34b534 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -34,8 +34,8 @@ namespace View {
*/
struct EditWidgetInterface
{
- EditWidgetInterface() {}
- virtual ~EditWidgetInterface() {}
+ EditWidgetInterface() = default;
+ virtual ~EditWidgetInterface() = default;
/// Returns pointer to window UI object as void*
virtual Gtk::Window *getWindow() = 0;
diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h
index f79d12cdf..60c773e84 100644
--- a/src/ui/widget/addtoicon.h
+++ b/src/ui/widget/addtoicon.h
@@ -24,7 +24,7 @@ namespace Widget {
class AddToIcon : public Gtk::CellRendererPixbuf {
public:
AddToIcon();
- ~AddToIcon() override {};
+ ~AddToIcon() override = default;;
Glib::PropertyProxy<bool> property_active() { return _property_active.get_proxy(); }
Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h
index 8dbff8874..d50bdc65a 100644
--- a/src/ui/widget/attr-widget.h
+++ b/src/ui/widget/attr-widget.h
@@ -134,7 +134,7 @@ public:
{}
virtual ~AttrWidget()
- {}
+ = default;
virtual Glib::ustring get_as_attribute() const = 0;
virtual void set_from_attribute(SPObject*) = 0;
diff --git a/src/ui/widget/clipmaskicon.h b/src/ui/widget/clipmaskicon.h
index d355a1caf..25725e33a 100644
--- a/src/ui/widget/clipmaskicon.h
+++ b/src/ui/widget/clipmaskicon.h
@@ -24,7 +24,7 @@ namespace Widget {
class ClipMaskIcon : public Gtk::CellRendererPixbuf {
public:
ClipMaskIcon();
- ~ClipMaskIcon() override {};
+ ~ClipMaskIcon() override = default;;
Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); }
Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 620e77cbf..57555a53d 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -729,7 +729,7 @@ ColorScalesFactory::ColorScalesFactory(SPColorScalesMode submode)
{
}
-ColorScalesFactory::~ColorScalesFactory() {}
+ColorScalesFactory::~ColorScalesFactory() = default;
Gtk::Widget *ColorScalesFactory::createWidget(Inkscape::UI::SelectedColor &color) const
{
diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index 3d8ab50ea..a3abc32bb 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -28,8 +28,7 @@ HighlightPicker::HighlightPicker() :
}
HighlightPicker::~HighlightPicker()
-{
-}
+= default;
void HighlightPicker::get_preferred_height_vfunc(Gtk::Widget& widget,
int& min_h,
diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h
index f537cc74c..86c12bc03 100644
--- a/src/ui/widget/imagetoggler.h
+++ b/src/ui/widget/imagetoggler.h
@@ -25,7 +25,7 @@ namespace Widget {
class ImageToggler : public Gtk::CellRendererPixbuf {
public:
ImageToggler( char const *on, char const *off);
- ~ImageToggler() override {};
+ ~ImageToggler() override = default;;
sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;}
sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; }
diff --git a/src/ui/widget/ink-spinscale.h b/src/ui/widget/ink-spinscale.h
index 7cb82c92a..a5807f8dc 100644
--- a/src/ui/widget/ink-spinscale.h
+++ b/src/ui/widget/ink-spinscale.h
@@ -31,7 +31,7 @@ class InkScale : public Gtk::Scale
{
public:
InkScale(Glib::RefPtr<Gtk::Adjustment>, Gtk::SpinButton* spinbutton);
- ~InkScale() override {};
+ ~InkScale() override = default;;
void set_label(Glib::ustring label);
@@ -71,7 +71,7 @@ class InkSpinScale : public Gtk::Box
// Create an InkSpinScale with a preexisting adjustment.
InkSpinScale(Glib::RefPtr<Gtk::Adjustment>);
- ~InkSpinScale() override {};
+ ~InkSpinScale() override = default;;
void set_label(Glib::ustring label);
void set_digits(int digits);
diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h
index 5c4c19603..b736007f4 100644
--- a/src/ui/widget/insertordericon.h
+++ b/src/ui/widget/insertordericon.h
@@ -25,7 +25,7 @@ namespace Widget {
class InsertOrderIcon : public Gtk::CellRendererPixbuf {
public:
InsertOrderIcon();
- ~InsertOrderIcon() override {};
+ ~InsertOrderIcon() override = default;;
Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); }
Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
diff --git a/src/ui/widget/layertypeicon.h b/src/ui/widget/layertypeicon.h
index 5f7e79c29..e84bef261 100644
--- a/src/ui/widget/layertypeicon.h
+++ b/src/ui/widget/layertypeicon.h
@@ -24,7 +24,7 @@ namespace Widget {
class LayerTypeIcon : public Gtk::CellRendererPixbuf {
public:
LayerTypeIcon();
- ~LayerTypeIcon() override {};
+ ~LayerTypeIcon() override = default;;
sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;}
sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; }
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 579049d29..b8eeca00d 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -464,8 +464,7 @@ PageSizer::PageSizer(Registry & _wr)
* Destructor
*/
PageSizer::~PageSizer()
-{
-}
+= default;
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 001c6a65d..edc9f5b0c 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -81,7 +81,7 @@ public:
* Destructor
*/
virtual ~PaperSize()
- {}
+ = default;
/**
* Name of this paper specification
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 7b54995c1..73897aeb5 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -59,8 +59,7 @@ Panel::Panel(gchar const *prefs_path, int verb_num) :
}
Panel::~Panel()
-{
-}
+= default;
void Panel::present()
{
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 129a7b336..acd59fe94 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -251,7 +251,7 @@ class PrefColorPicker : public ColorPicker
{
public:
PrefColorPicker() : ColorPicker("", "", 0, false) {};
- ~PrefColorPicker() override {};
+ ~PrefColorPicker() override = default;;
void init(Glib::ustring const &abel, Glib::ustring const &prefs_path,
guint32 default_rgba);
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index bb0f6da8a..033ab9541 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -83,7 +83,7 @@ protected:
template< typename A, typename B, typename C, typename D, typename E , typename F, typename G>
RegisteredWidget( A& a, B& b, C& c, D& d, E& e, F f, G& g): W( a, b, c, d, e, f, g) { construct(); }
- ~RegisteredWidget() override {};
+ ~RegisteredWidget() override = default;;
void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
{
diff --git a/src/ui/widget/registry.cpp b/src/ui/widget/registry.cpp
index ea8198422..9972e1acd 100644
--- a/src/ui/widget/registry.cpp
+++ b/src/ui/widget/registry.cpp
@@ -23,7 +23,7 @@ namespace Widget {
Registry::Registry() : _updating(false) {}
-Registry::~Registry() {}
+Registry::~Registry() = default;
bool
Registry::isUpdating()
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 0e290730d..64b37a07f 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -160,8 +160,7 @@ bool Rotateable::on_scroll(GdkEventScroll* event)
return TRUE;
}
-Rotateable::~Rotateable() {
-}
+Rotateable::~Rotateable() = default;
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index c0b0a7f56..b5fdc721d 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1207,8 +1207,7 @@ RotateableSwatch::RotateableSwatch(SelectedStyle *parent, guint mode) :
{
}
-RotateableSwatch::~RotateableSwatch() {
-}
+RotateableSwatch::~RotateableSwatch() = default;
double
RotateableSwatch::color_adjust(float *hsla, double by, guint32 cc, guint modifier)
@@ -1408,8 +1407,7 @@ RotateableStrokeWidth::RotateableStrokeWidth(SelectedStyle *parent) :
{
}
-RotateableStrokeWidth::~RotateableStrokeWidth() {
-}
+RotateableStrokeWidth::~RotateableStrokeWidth() = default;
double
RotateableStrokeWidth::value_adjust(double current, double by, guint /*modifier*/, bool final)
diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h
index 28d9849a8..918e7047f 100644
--- a/src/ui/widget/spinbutton.h
+++ b/src/ui/widget/spinbutton.h
@@ -45,7 +45,7 @@ public:
connect_signals();
};
- ~SpinButton() override {};
+ ~SpinButton() override = default;;
void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; };
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index 5eccc67cf..04de4b162 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -38,11 +38,9 @@ void StyleSubject::setDesktop(SPDesktop *desktop) {
}
}
-StyleSubject::Selection::Selection() {
-}
+StyleSubject::Selection::Selection() = default;
-StyleSubject::Selection::~Selection() {
-}
+StyleSubject::Selection::~Selection() = default;
Inkscape::Selection *StyleSubject::Selection::_getSelection() const {
SPDesktop *desktop = getDesktop();
@@ -105,8 +103,7 @@ StyleSubject::CurrentLayer::CurrentLayer() {
_element = nullptr;
}
-StyleSubject::CurrentLayer::~CurrentLayer() {
-}
+StyleSubject::CurrentLayer::~CurrentLayer() = default;
void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
_layer_release.disconnect();
diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index 423313a1f..fd10b567e 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -26,8 +26,7 @@ UnitMenu::UnitMenu() : _type(UNIT_TYPE_NONE)
set_active(0);
}
-UnitMenu::~UnitMenu() {
-}
+UnitMenu::~UnitMenu() = default;
bool UnitMenu::setUnitType(UnitType unit_type)
{
diff --git a/src/undo-stack-observer.h b/src/undo-stack-observer.h
index dadb4764e..58972a1af 100644
--- a/src/undo-stack-observer.h
+++ b/src/undo-stack-observer.h
@@ -32,8 +32,8 @@ struct Event;
*/
class UndoStackObserver : public GC::Managed<> {
public:
- UndoStackObserver() { }
- virtual ~UndoStackObserver() { }
+ UndoStackObserver() = default;
+ virtual ~UndoStackObserver() = default;
/**
* Triggered when the user issues an undo command.
diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp
index dcc28f370..3b9f68df8 100644
--- a/src/util/ege-tags.cpp
+++ b/src/util/ege-tags.cpp
@@ -62,14 +62,12 @@ Label::Label(std::string const& lang, std::string const& value) :
}
Label::~Label()
-{
-}
+= default;
// =========================================================================
Tag::~Tag()
-{
-}
+= default;
Tag::Tag(std::string const& key) :
key(key)
@@ -86,8 +84,7 @@ TagSet::TagSet() :
}
TagSet::~TagSet()
-{
-}
+= default;
void TagSet::setLang(std::string const& lang)
{
diff --git a/src/util/expression-evaluator.h b/src/util/expression-evaluator.h
index bb29d7f26..23b431a8e 100644
--- a/src/util/expression-evaluator.h
+++ b/src/util/expression-evaluator.h
@@ -177,7 +177,7 @@ public:
msgstr = os.str();
}
- ~EvaluatorException() throw() override {} // necessary to destroy the string object!!!
+ ~EvaluatorException() throw() override = default; // necessary to destroy the string object!!!
const char *what() const throw () override {
return msgstr.c_str();
diff --git a/src/util/fixed_point.h b/src/util/fixed_point.h
index cfc6e4020..02d536ecc 100644
--- a/src/util/fixed_point.h
+++ b/src/util/fixed_point.h
@@ -24,7 +24,7 @@ namespace Util {
template <typename T, unsigned int precision>
class FixedPoint {
public:
- FixedPoint() {}
+ FixedPoint() = default;
FixedPoint(const FixedPoint& value) : v(value.v) {}
FixedPoint(char value) : v(static_cast<T>(value)<<precision) {}
FixedPoint(unsigned char value) : v(static_cast<T>(value)<<precision) {}
diff --git a/src/util/forward-pointer-iterator.h b/src/util/forward-pointer-iterator.h
index 4f8e88637..eaf5a7a25 100644
--- a/src/util/forward-pointer-iterator.h
+++ b/src/util/forward-pointer-iterator.h
@@ -37,7 +37,7 @@ public:
typedef ForwardPointerIterator<BaseType const, Strategy> Self;
- ForwardPointerIterator() : _p(NULL) {}
+ ForwardPointerIterator() = default;
ForwardPointerIterator(pointer p) : _p(p) {}
operator pointer() const { return _p; }
diff --git a/src/util/list-container.h b/src/util/list-container.h
index e123fea0c..d39a40ee7 100644
--- a/src/util/list-container.h
+++ b/src/util/list-container.h
@@ -24,7 +24,7 @@ template <typename T>
class ListContainer {
public:
/* default constructible */
- ListContainer() {}
+ ListContainer() = default;
/* assignable */
ListContainer(ListContainer const &other) {
diff --git a/src/util/list.h b/src/util/list.h
index ea2fa871e..ffe04d9f3 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -22,7 +22,7 @@ namespace Util {
/// Generic ListCell for Inkscape::Util::List.
template <typename T>
struct ListCell : public GC::Managed<> {
- ListCell() {}
+ ListCell() = default;
ListCell(typename Traits::Reference<T>::RValue v, ListCell *n)
: value(v), next(n) {}
@@ -205,7 +205,7 @@ protected:
template <typename T>
class MutableList : public List<T> {
public:
- MutableList() {}
+ MutableList() = default;
explicit MutableList(typename List<T>::const_reference value,
MutableList const &next=MutableList())
: List<T>(value, next) {}
diff --git a/src/util/share.h b/src/util/share.h
index a2672afa4..cc3387325 100644
--- a/src/util/share.h
+++ b/src/util/share.h
@@ -24,7 +24,7 @@ class ptr_shared {
public:
ptr_shared() : _string(nullptr) {}
- ptr_shared(ptr_shared const &other) : _string(other._string) {}
+ ptr_shared(ptr_shared const &other) = default;
operator char const *() const { return _string; }
operator bool() const { return _string; }
@@ -54,10 +54,7 @@ public:
return _string - other._string;
}
- ptr_shared &operator=(ptr_shared const &other) {
- _string = other._string;
- return *this;
- }
+ ptr_shared &operator=(ptr_shared const &other) = default;
bool operator==(ptr_shared const &other) const {
return _string == other._string;
diff --git a/src/util/units.cpp b/src/util/units.cpp
index 7854abf77..ffa2681c6 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -129,7 +129,7 @@ public:
typedef Glib::Markup::ParseContext Ctx;
UnitParser(UnitTable *table);
- ~UnitParser() override {}
+ ~UnitParser() override = default;
protected:
void on_start_element(Ctx &ctx, Glib::ustring const &name, AttrMap const &attrs) override;
diff --git a/src/util/ziptool.cpp b/src/util/ziptool.cpp
index e5ece00e4..2146710dd 100644
--- a/src/util/ziptool.cpp
+++ b/src/util/ziptool.cpp
@@ -60,8 +60,7 @@ Adler32::Adler32()
* Destructor
*/
Adler32::~Adler32()
-{
-}
+= default;
/**
* Reset Adler-32 checksum to initial value.
@@ -117,8 +116,7 @@ Crc32::Crc32()
* Destructor
*/
Crc32::~Crc32()
-{
-}
+= default;
static bool crc_table_ready = false;
static unsigned long crc_table[256];
@@ -315,8 +313,7 @@ Inflater::Inflater() :
*
*/
Inflater::~Inflater()
-{
-}
+= default;
/**
*
@@ -915,9 +912,7 @@ Deflater::Deflater()
*
*/
Deflater::~Deflater()
-{
-
-}
+= default;
/**
*
@@ -1439,8 +1434,7 @@ GzipFile::GzipFile() :
* Destructor
*/
GzipFile::~GzipFile()
-{
-}
+= default;
/**
* Print error messages
@@ -1925,8 +1919,7 @@ ZipEntry::ZipEntry(const std::string &fileNameArg,
* Destructor
*/
ZipEntry::~ZipEntry()
-{
-}
+= default;
/**
diff --git a/src/vanishing-point.h b/src/vanishing-point.h
index afefa613e..80d3b435c 100644
--- a/src/vanishing-point.h
+++ b/src/vanishing-point.h
@@ -45,12 +45,7 @@ public:
VanishingPoint(Persp3D *persp, Proj::Axis axis) : my_counter(VanishingPoint::global_counter++), _persp(persp), _axis(axis) {}
VanishingPoint(const VanishingPoint &other) : my_counter(VanishingPoint::global_counter++), _persp(other._persp), _axis(other._axis) {}
- inline VanishingPoint &operator=(VanishingPoint const &rhs) {
- _persp = rhs._persp;
- _axis = rhs._axis;
- my_counter = rhs.my_counter;
- return *this;
- }
+ inline VanishingPoint &operator=(VanishingPoint const &rhs) = default;
inline bool operator==(VanishingPoint const &rhs) const {
/* vanishing points coincide if they belong to the same perspective */
return (_persp == rhs._persp && _axis == rhs._axis);
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 3c15bf3a5..dd46cf58d 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -136,7 +136,7 @@ public:
prefs->addObserver(_dpw);
prefs->addObserver(_spw);
}
- virtual ~CMSPrefWatcher() {}
+ virtual ~CMSPrefWatcher() = default;
//virtual void notify(PrefValue &);
void add( SPDesktopWidget* dtw ) {
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index b9b184638..aa51cf33a 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -105,8 +105,7 @@ PaintDef::PaintDef( unsigned int r, unsigned int g, unsigned int b, const std::s
}
PaintDef::~PaintDef()
-{
-}
+= default;
PaintDef::PaintDef( PaintDef const &other )
{
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index 6176ab880..33b78519a 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -82,7 +82,7 @@ struct SPGradientSelector {
add(data);
add(pixbuf);
}
- ~ModelColumns() override {}
+ ~ModelColumns() override = default;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<unsigned long> color;
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 6ee827fb8..87051352f 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -145,8 +145,7 @@ ColorSelector::ColorSelector( SPColorSelector* csel )
}
ColorSelector::~ColorSelector()
-{
-}
+= default;
void ColorSelector::init()
{
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index fab39544b..9bfec39d6 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -133,8 +133,7 @@ SPWidgetImpl::SPWidgetImpl(SPWidget &target) :
}
SPWidgetImpl::~SPWidgetImpl()
-{
-}
+= default;
void SPWidgetImpl::dispose(GObject *object)
{
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 7b3df3337..1b051f6cd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -302,8 +302,7 @@ VerbAction::VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI
}
VerbAction::~VerbAction()
-{
-}
+= default;
Gtk::Widget* VerbAction::create_menu_item_vfunc()
{
diff --git a/src/xml/event.h b/src/xml/event.h
index b11cbe9cb..8c7a40327 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -57,7 +57,7 @@ class Event
: public Inkscape::GC::Managed<Inkscape::GC::SCANNED, Inkscape::GC::MANUAL>
{
public:
- virtual ~Event() {}
+ virtual ~Event() = default;
/**
* @brief Pointer to the next event in the event chain
diff --git a/src/xml/node-observer.h b/src/xml/node-observer.h
index 28c492d66..295d618b5 100644
--- a/src/xml/node-observer.h
+++ b/src/xml/node-observer.h
@@ -53,9 +53,9 @@ class Node;
class NodeObserver {
protected:
/* the constructor is protected to prevent instantiation */
- NodeObserver() {}
+ NodeObserver() = default;
public:
- virtual ~NodeObserver() {}
+ virtual ~NodeObserver() = default;
// FIXME: somebody needs to learn what "pure virtual" means
diff --git a/src/xml/node.h b/src/xml/node.h
index 3f19e8fa1..32c5837ae 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -77,8 +77,8 @@ enum NodeType {
*/
class Node : public Inkscape::GC::Anchored {
public:
- Node() {}
- ~Node() override {}
+ Node() = default;
+ ~Node() override = default;
/**
* @name Retrieve information about the node