Cleanup: Remove using-directive from freestyle headers
ClosedPublic
Actions

Authored by Omar Emara (OmarSquircleArt) on Feb 7 2021, 11:02 AM.

Details

Reviewers

Tamito Kajiyama (kjym3)
Brecht Van Lommel (brecht)

Commits

rB21a2b975b819: Cleanup: Remove using-directive from freestyle headers

Summary

The header files in freestyle utilize the using-directive at the global
file scope. This is a bad practice as it pollutes the global name space
causing possible ambiguous reference compilation errors. In particular,
the DNA files that are included by freestyle will cause those ambiguous
reference errors when the developers adds a DNA member with a type name
that also exist in the Freestyle name space, such as Curve and possibly
others.

This patch does the minimal work needed to resolve that by moving the
using-directives from the headers into the corresponding translation
units.

Diff Detail

Repository: rB Blender

Event Timeline

Omar Emara (OmarSquircleArt) requested review of this revision.Feb 7 2021, 11:02 AM

Omar Emara (OmarSquircleArt) created this revision.

Harbormaster completed remote builds in B12697: Diff 33677.Feb 7 2021, 11:02 AM

Omar Emara (OmarSquircleArt) mentioned this in D10354: Python: Add to_curve method to the object API.Feb 7 2021, 10:19 PM

Brecht Van Lommel (brecht) accepted this revision.Feb 8 2021, 1:05 PM

This revision is now accepted and ready to land.Feb 8 2021, 1:05 PM

Closed by commit rB21a2b975b819: Cleanup: Remove using-directive from freestyle headers (authored by Omar Emara (OmarSquircleArt)). · Explain WhyFeb 8 2021, 4:25 PM

This revision was automatically updated to reflect the committed changes.

Omar Emara (OmarSquircleArt) added a commit: rB21a2b975b819: Cleanup: Remove using-directive from freestyle headers.

Large Diff

This large diff affects 216 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

source/

blender/

freestyle/

intern/

python/

BPy_BBox.h

5 lines

BPy_BBox.cpp

3 lines

BPy_BinaryPredicate0D.h

4 lines

BPy_BinaryPredicate0D.cpp

2 lines

BPy_BinaryPredicate1D.h

4 lines

BPy_BinaryPredicate1D.cpp

2 lines

128 lines

3 lines

4 lines

2 lines

6 lines

2 lines

6 lines

2 lines

BPy_IntegrationType.h

2 lines

BPy_IntegrationType.cpp

2 lines

4 lines

2 lines

4 lines

2 lines

4 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

4 lines

2 lines

BPy_StrokeAttribute.h

4 lines

BPy_StrokeAttribute.cpp

2 lines

BPy_StrokeShader.h

6 lines

BPy_StrokeShader.cpp

2 lines

BPy_UnaryFunction0D.h

2 lines

BPy_UnaryFunction0D.cpp

2 lines

BPy_UnaryFunction1D.h

2 lines

BPy_UnaryFunction1D.cpp

2 lines

BPy_UnaryPredicate0D.h

4 lines

BPy_UnaryPredicate0D.cpp

2 lines

BPy_UnaryPredicate1D.h

4 lines

BPy_UnaryPredicate1D.cpp

2 lines

4 lines

2 lines

4 lines

2 lines

BinaryPredicate1D/

BPy_FalseBP1D.cpp

2 lines

BPy_Length2DBP1D.cpp

2 lines

BPy_SameShapeIdBP1D.cpp

2 lines

BPy_TrueBP1D.cpp

2 lines

BPy_ViewMapGradientNormBP1D.cpp

2 lines

Director.h

33 lines

Director.cpp

2 lines

Interface0D/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

CurvePoint/

BPy_StrokeVertex.h

2 lines

BPy_StrokeVertex.cpp

2 lines

ViewVertex/

2 lines

2 lines

2 lines

2 lines

Interface1D/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

Curve/

BPy_Chain.h

2 lines

BPy_Chain.cpp

2 lines

FEdge/

2 lines

2 lines

2 lines

2 lines

Iterator/

BPy_AdjacencyIterator.h

2 lines

BPy_AdjacencyIterator.cpp

2 lines

BPy_ChainPredicateIterator.h

2 lines

BPy_ChainPredicateIterator.cpp

2 lines

BPy_ChainSilhouetteIterator.h

2 lines

BPy_ChainSilhouetteIterator.cpp

2 lines

BPy_ChainingIterator.h

2 lines

BPy_ChainingIterator.cpp

2 lines

BPy_CurvePointIterator.h

2 lines

BPy_CurvePointIterator.cpp

2 lines

BPy_Interface0DIterator.h

2 lines

BPy_Interface0DIterator.cpp

2 lines

BPy_SVertexIterator.h

2 lines

BPy_SVertexIterator.cpp

2 lines

BPy_StrokeVertexIterator.h

2 lines

BPy_StrokeVertexIterator.cpp

2 lines

BPy_ViewEdgeIterator.h

2 lines

BPy_ViewEdgeIterator.cpp

2 lines

BPy_orientedViewEdgeIterator.h

2 lines

BPy_orientedViewEdgeIterator.cpp

2 lines

StrokeShader/

BPy_BackboneStretcherShader.cpp

2 lines

BPy_BezierCurveShader.cpp

2 lines

BPy_BlenderTextureShader.cpp

2 lines

BPy_CalligraphicShader.cpp

2 lines

BPy_ColorNoiseShader.cpp

2 lines

BPy_ConstantColorShader.cpp

2 lines

BPy_ConstantThicknessShader.cpp

2 lines

BPy_ConstrainedIncreasingThicknessShader.cpp

2 lines

BPy_GuidingLinesShader.cpp

2 lines

BPy_IncreasingColorShader.cpp

2 lines

BPy_IncreasingThicknessShader.cpp

2 lines

BPy_PolygonalizationShader.cpp

2 lines

BPy_SamplingShader.cpp

2 lines

BPy_SmoothingShader.cpp

2 lines

BPy_SpatialNoiseShader.cpp

2 lines

BPy_StrokeTextureStepShader.cpp

2 lines

BPy_ThicknessNoiseShader.cpp

2 lines

BPy_TipRemoverShader.cpp

2 lines

UnaryFunction0D/

BPy_UnaryFunction0DDouble.h

2 lines

BPy_UnaryFunction0DDouble.cpp

2 lines

BPy_UnaryFunction0DEdgeNature.h

2 lines

BPy_UnaryFunction0DEdgeNature.cpp

2 lines

BPy_UnaryFunction0DFloat.h

2 lines

BPy_UnaryFunction0DFloat.cpp

2 lines

BPy_UnaryFunction0DId.h

2 lines

BPy_UnaryFunction0DId.cpp

2 lines

BPy_UnaryFunction0DMaterial.h

2 lines

BPy_UnaryFunction0DMaterial.cpp

2 lines

BPy_UnaryFunction0DUnsigned.h

2 lines

BPy_UnaryFunction0DUnsigned.cpp

2 lines

BPy_UnaryFunction0DVec2f.h

3 lines

BPy_UnaryFunction0DVec2f.cpp

2 lines

BPy_UnaryFunction0DVec3f.h

3 lines

BPy_UnaryFunction0DVec3f.cpp

2 lines

BPy_UnaryFunction0DVectorViewShape.h

2 lines

BPy_UnaryFunction0DVectorViewShape.cpp

2 lines

BPy_UnaryFunction0DViewShape.h

2 lines

BPy_UnaryFunction0DViewShape.cpp

2 lines

UnaryFunction0D_Id/

BPy_ShapeIdF0D.cpp

2 lines

UnaryFunction0D_Material/

BPy_MaterialF0D.cpp

2 lines

UnaryFunction0D_Nature_EdgeNature/

BPy_CurveNatureF0D.cpp

2 lines

UnaryFunction0D_Vec2f/

BPy_Normal2DF0D.cpp

2 lines

BPy_VertexOrientation2DF0D.cpp

2 lines

UnaryFunction0D_Vec3f/

BPy_VertexOrientation3DF0D.cpp

2 lines

UnaryFunction0D_ViewShape/

BPy_GetOccludeeF0D.cpp

2 lines

BPy_GetShapeF0D.cpp

2 lines

UnaryFunction0D_double/

BPy_Curvature2DAngleF0D.cpp

2 lines

BPy_DensityF0D.cpp

2 lines

BPy_GetProjectedXF0D.cpp

2 lines

BPy_GetProjectedYF0D.cpp

2 lines

BPy_GetProjectedZF0D.cpp

2 lines

BPy_GetXF0D.cpp

2 lines

BPy_GetYF0D.cpp

2 lines

BPy_GetZF0D.cpp

2 lines

BPy_LocalAverageDepthF0D.cpp

2 lines

BPy_ZDiscontinuityF0D.cpp

2 lines

UnaryFunction0D_float/

BPy_GetCurvilinearAbscissaF0D.cpp

2 lines

BPy_GetParameterF0D.cpp

2 lines

BPy_GetViewMapGradientNormF0D.cpp

2 lines

BPy_ReadCompleteViewMapPixelF0D.cpp

2 lines

BPy_ReadMapPixelF0D.cpp

2 lines

BPy_ReadSteerableViewMapPixelF0D.cpp

2 lines

UnaryFunction0D_unsigned_int/

BPy_QuantitativeInvisibilityF0D.cpp

2 lines

UnaryFunction0D_vector_ViewShape/

BPy_GetOccludersF0D.cpp

2 lines

UnaryFunction1D/

BPy_UnaryFunction1DDouble.h

2 lines

BPy_UnaryFunction1DDouble.cpp

2 lines

BPy_UnaryFunction1DEdgeNature.h

2 lines

BPy_UnaryFunction1DEdgeNature.cpp

2 lines

BPy_UnaryFunction1DFloat.h

2 lines

BPy_UnaryFunction1DFloat.cpp

2 lines

BPy_UnaryFunction1DUnsigned.h

2 lines

BPy_UnaryFunction1DUnsigned.cpp

2 lines

BPy_UnaryFunction1DVec2f.h

3 lines

BPy_UnaryFunction1DVec2f.cpp

2 lines

BPy_UnaryFunction1DVec3f.h

3 lines

BPy_UnaryFunction1DVec3f.cpp

2 lines

BPy_UnaryFunction1DVectorViewShape.h

2 lines

BPy_UnaryFunction1DVectorViewShape.cpp

2 lines

BPy_UnaryFunction1DVoid.h

2 lines

BPy_UnaryFunction1DVoid.cpp

2 lines

UnaryFunction1D_Nature_EdgeNature/

BPy_CurveNatureF1D.cpp

2 lines

UnaryFunction1D_Vec2f/

BPy_Normal2DF1D.cpp

2 lines

BPy_Orientation2DF1D.cpp

2 lines

UnaryFunction1D_Vec3f/

BPy_Orientation3DF1D.cpp

2 lines

UnaryFunction1D_double/

BPy_Curvature2DAngleF1D.cpp

2 lines

BPy_DensityF1D.cpp

2 lines

BPy_GetCompleteViewMapDensityF1D.cpp

2 lines

BPy_GetDirectionalViewMapDensityF1D.cpp

2 lines

BPy_GetProjectedXF1D.cpp

2 lines

BPy_GetProjectedYF1D.cpp

2 lines

BPy_GetProjectedZF1D.cpp

2 lines

BPy_GetSteerableViewMapDensityF1D.cpp

2 lines

BPy_GetViewMapGradientNormF1D.cpp

2 lines

BPy_GetXF1D.cpp

2 lines

BPy_GetYF1D.cpp

2 lines

BPy_GetZF1D.cpp

2 lines

BPy_LocalAverageDepthF1D.cpp

2 lines

BPy_ZDiscontinuityF1D.cpp

2 lines

UnaryFunction1D_unsigned_int/

BPy_QuantitativeInvisibilityF1D.cpp

2 lines

UnaryFunction1D_vector_ViewShape/

BPy_GetOccludeeF1D.cpp

2 lines

BPy_GetOccludersF1D.cpp

2 lines

BPy_GetShapeF1D.cpp

2 lines

UnaryFunction1D_void/

BPy_ChainingTimeStampF1D.cpp

2 lines

BPy_IncrementChainingTimeStampF1D.cpp

2 lines

BPy_TimeStampF1D.cpp

2 lines

UnaryPredicate0D/

BPy_FalseUP0D.cpp

2 lines

BPy_TrueUP0D.cpp

2 lines

UnaryPredicate1D/

BPy_ContourUP1D.cpp

2 lines

BPy_DensityLowerThanUP1D.cpp

2 lines

BPy_EqualToChainingTimeStampUP1D.cpp

2 lines

BPy_EqualToTimeStampUP1D.cpp

2 lines

BPy_ExternalContourUP1D.cpp

2 lines

BPy_FalseUP1D.cpp

2 lines

BPy_QuantitativeInvisibilityUP1D.cpp

2 lines

BPy_ShapeUP1D.cpp

2 lines

BPy_TrueUP1D.cpp

2 lines

BPy_WithinImageBoundaryUP1D.cpp

2 lines

Cleanup: Remove using-directive from freestyle headersClosedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 33717

source/blender/freestyle/intern/python/BPy_BBox.h

source/blender/freestyle/intern/python/BPy_BBox.cpp

source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h

source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp

source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h

source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp

source/blender/freestyle/intern/python/BPy_Convert.h

source/blender/freestyle/intern/python/BPy_Convert.cpp

source/blender/freestyle/intern/python/BPy_FrsMaterial.h

source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp

source/blender/freestyle/intern/python/BPy_FrsNoise.h

source/blender/freestyle/intern/python/BPy_FrsNoise.cpp

source/blender/freestyle/intern/python/BPy_Id.h

source/blender/freestyle/intern/python/BPy_Id.cpp

source/blender/freestyle/intern/python/BPy_IntegrationType.h

source/blender/freestyle/intern/python/BPy_IntegrationType.cpp

source/blender/freestyle/intern/python/BPy_Interface0D.h

source/blender/freestyle/intern/python/BPy_Interface0D.cpp

source/blender/freestyle/intern/python/BPy_Interface1D.h

source/blender/freestyle/intern/python/BPy_Interface1D.cpp

source/blender/freestyle/intern/python/BPy_Iterator.h

source/blender/freestyle/intern/python/BPy_Iterator.cpp

source/blender/freestyle/intern/python/BPy_MediumType.h

source/blender/freestyle/intern/python/BPy_MediumType.cpp

source/blender/freestyle/intern/python/BPy_Nature.h

source/blender/freestyle/intern/python/BPy_Nature.cpp

source/blender/freestyle/intern/python/BPy_Operators.h

source/blender/freestyle/intern/python/BPy_Operators.cpp

source/blender/freestyle/intern/python/BPy_SShape.h

source/blender/freestyle/intern/python/BPy_SShape.cpp

source/blender/freestyle/intern/python/BPy_StrokeAttribute.h

source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp

source/blender/freestyle/intern/python/BPy_StrokeShader.h

source/blender/freestyle/intern/python/BPy_StrokeShader.cpp

source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h

source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp

source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h

source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp

source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h

source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp

source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h

source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp

source/blender/freestyle/intern/python/BPy_ViewMap.h

source/blender/freestyle/intern/python/BPy_ViewMap.cpp

source/blender/freestyle/intern/python/BPy_ViewShape.h

source/blender/freestyle/intern/python/BPy_ViewShape.cpp

source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp

source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp

source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp

source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp

source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp

source/blender/freestyle/intern/python/Director.h

source/blender/freestyle/intern/python/Director.cpp

source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h

source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp

source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h

source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp

source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h

source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp

source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h

source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp

source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h

source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp

source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h

source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp

source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h

source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp

source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h

source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp

source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h

source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp

source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h

source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp

Cleanup: Remove using-directive from freestyle headers
ClosedPublic
Actions

Revision Contents
Changeset List