From de6f19ce2256a8a6a8529297feb499b423163c9e Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 8 Apr 2021 11:24:02 +0200 Subject: Cleanup: modernize-use-equals-default This was missing from rB19dfb6ea1f6745c0dbc2ce21839c30184b553878. --- source/blender/freestyle/intern/stroke/Curve.h | 4 +--- source/blender/freestyle/intern/stroke/Stroke.cpp | 4 ---- source/blender/freestyle/intern/stroke/Stroke.h | 3 --- source/blender/freestyle/intern/stroke/StrokeRenderer.cpp | 8 +------- source/blender/freestyle/intern/stroke/StrokeRenderer.h | 1 - source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp | 4 ---- source/blender/io/collada/ExtraHandler.cpp | 4 ---- source/blender/io/collada/ExtraHandler.h | 3 --- 8 files changed, 2 insertions(+), 29 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 91470b57ca2..f0db45150a9 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -236,9 +236,7 @@ class CurvePoint : public Interface0D { CurvePoint &operator=(const CurvePoint &iBrother); /*! Destructor */ - virtual ~CurvePoint() - { - } + virtual ~CurvePoint() = default; /*! Operator == */ bool operator==(const CurvePoint &b) diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 79eb37ae870..0de3e03d44a 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -383,10 +383,6 @@ StrokeVertex::StrokeVertex(SVertex *iSVertex, const StrokeAttribute &iAttribute) _StrokeLength = 0.0f; } -StrokeVertex::~StrokeVertex() -{ -} - StrokeVertex &StrokeVertex::operator=(const StrokeVertex &iBrother) { ((CurvePoint *)this)->operator=(iBrother); diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 5772b80b093..4a9ed7288c5 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -355,9 +355,6 @@ class StrokeVertex : public CurvePoint { /*! Builds a stroke from a view vertex and an attribute */ StrokeVertex(SVertex *iSVertex, const StrokeAttribute &iAttribute); - /*! destructor */ - virtual ~StrokeVertex(); - /* operators */ /*! operator = */ StrokeVertex &operator=(const StrokeVertex &iBrother); diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp index a4268e43a56..797fcc1aabc 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp @@ -37,13 +37,7 @@ namespace Freestyle { TextureManager *StrokeRenderer::_textureManager = nullptr; -StrokeRenderer::StrokeRenderer() -{ -} - -StrokeRenderer::~StrokeRenderer() -{ -} +StrokeRenderer::~StrokeRenderer() = default; bool StrokeRenderer::loadTextures() { diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 2fb08b880d9..d3ed8bde8a3 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -121,7 +121,6 @@ class TextureManager { * first rendering */ class StrokeRenderer { public: - StrokeRenderer(); virtual ~StrokeRenderer(); /*! Renders a stroke rep */ diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index cbb5c730b2b..cd0059f3c21 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -2322,10 +2322,6 @@ struct less_Intersection { }; struct silhouette_binary_rule : public binary_rule { - silhouette_binary_rule() - { - } - bool operator()(segment &s1, segment &s2) override { FEdge *f1 = s1.edge(); diff --git a/source/blender/io/collada/ExtraHandler.cpp b/source/blender/io/collada/ExtraHandler.cpp index 11cb75fb5e9..78785e9aead 100644 --- a/source/blender/io/collada/ExtraHandler.cpp +++ b/source/blender/io/collada/ExtraHandler.cpp @@ -30,10 +30,6 @@ ExtraHandler::ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp) this->aimp = aimp; } -ExtraHandler::~ExtraHandler() -{ -} - bool ExtraHandler::elementBegin(const char *elementName, const char **attributes) { /* \todo attribute handling for profile tags */ diff --git a/source/blender/io/collada/ExtraHandler.h b/source/blender/io/collada/ExtraHandler.h index 4b13aaca2aa..98e30318aad 100644 --- a/source/blender/io/collada/ExtraHandler.h +++ b/source/blender/io/collada/ExtraHandler.h @@ -40,9 +40,6 @@ class ExtraHandler : public COLLADASaxFWL::IExtraDataCallbackHandler { /** Constructor. */ ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp); - /** Destructor. */ - virtual ~ExtraHandler(); - /** Handle the beginning of an element. */ bool elementBegin(const char *elementName, const char **attributes); -- cgit v1.2.3