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
UPBGE · Apr 8, 2021 · 19dfb6e · 19dfb6e
1 parent 0ea6603
commit 19dfb6e
Show file tree

Hide file tree

Showing 64 changed files with 14 additions and 419 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -35,7 +35,6 @@ Checks:  >
   -modernize-use-auto,
   -modernize-use-trailing-return-type,
   -modernize-avoid-c-arrays,
-  -modernize-use-equals-default,
   -modernize-use-nodiscard,
   -modernize-loop-convert,
   -modernize-pass-by-value,

diff --git 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
@@ -54,7 +54,7 @@ struct CryptomatteSession {
   /* Layer names in order of creation. */
   blender::Vector<std::string> 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
@@ -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
@@ -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
@@ -334,9 +334,6 @@ template<typename T> 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<typename T> CDTArrangement<T>::~CDTArrangement()

diff --git 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<IMeshArenaImpl>();
 }
 
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -56,7 +56,6 @@ class NodeGraph {
   Vector<Link> m_links;
 
  public:
-  NodeGraph();
   ~NodeGraph();
 
   const Vector<Node *> &nodes() const

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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