kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 19:06:48 +01:00
parent f265c15ac0
commit 068c0e5a98
155 changed files with 1504 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Mod/Part/App/AppPartPy.cpp
View File

@@ -874,7 +874,7 @@ private:
Py::Object makeFace(const Py::Tuple& args)
{
try {
char* className = 0;
char* className = nullptr;
PyObject* pcPyShapeOrList = nullptr;
PyErr_Clear();
if (PyArg_ParseTuple(args.ptr(), "Os", &pcPyShapeOrList, &className)) {
@@ -923,7 +923,7 @@ private:
{
// TODO: BRepFeat_SplitShape
PyObject *obj;
PyObject *surf=0;
PyObject *surf=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "O|O!", &obj, &TopoShapeFacePy::Type, &surf))
throw Py::Exception();
@@ -1031,7 +1031,7 @@ private:
Py::Object makePlane(const Py::Tuple& args)
{
double length, width;
PyObject *pPnt=0, *pDirZ=0, *pDirX=0;
PyObject *pPnt=nullptr, *pDirZ=nullptr, *pDirX=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "dd|O!O!O!", &length, &width,
&(Base::VectorPy::Type), &pPnt,
&(Base::VectorPy::Type), &pDirZ,
@@ -1084,7 +1084,7 @@ private:
Py::Object makeBox(const Py::Tuple& args)
{
double length, width, height;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "ddd|O!O!",
&length, &width, &height,
&(Base::VectorPy::Type), &pPnt,
@@ -1123,7 +1123,7 @@ private:
Py::Object makeWedge(const Py::Tuple& args)
{
double xmin, ymin, zmin, z2min, x2min, xmax, ymax, zmax, z2max, x2max;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "dddddddddd|O!O!",
&xmin, &ymin, &zmin, &z2min, &x2min, &xmax, &ymax, &zmax, &z2max, &x2max,
&(Base::VectorPy::Type), &pPnt, &(Base::VectorPy::Type), &pDir))
@@ -1200,7 +1200,7 @@ private:
BRepBuilderAPI_MakeEdge makeEdge(gp_Pnt(pnt1.x, pnt1.y, pnt1.z),
gp_Pnt(pnt2.x, pnt2.y, pnt2.z));
const char *error=0;
const char *error=nullptr;
switch (makeEdge.Error())
{
case BRepBuilderAPI_EdgeDone:
@@ -1272,7 +1272,7 @@ private:
Py::Object makeCircle(const Py::Tuple& args)
{
double radius, angle1=0.0, angle2=360;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "d|O!O!dd",
&radius,
&(Base::VectorPy::Type), &pPnt,
@@ -1308,7 +1308,7 @@ private:
Py::Object makeSphere(const Py::Tuple& args)
{
double radius, angle1=-90, angle2=90, angle3=360;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "d|O!O!ddd",
&radius,
&(Base::VectorPy::Type), &pPnt,
@@ -1338,7 +1338,7 @@ private:
Py::Object makeCylinder(const Py::Tuple& args)
{
double radius, height, angle=360;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "dd|O!O!d",
&radius, &height,
&(Base::VectorPy::Type), &pPnt,
@@ -1368,7 +1368,7 @@ private:
Py::Object makeCone(const Py::Tuple& args)
{
double radius1, radius2, height, angle=360;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "ddd|O!O!d",
&radius1, &radius2, &height,
&(Base::VectorPy::Type), &pPnt,
@@ -1398,7 +1398,7 @@ private:
Py::Object makeTorus(const Py::Tuple& args)
{
double radius1, radius2, angle1=0.0, angle2=360, angle=360;
PyObject *pPnt=0, *pDir=0;
PyObject *pPnt=nullptr, *pDir=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "dd|O!O!ddd",
&radius1, &radius2,
&(Base::VectorPy::Type), &pPnt,
@@ -1486,7 +1486,7 @@ private:
{
double vmin = DBL_MAX, vmax=-DBL_MAX;
double angle=360;
PyObject *pPnt=0, *pDir=0, *pCrv;
PyObject *pPnt=nullptr, *pDir=nullptr, *pCrv;
Handle(Geom_Curve) curve;
union PyType_Object defaultType = {&Part::TopoShapeSolidPy::Type};
PyObject* type = defaultType.o;
@@ -1868,7 +1868,7 @@ private:
double height;
double track = 0;
Py_UNICODE *unichars = NULL;
Py_UNICODE *unichars = nullptr;
Py_ssize_t pysize;
PyObject *CharList;
@@ -1965,7 +1965,7 @@ private:
}
Py::Object exportUnits(const Py::Tuple& args)
{
char* unit=0;
char* unit=nullptr;
if (!PyArg_ParseTuple(args.ptr(), "|s", &unit))
throw Py::Exception();
@@ -2144,7 +2144,7 @@ private:
try {
TopoDS_Shape* shape = new TopoDS_Shape();
(*shape) = static_cast<TopoShapePy*>(pcObj)->getTopoShapePtr()->getShape();
PyObject* proxy = 0;
PyObject* proxy = nullptr;
proxy = Base::Interpreter().createSWIGPointerObj("OCC.TopoDS", "TopoDS_Shape *", (void*)shape, 1);
return Py::asObject(proxy);
}
@@ -2173,15 +2173,15 @@ private:
Py::Object getShape(const Py::Tuple& args, const Py::Dict &kwds) {
PyObject *pObj;
const char *subname = 0;
PyObject *pyMat = 0;
const char *subname = nullptr;
PyObject *pyMat = nullptr;
PyObject *needSubElement = Py_False;
PyObject *transform = Py_True;
PyObject *noElementMap = Py_False;
PyObject *refine = Py_False;
short retType = 0;
static char* kwd_list[] = {"obj", "subname", "mat",
"needSubElement","transform","retType","noElementMap","refine",0};
"needSubElement","transform","retType","noElementMap","refine",nullptr};
if(!PyArg_ParseTupleAndKeywords(args.ptr(), kwds.ptr(), "O!|sO!OOhOO", kwd_list,
&App::DocumentObjectPy::Type, &pObj, &subname, &Base::MatrixPy::Type, &pyMat,
&needSubElement,&transform,&retType,&noElementMap,&refine))
@@ -2189,7 +2189,7 @@ private:
App::DocumentObject *obj =
static_cast<App::DocumentObjectPy*>(pObj)->getDocumentObjectPtr();
App::DocumentObject *subObj = 0;
App::DocumentObject *subObj = nullptr;
Base::Matrix4D mat;
if(pyMat)
mat = *static_cast<Base::MatrixPy*>(pyMat)->getMatrixPtr();