From 19dfb6ea1f6745c0dbc2ce21839c30184b553878 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 8 Apr 2021 11:07:12 +0200 Subject: Cleanup: enable modernize-use-equals-default check This removes a lot of unnecessary code that is generated by the compiler automatically. In very few cases, a defaulted destructor in a .cc file is still necessary, because of forward declarations in the header. I removed some defaulted virtual destructors, because they are not necessary, when the parent class has a virtual destructor already. Defaulted constructors are only necessary when there is another constructor, but the class should still be default constructible. Differential Revision: https://developer.blender.org/D10911 --- source/blender/blenkernel/BKE_geometry_set.hh | 2 +- source/blender/blenkernel/intern/cryptomatte.cc | 6 +- source/blender/blenkernel/intern/geometry_set.cc | 4 - source/blender/blenkernel/intern/volume.cc | 4 - source/blender/blenlib/intern/delaunay_2d.cc | 3 - source/blender/blenlib/intern/mesh_intersect.cc | 79 +----------------- source/blender/blenlib/intern/task_pool.cc | 4 - .../tests/blendfile_loading_base_test.cc | 4 - .../blenloader/tests/blendfile_loading_base_test.h | 2 - source/blender/compositor/intern/COM_NodeGraph.cc | 4 - source/blender/compositor/intern/COM_NodeGraph.h | 1 - .../compositor/intern/COM_NodeOperationBuilder.cc | 4 - .../compositor/intern/COM_NodeOperationBuilder.h | 1 - .../operations/COM_AlphaOverKeyOperation.cc | 5 -- .../operations/COM_AlphaOverKeyOperation.h | 5 -- .../COM_AlphaOverPremultiplyOperation.cc | 5 -- .../operations/COM_AlphaOverPremultiplyOperation.h | 5 -- .../COM_CalculateStandardDeviationOperation.cc | 5 -- .../COM_CalculateStandardDeviationOperation.h | 2 - .../COM_ConvolutionEdgeFilterOperation.cc | 5 -- .../COM_ConvolutionEdgeFilterOperation.h | 1 - .../operations/COM_DistanceYCCMatteOperation.cc | 5 -- .../operations/COM_DistanceYCCMatteOperation.h | 6 -- .../compositor/operations/COM_MixOperation.cc | 95 ---------------------- .../compositor/operations/COM_MixOperation.h | 19 ----- .../depsgraph/intern/builder/deg_builder.cc | 4 - .../blender/depsgraph/intern/builder/deg_builder.h | 2 +- .../depsgraph/intern/builder/deg_builder_cache.cc | 4 - .../depsgraph/intern/builder/deg_builder_cache.h | 1 - .../depsgraph/intern/builder/deg_builder_map.cc | 8 -- .../depsgraph/intern/builder/deg_builder_map.h | 3 - .../intern/builder/deg_builder_pchanmap.cc | 8 -- .../intern/builder/deg_builder_pchanmap.h | 4 - .../depsgraph/intern/builder/deg_builder_rna.cc | 4 +- .../blender/depsgraph/intern/builder/pipeline.cc | 4 - source/blender/depsgraph/intern/builder/pipeline.h | 2 +- .../eval/deg_eval_runtime_backup_animation.cc | 8 -- .../eval/deg_eval_runtime_backup_animation.h | 3 +- .../depsgraph/intern/node/deg_node_operation.cc | 4 - .../depsgraph/intern/node/deg_node_operation.h | 1 - source/blender/gpu/intern/gpu_batch_private.hh | 3 +- source/blender/gpu/intern/gpu_shader_interface.cc | 6 +- source/blender/gpu/opengl/gl_batch.cc | 14 ---- source/blender/gpu/opengl/gl_batch.hh | 3 - .../blender/imbuf/intern/openexr/openexr_api.cpp | 4 - .../io/alembic/exporter/abc_custom_props.cc | 4 - .../blender/io/alembic/exporter/abc_custom_props.h | 2 +- .../io/alembic/exporter/abc_writer_abstract.cc | 4 - .../io/alembic/exporter/abc_writer_abstract.h | 1 - .../io/alembic/exporter/abc_writer_instance.cc | 4 - .../io/alembic/exporter/abc_writer_instance.h | 1 - .../blender/io/alembic/exporter/abc_writer_mesh.cc | 4 - .../blender/io/alembic/exporter/abc_writer_mesh.h | 1 - .../blender/io/alembic/intern/abc_reader_object.cc | 4 - .../blender/io/alembic/intern/abc_reader_object.h | 2 +- source/blender/io/collada/SkinInfo.cpp | 5 +- .../io/common/IO_abstract_hierarchy_iterator.h | 5 +- .../common/intern/abstract_hierarchy_iterator.cc | 4 - .../io/common/intern/dupli_parent_finder.cc | 8 -- .../io/common/intern/dupli_parent_finder.hh | 3 - .../blender/io/common/intern/object_identifier.cc | 9 -- .../blender/io/usd/intern/usd_writer_abstract.cc | 4 - source/blender/io/usd/intern/usd_writer_abstract.h | 1 - 63 files changed, 14 insertions(+), 418 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index 4454669b59a..ab126ecb152 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -135,7 +135,7 @@ class GeometryComponent { public: GeometryComponent(GeometryComponentType type); - virtual ~GeometryComponent(); + virtual ~GeometryComponent() = default; static GeometryComponent *create(GeometryComponentType component_type); /* The returned component should be of the same type as the type this is called on. */ diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc index 99f0342e223..1ff0ca92306 100644 --- a/source/blender/blenkernel/intern/cryptomatte.cc +++ b/source/blender/blenkernel/intern/cryptomatte.cc @@ -54,7 +54,7 @@ struct CryptomatteSession { /* Layer names in order of creation. */ blender::Vector layer_names; - CryptomatteSession(); + CryptomatteSession() = default; CryptomatteSession(const Main *bmain); CryptomatteSession(StampData *stamp_data); CryptomatteSession(const Scene *scene); @@ -67,10 +67,6 @@ struct CryptomatteSession { #endif }; -CryptomatteSession::CryptomatteSession() -{ -} - CryptomatteSession::CryptomatteSession(const Main *bmain) { if (!BLI_listbase_is_empty(&bmain->objects)) { diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 281512fe323..3b027c05f39 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -49,10 +49,6 @@ GeometryComponent::GeometryComponent(GeometryComponentType type) : type_(type) { } -GeometryComponent ::~GeometryComponent() -{ -} - GeometryComponent *GeometryComponent::create(GeometryComponentType component_type) { switch (component_type) { diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 9b5231f7d6f..6c0d361a64c 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -171,10 +171,6 @@ static struct VolumeFileCache { }; /* Cache */ - VolumeFileCache() - { - } - ~VolumeFileCache() { BLI_assert(cache.empty()); diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 06a749ab921..9444d1a29cb 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -334,9 +334,6 @@ template class CDT_state { T epsilon; explicit CDT_state(int num_input_verts, int num_input_edges, int num_input_faces, T epsilon); - ~CDT_state() - { - } }; template CDTArrangement::~CDTArrangement() diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index b2b8dd4e900..ce3a5b55f98 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -527,9 +527,7 @@ IMeshArena::IMeshArena() pimpl_ = std::make_unique(); } -IMeshArena::~IMeshArena() -{ -} +IMeshArena::~IMeshArena() = default; void IMeshArena::reserve(int vert_num_hint, int face_num_hint) { @@ -753,27 +751,6 @@ struct BoundingBox { BoundingBox(const float3 &min, const float3 &max) : min(min), max(max) { } - BoundingBox(const BoundingBox &other) : min(other.min), max(other.max) - { - } - BoundingBox(BoundingBox &&other) noexcept : min(std::move(other.min)), max(std::move(other.max)) - { - } - ~BoundingBox() = default; - BoundingBox operator=(const BoundingBox &other) - { - if (this != &other) { - min = other.min; - max = other.max; - } - return *this; - } - BoundingBox operator=(BoundingBox &&other) noexcept - { - min = std::move(other.min); - max = std::move(other.max); - return *this; - } void combine(const float3 &p) { @@ -936,28 +913,6 @@ class CoplanarCluster { { this->add_tri(t, bb); } - CoplanarCluster(const CoplanarCluster &other) : tris_(other.tris_), bb_(other.bb_) - { - } - CoplanarCluster(CoplanarCluster &&other) noexcept - : tris_(std::move(other.tris_)), bb_(std::move(other.bb_)) - { - } - ~CoplanarCluster() = default; - CoplanarCluster &operator=(const CoplanarCluster &other) - { - if (this != &other) { - tris_ = other.tris_; - bb_ = other.bb_; - } - return *this; - } - CoplanarCluster &operator=(CoplanarCluster &&other) noexcept - { - tris_ = std::move(other.tris_); - bb_ = std::move(other.bb_); - return *this; - } /* Assume that caller knows this will not be a duplicate. */ void add_tri(int t, const BoundingBox &bb) @@ -1073,38 +1028,6 @@ struct ITT_value { ITT_value(ITT_value_kind k, const mpq3 &p1, const mpq3 &p2) : p1(p1), p2(p2), kind(k) { } - ITT_value(const ITT_value &other) - : p1(other.p1), p2(other.p2), t_source(other.t_source), kind(other.kind) - { - } - ITT_value(ITT_value &&other) noexcept - : p1(std::move(other.p1)), - p2(std::move(other.p2)), - t_source(other.t_source), - kind(other.kind) - { - } - ~ITT_value() - { - } - ITT_value &operator=(const ITT_value &other) - { - if (this != &other) { - kind = other.kind; - p1 = other.p1; - p2 = other.p2; - t_source = other.t_source; - } - return *this; - } - ITT_value &operator=(ITT_value &&other) noexcept - { - kind = other.kind; - p1 = std::move(other.p1); - p2 = std::move(other.p2); - t_source = other.t_source; - return *this; - } }; static std::ostream &operator<<(std::ostream &os, const ITT_value &itt); diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index 00ba659a9c8..6404f5264cc 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -147,10 +147,6 @@ class TBBTaskGroup : public tbb::task_group { } # endif } - - ~TBBTaskGroup() - { - } }; #endif diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index 8d8dc3aebf7..280a4b42b36 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -50,10 +50,6 @@ #include "CLG_log.h" -BlendfileLoadingBaseTest::~BlendfileLoadingBaseTest() -{ -} - void BlendfileLoadingBaseTest::SetUpTestCase() { testing::Test::SetUpTestCase(); diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.h b/source/blender/blenloader/tests/blendfile_loading_base_test.h index 32bb2959dcc..d352aecfe41 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.h +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.h @@ -30,8 +30,6 @@ class BlendfileLoadingBaseTest : public testing::Test { struct Depsgraph *depsgraph = nullptr; public: - virtual ~BlendfileLoadingBaseTest(); - /* Sets up Blender just enough to not crash on loading * a blendfile and constructing a depsgraph. */ static void SetUpTestCase(); diff --git a/source/blender/compositor/intern/COM_NodeGraph.cc b/source/blender/compositor/intern/COM_NodeGraph.cc index 1907022e0ec..fbe56dd4b5a 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.cc +++ b/source/blender/compositor/intern/COM_NodeGraph.cc @@ -39,10 +39,6 @@ namespace blender::compositor { **** NodeGraph **** *******************/ -NodeGraph::NodeGraph() -{ -} - NodeGraph::~NodeGraph() { while (m_nodes.size()) { diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 68bba7b1007..7fa01593e1e 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -56,7 +56,6 @@ class NodeGraph { Vector m_links; public: - NodeGraph(); ~NodeGraph(); const Vector &nodes() const diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc index 889af4ea39a..82eb969b752 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc @@ -46,10 +46,6 @@ NodeOperationBuilder::NodeOperationBuilder(const CompositorContext *context, bNo m_graph.from_bNodeTree(*context, b_nodetree); } -NodeOperationBuilder::~NodeOperationBuilder() -{ -} - void NodeOperationBuilder::convertToOperations(ExecutionSystem *system) { /* interface handle for nodes */ diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 3b0ce57ed26..b2fb822af25 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -87,7 +87,6 @@ class NodeOperationBuilder { public: NodeOperationBuilder(const CompositorContext *context, bNodeTree *b_nodetree); - ~NodeOperationBuilder(); const CompositorContext &context() const { diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc index 34638cbe7d6..0c656753a51 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc @@ -20,11 +20,6 @@ namespace blender::compositor { -AlphaOverKeyOperation::AlphaOverKeyOperation() -{ - /* pass */ -} - void AlphaOverKeyOperation::executePixelSampled(float output[4], float x, float y, diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h index 8b8debefa7a..83713d18971 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h @@ -28,11 +28,6 @@ namespace blender::compositor { */ class AlphaOverKeyOperation : public MixBaseOperation { public: - /** - * Default constructor - */ - AlphaOverKeyOperation(); - /** * The inner loop of this operation. */ diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc index edb248d16e8..3dd4607e273 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc @@ -20,11 +20,6 @@ namespace blender::compositor { -AlphaOverPremultiplyOperation::AlphaOverPremultiplyOperation() -{ - /* pass */ -} - void AlphaOverPremultiplyOperation::executePixelSampled(float output[4], float x, float y, diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h index 16246231a57..f1d4b668fce 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h @@ -28,11 +28,6 @@ namespace blender::compositor { */ class AlphaOverPremultiplyOperation : public MixBaseOperation { public: - /** - * Default constructor - */ - AlphaOverPremultiplyOperation(); - /** * The inner loop of this operation. */ diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc index 5ddb4b1c859..ed554b9ac06 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc @@ -24,11 +24,6 @@ namespace blender::compositor { -CalculateStandardDeviationOperation::CalculateStandardDeviationOperation() -{ - /* pass */ -} - void CalculateStandardDeviationOperation::executePixel(float output[4], int /*x*/, int /*y*/, diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index b8487e0aa4c..bc4aca69546 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -34,8 +34,6 @@ class CalculateStandardDeviationOperation : public CalculateMeanOperation { float m_standardDeviation; public: - CalculateStandardDeviationOperation(); - /** * The inner loop of this operation. */ diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc index 9114200a8ec..5ead300a368 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc @@ -21,11 +21,6 @@ namespace blender::compositor { -ConvolutionEdgeFilterOperation::ConvolutionEdgeFilterOperation() -{ - /* pass */ -} - void ConvolutionEdgeFilterOperation::executePixel(float output[4], int x, int y, void * /*data*/) { float in1[4], in2[4], res1[4] = {0.0}, res2[4] = {0.0}; diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h index 98bfa1768d8..319b424bd4a 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h @@ -24,7 +24,6 @@ namespace blender::compositor { class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation { public: - ConvolutionEdgeFilterOperation(); void executePixel(float output[4], int x, int y, void *data) override; }; diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc index 15ed2b0aaa4..597545dd706 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc @@ -21,11 +21,6 @@ namespace blender::compositor { -DistanceYCCMatteOperation::DistanceYCCMatteOperation() -{ - /* pass */ -} - float DistanceYCCMatteOperation::calculateDistance(float key[4], float image[4]) { /* only measure the second 2 values */ diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h index 9027fbabe7b..a87e885e5d8 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h @@ -30,12 +30,6 @@ namespace blender::compositor { class DistanceYCCMatteOperation : public DistanceRGBMatteOperation { protected: float calculateDistance(float key[4], float image[4]) override; - - public: - /** - * Default constructor - */ - DistanceYCCMatteOperation(); }; } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_MixOperation.cc b/source/blender/compositor/operations/COM_MixOperation.cc index 70f3242c076..882326a04b1 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cc +++ b/source/blender/compositor/operations/COM_MixOperation.cc @@ -99,11 +99,6 @@ void MixBaseOperation::deinitExecution() /* ******** Mix Add Operation ******** */ -MixAddOperation::MixAddOperation() -{ - /* pass */ -} - void MixAddOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { float inputColor1[4]; @@ -128,11 +123,6 @@ void MixAddOperation::executePixelSampled(float output[4], float x, float y, Pix /* ******** Mix Blend Operation ******** */ -MixBlendOperation::MixBlendOperation() -{ - /* pass */ -} - void MixBlendOperation::executePixelSampled(float output[4], float x, float y, @@ -162,11 +152,6 @@ void MixBlendOperation::executePixelSampled(float output[4], /* ******** Mix Burn Operation ******** */ -MixColorBurnOperation::MixColorBurnOperation() -{ - /* pass */ -} - void MixColorBurnOperation::executePixelSampled(float output[4], float x, float y, @@ -245,11 +230,6 @@ void MixColorBurnOperation::executePixelSampled(float output[4], /* ******** Mix Color Operation ******** */ -MixColorOperation::MixColorOperation() -{ - /* pass */ -} - void MixColorOperation::executePixelSampled(float output[4], float x, float y, @@ -290,11 +270,6 @@ void MixColorOperation::executePixelSampled(float output[4], /* ******** Mix Darken Operation ******** */ -MixDarkenOperation::MixDarkenOperation() -{ - /* pass */ -} - void MixDarkenOperation::executePixelSampled(float output[4], float x, float y, @@ -323,11 +298,6 @@ void MixDarkenOperation::executePixelSampled(float output[4], /* ******** Mix Difference Operation ******** */ -MixDifferenceOperation::MixDifferenceOperation() -{ - /* pass */ -} - void MixDifferenceOperation::executePixelSampled(float output[4], float x, float y, @@ -356,11 +326,6 @@ void MixDifferenceOperation::executePixelSampled(float output[4], /* ******** Mix Difference Operation ******** */ -MixDivideOperation::MixDivideOperation() -{ - /* pass */ -} - void MixDivideOperation::executePixelSampled(float output[4], float x, float y, @@ -406,11 +371,6 @@ void MixDivideOperation::executePixelSampled(float output[4], /* ******** Mix Dodge Operation ******** */ -MixDodgeOperation::MixDodgeOperation() -{ - /* pass */ -} - void MixDodgeOperation::executePixelSampled(float output[4], float x, float y, @@ -494,11 +454,6 @@ void MixDodgeOperation::executePixelSampled(float output[4], /* ******** Mix Glare Operation ******** */ -MixGlareOperation::MixGlareOperation() -{ - /* pass */ -} - void MixGlareOperation::executePixelSampled(float output[4], float x, float y, @@ -535,11 +490,6 @@ void MixGlareOperation::executePixelSampled(float output[4], /* ******** Mix Hue Operation ******** */ -MixHueOperation::MixHueOperation() -{ - /* pass */ -} - void MixHueOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { float inputColor1[4]; @@ -577,11 +527,6 @@ void MixHueOperation::executePixelSampled(float output[4], float x, float y, Pix /* ******** Mix Lighten Operation ******** */ -MixLightenOperation::MixLightenOperation() -{ - /* pass */ -} - void MixLightenOperation::executePixelSampled(float output[4], float x, float y, @@ -628,11 +573,6 @@ void MixLightenOperation::executePixelSampled(float output[4], /* ******** Mix Linear Light Operation ******** */ -MixLinearLightOperation::MixLinearLightOperation() -{ - /* pass */ -} - void MixLinearLightOperation::executePixelSampled(float output[4], float x, float y, @@ -676,11 +616,6 @@ void MixLinearLightOperation::executePixelSampled(float output[4], /* ******** Mix Multiply Operation ******** */ -MixMultiplyOperation::MixMultiplyOperation() -{ - /* pass */ -} - void MixMultiplyOperation::executePixelSampled(float output[4], float x, float y, @@ -709,11 +644,6 @@ void MixMultiplyOperation::executePixelSampled(float output[4], /* ******** Mix Overlay Operation ******** */ -MixOverlayOperation::MixOverlayOperation() -{ - /* pass */ -} - void MixOverlayOperation::executePixelSampled(float output[4], float x, float y, @@ -759,11 +689,6 @@ void MixOverlayOperation::executePixelSampled(float output[4], /* ******** Mix Saturation Operation ******** */ -MixSaturationOperation::MixSaturationOperation() -{ - /* pass */ -} - void MixSaturationOperation::executePixelSampled(float output[4], float x, float y, @@ -801,11 +726,6 @@ void MixSaturationOperation::executePixelSampled(float output[4], /* ******** Mix Screen Operation ******** */ -MixScreenOperation::MixScreenOperation() -{ - /* pass */ -} - void MixScreenOperation::executePixelSampled(float output[4], float x, float y, @@ -835,11 +755,6 @@ void MixScreenOperation::executePixelSampled(float output[4], /* ******** Mix Soft Light Operation ******** */ -MixSoftLightOperation::MixSoftLightOperation() -{ - /* pass */ -} - void MixSoftLightOperation::executePixelSampled(float output[4], float x, float y, @@ -881,11 +796,6 @@ void MixSoftLightOperation::executePixelSampled(float output[4], /* ******** Mix Subtract Operation ******** */ -MixSubtractOperation::MixSubtractOperation() -{ - /* pass */ -} - void MixSubtractOperation::executePixelSampled(float output[4], float x, float y, @@ -913,11 +823,6 @@ void MixSubtractOperation::executePixelSampled(float output[4], /* ******** Mix Value Operation ******** */ -MixValueOperation::MixValueOperation() -{ - /* pass */ -} - void MixValueOperation::executePixelSampled(float output[4], float x, float y, diff --git a/source/blender/compositor/operations/COM_MixOperation.h b/source/blender/compositor/operations/COM_MixOperation.h index 86200c9836e..6c241bc5762 100644 --- a/source/blender/compositor/operations/COM_MixOperation.h +++ b/source/blender/compositor/operations/COM_MixOperation.h @@ -85,115 +85,96 @@ class MixBaseOperation : public NodeOperation { class MixAddOperation : public MixBaseOperation { public: - MixAddOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixBlendOperation : public MixBaseOperation { public: - MixBlendOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixColorBurnOperation : public MixBaseOperation { public: - MixColorBurnOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixColorOperation : public MixBaseOperation { public: - MixColorOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixDarkenOperation : public MixBaseOperation { public: - MixDarkenOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixDifferenceOperation : public MixBaseOperation { public: - MixDifferenceOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixDivideOperation : public MixBaseOperation { public: - MixDivideOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixDodgeOperation : public MixBaseOperation { public: - MixDodgeOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixGlareOperation : public MixBaseOperation { public: - MixGlareOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixHueOperation : public MixBaseOperation { public: - MixHueOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixLightenOperation : public MixBaseOperation { public: - MixLightenOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixLinearLightOperation : public MixBaseOperation { public: - MixLinearLightOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixMultiplyOperation : public MixBaseOperation { public: - MixMultiplyOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixOverlayOperation : public MixBaseOperation { public: - MixOverlayOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixSaturationOperation : public MixBaseOperation { public: - MixSaturationOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixScreenOperation : public MixBaseOperation { public: - MixScreenOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixSoftLightOperation : public MixBaseOperation { public: - MixSoftLightOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixSubtractOperation : public MixBaseOperation { public: - MixSubtractOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; class MixValueOperation : public MixBaseOperation { public: - MixValueOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index e4660c34762..f4d65698bee 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -77,10 +77,6 @@ DepsgraphBuilder::DepsgraphBuilder(Main *bmain, Depsgraph *graph, DepsgraphBuild { } -DepsgraphBuilder::~DepsgraphBuilder() -{ -} - bool DepsgraphBuilder::need_pull_base_into_graph(Base *base) { /* Simple check: enabled bases are always part of dependency graph. */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h index 36b6b1bf17d..6e1c8d8526f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.h +++ b/source/blender/depsgraph/intern/builder/deg_builder.h @@ -37,7 +37,7 @@ class DepsgraphBuilderCache; class DepsgraphBuilder { public: - virtual ~DepsgraphBuilder(); + virtual ~DepsgraphBuilder() = default; virtual bool need_pull_base_into_graph(Base *base); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc index df108072142..af7717d7595 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc @@ -149,10 +149,6 @@ bool AnimatedPropertyStorage::isPropertyAnimated(const PointerRNA *pointer_rna, /* Builder cache itself. */ -DepsgraphBuilderCache::DepsgraphBuilderCache() -{ -} - DepsgraphBuilderCache::~DepsgraphBuilderCache() { for (AnimatedPropertyStorage *animated_property_storage : diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.h b/source/blender/depsgraph/intern/builder/deg_builder_cache.h index e04ae3a3727..c955a22a5cf 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.h @@ -81,7 +81,6 @@ class AnimatedPropertyStorage { /* Cached data which can be re-used by multiple builders. */ class DepsgraphBuilderCache { public: - DepsgraphBuilderCache(); ~DepsgraphBuilderCache(); /* Makes sure storage for animated properties exists and initialized for the given ID. */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc b/source/blender/depsgraph/intern/builder/deg_builder_map.cc index 5da54350cfc..6e926da6b29 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc @@ -27,14 +27,6 @@ namespace blender::deg { -BuilderMap::BuilderMap() -{ -} - -BuilderMap::~BuilderMap() -{ -} - bool BuilderMap::checkIsBuilt(ID *id, int tag) const { return (getIDTag(id) & tag) == tag; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h index 8b23d3d0d3b..53f6a722e85 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h @@ -47,9 +47,6 @@ class BuilderMap { TAG_SCENE_COMPOSITOR | TAG_SCENE_SEQUENCER | TAG_SCENE_AUDIO), }; - BuilderMap(); - ~BuilderMap(); - /* Check whether given ID is already handled by builder (or if it's being handled). */ bool checkIsBuilt(ID *id, int tag = TAG_COMPLETE) const; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index 197e14c1a21..17c2925b7f4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -30,14 +30,6 @@ namespace blender::deg { -RootPChanMap::RootPChanMap() -{ -} - -RootPChanMap::~RootPChanMap() -{ -} - /* Debug contents of map */ void RootPChanMap::print_debug() { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h index 7a6ea38a0f0..0dd4062c353 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h @@ -29,10 +29,6 @@ namespace blender { namespace deg { struct RootPChanMap { - /* Constructor and destructor - Create and free the internal map respectively. */ - RootPChanMap(); - ~RootPChanMap(); - /* Debug contents of map. */ void print_debug(); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 4064058f231..54c51adec66 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -119,9 +119,7 @@ RNANodeQuery::RNANodeQuery(Depsgraph *depsgraph, DepsgraphBuilder *builder) { } -RNANodeQuery::~RNANodeQuery() -{ -} +RNANodeQuery::~RNANodeQuery() = default; Node *RNANodeQuery::find_node(const PointerRNA *ptr, const PropertyRNA *prop, diff --git a/source/blender/depsgraph/intern/builder/pipeline.cc b/source/blender/depsgraph/intern/builder/pipeline.cc index b96236ba2e3..10bc7213061 100644 --- a/source/blender/depsgraph/intern/builder/pipeline.cc +++ b/source/blender/depsgraph/intern/builder/pipeline.cc @@ -40,10 +40,6 @@ AbstractBuilderPipeline::AbstractBuilderPipeline(::Depsgraph *graph) { } -AbstractBuilderPipeline::~AbstractBuilderPipeline() -{ -} - void AbstractBuilderPipeline::build() { double start_time = 0.0; diff --git a/source/blender/depsgraph/intern/builder/pipeline.h b/source/blender/depsgraph/intern/builder/pipeline.h index dcd1bc6f26e..d0ccf352c21 100644 --- a/source/blender/depsgraph/intern/builder/pipeline.h +++ b/source/blender/depsgraph/intern/builder/pipeline.h @@ -50,7 +50,7 @@ class DepsgraphRelationBuilder; class AbstractBuilderPipeline { public: AbstractBuilderPipeline(::Depsgraph *graph); - virtual ~AbstractBuilderPipeline(); + virtual ~AbstractBuilderPipeline() = default; void build(); diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc index c1d2dd8b6cc..bd872d40825 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc @@ -75,19 +75,11 @@ void animated_property_store_cb(ID *id, FCurve *fcurve, void *data_v) } // namespace -AnimationValueBackup::AnimationValueBackup() -{ -} - AnimationValueBackup::AnimationValueBackup(const string &rna_path, int array_index, float value) : rna_path(rna_path), array_index(array_index), value(value) { } -AnimationValueBackup::~AnimationValueBackup() -{ -} - AnimationBackup::AnimationBackup(const Depsgraph *depsgraph) { meed_value_backup = !depsgraph->is_active; diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h index 6b5d5eab75f..8f71457ae6f 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h @@ -34,9 +34,8 @@ struct Depsgraph; class AnimationValueBackup { public: - AnimationValueBackup(); + AnimationValueBackup() = default; AnimationValueBackup(const string &rna_path, int array_index, float value); - ~AnimationValueBackup(); AnimationValueBackup(const AnimationValueBackup &other) = default; AnimationValueBackup(AnimationValueBackup &&other) noexcept = default; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 97aca6280be..7e57467f905 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -213,10 +213,6 @@ OperationNode::OperationNode() : name_tag(-1), flag(0) { } -OperationNode::~OperationNode() -{ -} - string OperationNode::identifier() const { return string(operationCodeAsString(opcode)) + "(" + name + ")"; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index 40369de08f5..1d966cffd5d 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -231,7 +231,6 @@ enum OperationFlag { /* Atomic Operation - Base type for all operations */ struct OperationNode : public Node { OperationNode(); - ~OperationNode(); virtual string identifier() const override; string full_identifier() const; diff --git a/source/blender/gpu/intern/gpu_batch_private.hh b/source/blender/gpu/intern/gpu_batch_private.hh index d0fbd1432b3..eed96864f20 100644 --- a/source/blender/gpu/intern/gpu_batch_private.hh +++ b/source/blender/gpu/intern/gpu_batch_private.hh @@ -42,8 +42,7 @@ namespace gpu { */ class Batch : public GPUBatch { public: - Batch(){}; - virtual ~Batch(){}; + virtual ~Batch() = default; virtual void draw(int v_first, int v_count, int i_first, int i_count) = 0; diff --git a/source/blender/gpu/intern/gpu_shader_interface.cc b/source/blender/gpu/intern/gpu_shader_interface.cc index 81c1e013877..c584c40eca8 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.cc +++ b/source/blender/gpu/intern/gpu_shader_interface.cc @@ -32,10 +32,8 @@ namespace blender::gpu { -ShaderInterface::ShaderInterface() -{ - /* TODO(fclem): add unique ID for debugging. */ -} +/* TODO(fclem): add unique ID for debugging. */ +ShaderInterface::ShaderInterface() = default; ShaderInterface::~ShaderInterface() { diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc index 321d9552828..976a31ab5cb 100644 --- a/source/blender/gpu/opengl/gl_batch.cc +++ b/source/blender/gpu/opengl/gl_batch.cc @@ -278,20 +278,6 @@ GLuint GLVaoCache::vao_get(GPUBatch *batch) } /** \} */ -/* -------------------------------------------------------------------- */ -/** \name Creation & Deletion - * \{ */ - -GLBatch::GLBatch() -{ -} - -GLBatch::~GLBatch() -{ -} - -/** \} */ - /* -------------------------------------------------------------------- */ /** \name Drawing * \{ */ diff --git a/source/blender/gpu/opengl/gl_batch.hh b/source/blender/gpu/opengl/gl_batch.hh index 218b9ffe4b7..444ae1c0ab1 100644 --- a/source/blender/gpu/opengl/gl_batch.hh +++ b/source/blender/gpu/opengl/gl_batch.hh @@ -96,9 +96,6 @@ class GLBatch : public Batch { GLVaoCache vao_cache_; public: - GLBatch(); - ~GLBatch(); - void draw(int v_first, int v_count, int i_first, int i_count) override; void bind(int i_first); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 2a9cb9af891..382d86f2645 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -120,10 +120,6 @@ class IMemStream : public Imf::IStream { _exrbuf = exrbuf; } - ~IMemStream() override - { - } - bool read(char c[], int n) override { if (n + _exrpos <= _exrsize) { diff --git a/source/blender/io/alembic/exporter/abc_custom_props.cc b/source/blender/io/alembic/exporter/abc_custom_props.cc index 382afdc294d..f5593e7ee30 100644 --- a/source/blender/io/alembic/exporter/abc_custom_props.cc +++ b/source/blender/io/alembic/exporter/abc_custom_props.cc @@ -51,10 +51,6 @@ CustomPropertiesExporter::CustomPropertiesExporter(ABCAbstractWriter *owner) : o { } -CustomPropertiesExporter::~CustomPropertiesExporter() -{ -} - void CustomPropertiesExporter::write_all(const IDProperty *group) { if (group == nullptr) { diff --git a/source/blender/io/alembic/exporter/abc_custom_props.h b/source/blender/io/alembic/exporter/abc_custom_props.h index d3f9b2fc43c..fcd47382d96 100644 --- a/source/blender/io/alembic/exporter/abc_custom_props.h +++ b/source/blender/io/alembic/exporter/abc_custom_props.h @@ -61,7 +61,7 @@ class CustomPropertiesExporter { public: CustomPropertiesExporter(ABCAbstractWriter *owner); - virtual ~CustomPropertiesExporter(); + virtual ~CustomPropertiesExporter() = default; void write_all(const IDProperty *group); diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.cc b/source/blender/io/alembic/exporter/abc_writer_abstract.cc index e99048cc0ee..27b5c2fa2a4 100644 --- a/source/blender/io/alembic/exporter/abc_writer_abstract.cc +++ b/source/blender/io/alembic/exporter/abc_writer_abstract.cc @@ -45,10 +45,6 @@ ABCAbstractWriter::ABCAbstractWriter(const ABCWriterConstructorArgs &args) { } -ABCAbstractWriter::~ABCAbstractWriter() -{ -} - bool ABCAbstractWriter::is_supported(const HierarchyContext * /*context*/) const { return true; diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.h b/source/blender/io/alembic/exporter/abc_writer_abstract.h index 4997e498199..d3500394555 100644 --- a/source/blender/io/alembic/exporter/abc_writer_abstract.h +++ b/source/blender/io/alembic/exporter/abc_writer_abstract.h @@ -50,7 +50,6 @@ class ABCAbstractWriter : public AbstractHierarchyWriter { public: explicit ABCAbstractWriter(const ABCWriterConstructorArgs &args); - virtual ~ABCAbstractWriter(); virtual void write(HierarchyContext &context) override; diff --git a/source/blender/io/alembic/exporter/abc_writer_instance.cc b/source/blender/io/alembic/exporter/abc_writer_instance.cc index 7f3b044cb8b..1737e8c091e 100644 --- a/source/blender/io/alembic/exporter/abc_writer_instance.cc +++ b/source/blender/io/alembic/exporter/abc_writer_instance.cc @@ -35,10 +35,6 @@ ABCInstanceWriter::ABCInstanceWriter(const ABCWriterConstructorArgs &args) { } -ABCInstanceWriter::~ABCInstanceWriter() -{ -} - void ABCInstanceWriter::create_alembic_objects(const HierarchyContext *context) { OObject original = args_.hierarchy_iterator->get_alembic_object(context->original_export_path); diff --git a/source/blender/io/alembic/exporter/abc_writer_instance.h b/source/blender/io/alembic/exporter/abc_writer_instance.h index f7d6450055a..1e4285d5e02 100644 --- a/source/blender/io/alembic/exporter/abc_writer_instance.h +++ b/source/blender/io/alembic/exporter/abc_writer_instance.h @@ -31,7 +31,6 @@ namespace blender::io::alembic { class ABCInstanceWriter : public ABCAbstractWriter { public: explicit ABCInstanceWriter(const ABCWriterConstructorArgs &args); - virtual ~ABCInstanceWriter(); virtual void create_alembic_objects(const HierarchyContext *context) override; virtual Alembic::Abc::OObject get_alembic_object() const override; diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index fbc662113cc..c00e57c8edc 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -113,10 +113,6 @@ void ABCGenericMeshWriter::create_alembic_objects(const HierarchyContext *contex liquid_sim_modifier_ = get_liquid_sim_modifier(scene_eval, context->object); } -ABCGenericMeshWriter::~ABCGenericMeshWriter() -{ -} - Alembic::Abc::OObject ABCGenericMeshWriter::get_alembic_object() const { if (is_subd_) { diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.h b/source/blender/io/alembic/exporter/abc_writer_mesh.h index ed4fb4e4514..0e1792b9dab 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.h +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.h @@ -51,7 +51,6 @@ class ABCGenericMeshWriter : public ABCAbstractWriter { public: explicit ABCGenericMeshWriter(const ABCWriterConstructorArgs &args); - virtual ~ABCGenericMeshWriter(); virtual void create_alembic_objects(const HierarchyContext *context) override; virtual Alembic::Abc::OObject get_alembic_object() const override; diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index 5ca7022bb36..d428d98fdb9 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -97,10 +97,6 @@ void AbcObjectReader::determine_inherits_xform() } } -AbcObjectReader::~AbcObjectReader() -{ -} - const IObject &AbcObjectReader::iobject() const { return m_iobject; diff --git a/source/blender/io/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h index 8e00ed42777..dacdcf3f722 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.h +++ b/source/blender/io/alembic/intern/abc_reader_object.h @@ -100,7 +100,7 @@ class AbcObjectReader { public: explicit AbcObjectReader(const Alembic::Abc::IObject &object, ImportSettings &settings); - virtual ~AbcObjectReader(); + virtual ~AbcObjectReader() = default; const Alembic::Abc::IObject &iobject() const; diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index 8f6f1e467d9..12dee388a58 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -55,10 +55,7 @@ template static const char *bc_get_joint_name(T *node) /* This is used to store data passed in write_controller_data. * Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members * so that arrays don't get freed until we free them explicitly. */ -SkinInfo::SkinInfo() -{ - /* pass */ -} +SkinInfo::SkinInfo() = default; SkinInfo::SkinInfo(const SkinInfo &skin) : weights(skin.weights), diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h index 300c555ac8f..0bebc4384a9 100644 --- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h +++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h @@ -123,7 +123,7 @@ struct HierarchyContext { */ class AbstractHierarchyWriter { public: - virtual ~AbstractHierarchyWriter(); + virtual ~AbstractHierarchyWriter() = default; virtual void write(HierarchyContext &context) = 0; /* TODO(Sybren): add function like absent() that's called when a writer was previously created, * but wasn't used while exporting the current frame (for example, a particle-instanced mesh of @@ -186,9 +186,6 @@ class ObjectIdentifier { ObjectIdentifier(Object *object, Object *duplicated_by, const PersistentID &persistent_id); public: - ObjectIdentifier(const ObjectIdentifier &other); - ~ObjectIdentifier(); - static ObjectIdentifier for_graph_root(); static ObjectIdentifier for_real_object(Object *object); static ObjectIdentifier for_hierarchy_context(const HierarchyContext *context); diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index a33d636500f..3cda4d125d0 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -137,10 +137,6 @@ AbstractHierarchyWriter *EnsuredWriter::operator->() return writer_; } -AbstractHierarchyWriter::~AbstractHierarchyWriter() -{ -} - bool AbstractHierarchyWriter::check_is_animated(const HierarchyContext &context) const { const Object *object = context.object; diff --git a/source/blender/io/common/intern/dupli_parent_finder.cc b/source/blender/io/common/intern/dupli_parent_finder.cc index 73e33eff164..221e70ed587 100644 --- a/source/blender/io/common/intern/dupli_parent_finder.cc +++ b/source/blender/io/common/intern/dupli_parent_finder.cc @@ -25,14 +25,6 @@ namespace blender::io { -DupliParentFinder::DupliParentFinder() -{ -} - -DupliParentFinder::~DupliParentFinder() -{ -} - void DupliParentFinder::insert(const DupliObject *dupli_ob) { dupli_set_.insert(dupli_ob->ob); diff --git a/source/blender/io/common/intern/dupli_parent_finder.hh b/source/blender/io/common/intern/dupli_parent_finder.hh index 3dcf037bb5e..b7632a72222 100644 --- a/source/blender/io/common/intern/dupli_parent_finder.hh +++ b/source/blender/io/common/intern/dupli_parent_finder.hh @@ -43,9 +43,6 @@ class DupliParentFinder final { InstancerPIDToDuplisMap instancer_pid_to_duplis_; public: - DupliParentFinder(); - ~DupliParentFinder(); - void insert(const DupliObject *dupli_ob); bool is_duplicated(const Object *object) const; diff --git a/source/blender/io/common/intern/object_identifier.cc b/source/blender/io/common/intern/object_identifier.cc index 5d0b89b0630..2df1befcd69 100644 --- a/source/blender/io/common/intern/object_identifier.cc +++ b/source/blender/io/common/intern/object_identifier.cc @@ -35,15 +35,6 @@ ObjectIdentifier::ObjectIdentifier(Object *object, { } -ObjectIdentifier::ObjectIdentifier(const ObjectIdentifier &other) - : object(other.object), duplicated_by(other.duplicated_by), persistent_id(other.persistent_id) -{ -} - -ObjectIdentifier::~ObjectIdentifier() -{ -} - ObjectIdentifier ObjectIdentifier::for_real_object(Object *object) { return ObjectIdentifier(object, nullptr, PersistentID()); diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc index 694fc76a446..5e66136abf1 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.cc +++ b/source/blender/io/usd/intern/usd_writer_abstract.cc @@ -41,10 +41,6 @@ USDAbstractWriter::USDAbstractWriter(const USDExporterContext &usd_export_contex { } -USDAbstractWriter::~USDAbstractWriter() -{ -} - bool USDAbstractWriter::is_supported(const HierarchyContext * /*context*/) const { return true; diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index 2143164e3dd..6f143a7e241 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -49,7 +49,6 @@ class USDAbstractWriter : public AbstractHierarchyWriter { public: USDAbstractWriter(const USDExporterContext &usd_export_context); - virtual ~USDAbstractWriter(); virtual void write(HierarchyContext &context) override; -- cgit v1.2.3