archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Remove using-directive from freestyle headers

Browse Source 
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.

Reviewed By: Brecht

Differential Revision: https://developer.blender.org/D10351
This commit is contained in:
Omar Emara
2021-02-08 17:28:15 +02:00
parent 048135e2c8
commit 21a2b975b8
216 changed files with 442 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
View File

@@ -30,6 +30,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdge methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject FEdge_Type;
/*---------------------------Python BPy_FEdge structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
FEdge *fe;
Freestyle::FEdge *fe;
} BPy_FEdge;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
View File

@@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------CurvePoint methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject FrsCurve_Type;
/*---------------------------Python BPy_FrsCurve structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
Curve *c;
Freestyle::Curve *c;
} BPy_FrsCurve;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
View File

@@ -31,6 +31,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------Stroke methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject Stroke_Type;
/*---------------------------Python BPy_Stroke structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
Stroke *s;
Freestyle::Stroke *s;
} BPy_Stroke;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
View File

@@ -32,6 +32,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------ViewEdge methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject ViewEdge_Type;
/*---------------------------Python BPy_ViewEdge structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
ViewEdge *ve;
Freestyle::ViewEdge *ve;
} BPy_ViewEdge;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
View File

@@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------Chain methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject Chain_Type;
/*---------------------------Python BPy_Chain structure definition----------*/
typedef struct {
BPy_FrsCurve py_c;
Chain *c;
Freestyle::Chain *c;
} BPy_Chain;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
View File

@@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdgeSharp methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
View File

@@ -37,7 +37,7 @@ extern PyTypeObject FEdgeSharp_Type;
/*---------------------------Python BPy_FEdgeSharp structure definition----------*/
typedef struct {
BPy_FEdge py_fe;
FEdgeSharp *fes;
Freestyle::FEdgeSharp *fes;
} BPy_FEdgeSharp;
/*---------------------------Python BPy_FEdgeSharp visible prototypes-----------*/

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
View File

@@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdgeSmooth methods ----------------------------*/

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
View File

@@ -38,7 +38,7 @@ extern PyTypeObject FEdgeSmooth_Type;
/*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
typedef struct {
BPy_FEdge py_fe;
FEdgeSmooth *fes;
Freestyle::FEdgeSmooth *fes;
} BPy_FEdgeSmooth;
/*---------------------------Python BPy_FEdgeSmooth visible prototypes-----------*/