[Bf-blender-cvs] [f0317911850] master: Cleanup: modernize-use-equals-default
Jacques Lucke
noreply at git.blender.org
Thu Apr 8 15:52:24 CEST 2021
Commit: f0317911850f07c75aa2e10e371b69b135194ac6
Author: Jacques Lucke
Date: Thu Apr 8 15:51:27 2021 +0200
Branches: master
https://developer.blender.org/rBf0317911850f07c75aa2e10e371b69b135194ac6
Cleanup: modernize-use-equals-default
This was missing from rB19dfb6ea1f6745c0dbc2ce21839c30184b553878.
===================================================================
M source/blender/freestyle/intern/geometry/Bezier.cpp
M source/blender/freestyle/intern/geometry/Bezier.h
M source/blender/freestyle/intern/geometry/FitCurve.cpp
M source/blender/freestyle/intern/geometry/FitCurve.h
M source/blender/freestyle/intern/geometry/GridHelpers.cpp
M source/blender/freestyle/intern/geometry/normal_cycle.cpp
M source/blender/freestyle/intern/geometry/normal_cycle.h
M source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
M source/blender/freestyle/intern/scene_graph/NodeCamera.h
M source/blender/freestyle/intern/system/PseudoNoise.cpp
M source/blender/freestyle/intern/system/PseudoNoise.h
M source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
M source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
M source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
M source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
M source/blender/freestyle/intern/view_map/BoxGrid.cpp
M source/blender/freestyle/intern/view_map/BoxGrid.h
M source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
M source/blender/freestyle/intern/view_map/CulledOccluderSource.h
M source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
M source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h
M source/blender/freestyle/intern/view_map/OccluderSource.cpp
M source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
M source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h
M source/blender/freestyle/intern/view_map/SphericalGrid.cpp
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/imbuf/intern/dds/ColorBlock.cpp
M source/blender/imbuf/intern/dds/ColorBlock.h
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/dds/DirectDrawSurface.h
M source/blender/io/collada/ErrorHandler.cpp
M source/blender/io/collada/ErrorHandler.h
M source/blender/io/collada/ExtraTags.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/geometry/Bezier.cpp b/source/blender/freestyle/intern/geometry/Bezier.cpp
index 4eec3d72db9..bf4a78b12c5 100644
--- a/source/blender/freestyle/intern/geometry/Bezier.cpp
+++ b/source/blender/freestyle/intern/geometry/Bezier.cpp
@@ -26,13 +26,7 @@ using namespace std;
namespace Freestyle {
-BezierCurveSegment::BezierCurveSegment()
-{
-}
-
-BezierCurveSegment::~BezierCurveSegment()
-{
-}
+BezierCurveSegment::~BezierCurveSegment() = default;
void BezierCurveSegment::AddControlPoint(const Vec2d &iPoint)
{
diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h
index 4c6b38935f9..83b033c105a 100644
--- a/source/blender/freestyle/intern/geometry/Bezier.h
+++ b/source/blender/freestyle/intern/geometry/Bezier.h
@@ -41,7 +41,6 @@ class BezierCurveSegment {
std::vector<Vec2d> _Vertices;
public:
- BezierCurveSegment();
virtual ~BezierCurveSegment();
void AddControlPoint(const Vec2d &iPoint);
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index 7c0b3bf0224..eb5a24f7373 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -462,10 +462,6 @@ static Vector2 V2SubII(Vector2 a, Vector2 b)
//------------------------- WRAPPER -----------------------------//
-FitCurveWrapper::FitCurveWrapper()
-{
-}
-
FitCurveWrapper::~FitCurveWrapper()
{
_vertices.clear();
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h
index c08dc52249e..dc60d67b943 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.h
+++ b/source/blender/freestyle/intern/geometry/FitCurve.h
@@ -70,7 +70,6 @@ class FitCurveWrapper {
std::vector<Vector2> _vertices;
public:
- FitCurveWrapper();
~FitCurveWrapper();
/*! Fits a set of 2D data points to a set of Bezier Curve segments
diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.cpp b/source/blender/freestyle/intern/geometry/GridHelpers.cpp
index a83dc385758..ee64b83f19e 100644
--- a/source/blender/freestyle/intern/geometry/GridHelpers.cpp
+++ b/source/blender/freestyle/intern/geometry/GridHelpers.cpp
@@ -42,8 +42,6 @@ void GridHelpers::getDefaultViewProscenium(real viewProscenium[4])
viewProscenium[3] = g_freestyle.viewport[3] * (1.0f - borderZone + bufferZone);
}
-GridHelpers::Transform::~Transform()
-{
-}
+GridHelpers::Transform::~Transform() = default;
} /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
index 2310525a1e1..77a80e63b77 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
@@ -36,10 +36,6 @@ namespace Freestyle::OGF {
//_________________________________________________________
-NormalCycle::NormalCycle()
-{
-}
-
void NormalCycle::begin()
{
M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0;
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h
index 5adef773be1..9d8ffcfd7fb 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.h
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.h
@@ -64,7 +64,6 @@ template<class T> inline void ogf_swap(T &x, T &y)
*/
class NormalCycle {
public:
- NormalCycle();
void begin();
void end();
/**
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index 4fc1f227172..cb30a661aaa 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
@@ -105,17 +105,6 @@ NodeOrthographicCamera::NodeOrthographicCamera(
projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear);
}
-NodeOrthographicCamera::NodeOrthographicCamera(const NodeOrthographicCamera &iBrother)
- : NodeCamera(iBrother),
- left_(iBrother.left_),
- right_(iBrother.right_),
- bottom_(iBrother.bottom_),
- top_(iBrother.top_),
- zNear_(iBrother.zNear_),
- zFar_(iBrother.zFar_)
-{
-}
-
NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE)
{
}
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
index cc7b1f7f67c..9e3f9046e39 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
@@ -136,7 +136,7 @@ class NodeOrthographicCamera : public NodeCamera {
return zFar_;
}
- NodeOrthographicCamera(const NodeOrthographicCamera &iBrother);
+ NodeOrthographicCamera(const NodeOrthographicCamera &iBrother) = default;
private:
double left_;
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index c05c269c404..7f568fcf460 100644
--- a/source/blender/freestyle/intern/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
@@ -41,10 +41,6 @@ namespace Freestyle {
real PseudoNoise::_values[];
-PseudoNoise::PseudoNoise()
-{
-}
-
void PseudoNoise::init(long seed)
{
RandGen::srand48(seed);
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h
index 38270016675..3be74bf0110 100644
--- a/source/blender/freestyle/intern/system/PseudoNoise.h
+++ b/source/blender/freestyle/intern/system/PseudoNoise.h
@@ -31,8 +31,6 @@ namespace Freestyle {
class PseudoNoise {
public:
- PseudoNoise();
-
virtual ~PseudoNoise()
{
}
diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
index 6c5cbc71a76..923748e6d7d 100644
--- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
+++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
@@ -55,10 +55,6 @@ ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource &sourc
initialize(proscenium);
}
-ArbitraryGridDensityProvider::~ArbitraryGridDensityProvider()
-{
-}
-
void ArbitraryGridDensityProvider::initialize(const real proscenium[4])
{
float prosceniumWidth = (proscenium[1] - proscenium[0]);
@@ -99,10 +95,6 @@ ArbitraryGridDensityProviderFactory::ArbitraryGridDensityProviderFactory(unsigne
{
}
-ArbitraryGridDensityProviderFactory::~ArbitraryGridDensityProviderFactory()
-{
-}
-
AutoPtr<GridDensityProvider> ArbitraryGridDensityProviderFactory::newGridDensityProvider(
OccluderSource &source, const real proscenium[4])
{
diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
index c2d843742df..ce23d23d7ed 100644
--- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
@@ -39,7 +39,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider {
const GridHelpers::Transform &transform,
unsigned numCells);
ArbitraryGridDensityProvider(OccluderSource &source, unsigned numCells);
- virtual ~ArbitraryGridDensityProvider();
protected:
unsigned numCells;
@@ -51,7 +50,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider {
class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory {
public:
ArbitraryGridDensityProviderFactory(unsigned numCells);
- ~ArbitraryGridDensityProviderFactory();
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
const real proscenium[4]);
diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
index 1384dc0f78b..9fa8f9dcbc2 100644
--- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
+++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
@@ -56,10 +56,6 @@ AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource &s
initialize(proscenium, sizeFactor);
}
-AverageAreaGridDensityProvider::~AverageAreaGridDensityProvider()
-{
-}
-
void AverageAreaGridDensityProvider::initialize(const real proscenium[4], real sizeFactor)
{
float prosceniumWidth = (proscenium[1] - proscenium[0]);
@@ -120,10 +116,6 @@ AverageAreaGridDensityProviderFactory::AverageAreaGridDensityProviderFactory(rea
{
}
-AverageAreaGridDensityProviderFactory::~AverageAreaGridDensityProviderFactory()
-{
-}
-
AutoPtr<GridDensityProvider> AverageAreaGridDensityProviderFactory::newGridDensityProvider(
OccluderSource &source, const real proscenium[4])
{
diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
index 5336cc1ff97..402fc6f210d 100644
--- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
@@ -39,7 +39,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider {
const GridHelpers::Transform &transform,
real sizeFactor);
AverageAreaGridDensityProvider(OccluderSource &source, real sizeFactor);
- virtual ~AverageAreaGridDensityProvider();
private:
void initialize(const real proscenium[4], real sizeFactor);
@@ -48,7 +47,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider {
class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory {
public:
AverageAreaGridDensityProviderFactory(real sizeFactor);
- ~AverageAreaGridDensityProviderFactory();
AutoPtr<GridDensity
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list