summaryrefslogtreecommitdiffstats
path: root/src/display
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 /src/display
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.
Diffstat (limited to 'src/display')
-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
17 files changed, 26 insertions, 42 deletions
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;