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

Gui: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 18:41:21 +01:00
parent be7e18757c
commit 1178df06b4
239 changed files with 1197 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/Gui/LinkViewPyImp.cpp
View File

@@ -53,12 +53,12 @@ std::string LinkViewPy::representation(void) const
PyObject* LinkViewPy::reset(PyObject *args) {
if (!PyArg_ParseTuple(args, ""))
return 0;
return nullptr;
PY_TRY {
auto lv = getLinkViewPtr();
lv->setSize(0);
lv->setLink(0);
lv->setLink(nullptr);
Py_Return;
} PY_CATCH;
}
@@ -66,12 +66,12 @@ PyObject* LinkViewPy::reset(PyObject *args) {
PyObject* LinkViewPy::setMaterial(PyObject *args) {
PyObject *pyObj;
if (!PyArg_ParseTuple(args, "O", &pyObj))
return 0;
return nullptr;
PY_TRY {
auto lv = getLinkViewPtr();
if(pyObj == Py_None) {
lv->setMaterial(-1,0);
lv->setMaterial(-1,nullptr);
Py_Return;
}
if(PyObject_TypeCheck(pyObj,&App::MaterialPy::Type)) {
@@ -85,10 +85,10 @@ PyObject* LinkViewPy::setMaterial(PyObject *args) {
while(PyDict_Next(pyObj, &pos, &key, &value)) {
Py::Int idx(key);
if(value == Py_None)
materials[(int)idx] = 0;
materials[(int)idx] = nullptr;
else if(!PyObject_TypeCheck(value,&App::MaterialPy::Type)) {
PyErr_SetString(PyExc_TypeError, "exepcting a type of material");
return 0;
return nullptr;
}else
materials[(int)idx] = static_cast<App::MaterialPy*>(value)->getMaterialPtr();
}
@@ -99,13 +99,13 @@ PyObject* LinkViewPy::setMaterial(PyObject *args) {
if(PySequence_Check(pyObj)) {
Py::Sequence seq(pyObj);
std::vector<App::Material*> materials;
materials.resize(seq.size(),0);
materials.resize(seq.size(),nullptr);
for(Py_ssize_t i=0;i<seq.size();++i) {
PyObject* item = seq[i].ptr();
if(item == Py_None) continue;
if(!PyObject_TypeCheck(item,&App::MaterialPy::Type)) {
PyErr_SetString(PyExc_TypeError, "exepcting a type of material");
return 0;
return nullptr;
}
materials[i] = static_cast<App::MaterialPy*>(item)->getMaterialPtr();
}
@@ -115,14 +115,14 @@ PyObject* LinkViewPy::setMaterial(PyObject *args) {
}
PyErr_SetString(PyExc_TypeError, "exepcting a type of Material, [Material,...] or {Int:Material,}");
return 0;
return nullptr;
} PY_CATCH;
}
PyObject* LinkViewPy::setTransform(PyObject *args) {
PyObject *pyObj;
if (!PyArg_ParseTuple(args, "O", &pyObj))
return 0;
return nullptr;
PY_TRY {
auto lv = getLinkViewPtr();
@@ -138,7 +138,7 @@ PyObject* LinkViewPy::setTransform(PyObject *args) {
Py::Int idx(key);
if(!PyObject_TypeCheck(value,&Base::MatrixPy::Type)) {
PyErr_SetString(PyExc_TypeError, "exepcting a type of Matrix");
return 0;
return nullptr;
}else
mat[(int)idx] = static_cast<Base::MatrixPy*>(value)->getMatrixPtr();
}
@@ -149,12 +149,12 @@ PyObject* LinkViewPy::setTransform(PyObject *args) {
if(PySequence_Check(pyObj)) {
Py::Sequence seq(pyObj);
std::vector<Base::Matrix4D*> mat;
mat.resize(seq.size(),0);
mat.resize(seq.size(),nullptr);
for(Py_ssize_t i=0;i<seq.size();++i) {
PyObject* item = seq[i].ptr();
if(!PyObject_TypeCheck(item,&Base::MatrixPy::Type)) {
PyErr_SetString(PyExc_TypeError, "exepcting a type of Matrix");
return 0;
return nullptr;
}
mat[i] = static_cast<Base::MatrixPy*>(item)->getMatrixPtr();
}
@@ -164,7 +164,7 @@ PyObject* LinkViewPy::setTransform(PyObject *args) {
}
PyErr_SetString(PyExc_TypeError, "exepcting a type of Matrix, [Matrix,...] or {Int:Matrix,...}");
return 0;
return nullptr;
} PY_CATCH;
}
@@ -172,7 +172,7 @@ PyObject* LinkViewPy::setType(PyObject *args) {
short type;
PyObject *sublink = Py_True;
if (!PyArg_ParseTuple(args, "h|O", &type,&sublink))
return 0;
return nullptr;
PY_TRY{
getLinkViewPtr()->setNodeType((LinkView::SnapshotType)type,PyObject_IsTrue(sublink));
@@ -185,7 +185,7 @@ PyObject* LinkViewPy::setChildren(PyObject *args) {
PyObject *pyVis = Py_None;
short type=0;
if (!PyArg_ParseTuple(args, "O|Os",&pyObj,&pyVis,&type))
return 0;
return nullptr;
PY_TRY{
App::PropertyBoolList vis;
@@ -204,11 +204,11 @@ PyObject* LinkViewPy::setLink(PyObject *args)
PyObject *pyObj;
PyObject *pySubName = Py_None;
if (!PyArg_ParseTuple(args, "O|O",&pyObj,&pySubName))
return 0;
return nullptr;
PY_TRY {
ViewProviderDocumentObject *vpd = 0;
App::DocumentObject *obj = 0;
ViewProviderDocumentObject *vpd = nullptr;
App::DocumentObject *obj = nullptr;
if(pyObj!=Py_None) {
if(PyObject_TypeCheck(pyObj,&App::DocumentObjectPy::Type))
obj = static_cast<App::DocumentObjectPy*>(pyObj)->getDocumentObjectPtr();
@@ -217,7 +217,7 @@ PyObject* LinkViewPy::setLink(PyObject *args)
else {
PyErr_SetString(PyExc_TypeError,
"exepcting a type of DocumentObject or ViewProviderDocumentObject");
return 0;
return nullptr;
}
}
@@ -241,7 +241,7 @@ Py::Object LinkViewPy::getOwner() const {
}
void LinkViewPy::setOwner(Py::Object owner) {
ViewProviderDocumentObject *vp = 0;
ViewProviderDocumentObject *vp = nullptr;
if(!owner.isNone()) {
if(!PyObject_TypeCheck(owner.ptr(),&ViewProviderDocumentObjectPy::Type))
throw Py::TypeError("exepcting the owner to be of ViewProviderDocumentObject");
@@ -273,8 +273,8 @@ PyObject* LinkViewPy::getElementPicked(PyObject* args)
{
PyObject *obj;
if (!PyArg_ParseTuple(args, "O",&obj))
return NULL;
void *ptr = 0;
return nullptr;
void *ptr = nullptr;
Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoPickedPoint *", obj, &ptr, 0);
SoPickedPoint *pp = reinterpret_cast<SoPickedPoint*>(ptr);
if(!pp)
@@ -292,14 +292,14 @@ PyObject* LinkViewPy::getDetailPath(PyObject* args)
const char *sub;
PyObject *path;
if (!PyArg_ParseTuple(args, "sO",&sub,&path))
return NULL;
void *ptr = 0;
return nullptr;
void *ptr = nullptr;
Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoPath *", path, &ptr, 0);
SoPath *pPath = reinterpret_cast<SoPath*>(ptr);
if(!pPath)
throw Py::TypeError("type must be of coin.SoPath");
PY_TRY{
SoDetail *det = 0;
SoDetail *det = nullptr;
getLinkViewPtr()->linkGetDetailPath(sub,static_cast<SoFullPath*>(pPath),det);
if(!det)
Py_Return;
@@ -310,12 +310,12 @@ PyObject* LinkViewPy::getDetailPath(PyObject* args)
PyObject* LinkViewPy::getBoundBox(PyObject* args) {
PyObject *vobj = Py_None;
if (!PyArg_ParseTuple(args, "O",&vobj))
return 0;
ViewProviderDocumentObject *vpd = 0;
return nullptr;
ViewProviderDocumentObject *vpd = nullptr;
if(vobj!=Py_None) {
if(!PyObject_TypeCheck(vobj,&ViewProviderDocumentObjectPy::Type)) {
PyErr_SetString(PyExc_TypeError, "exepcting a type of ViewProviderDocumentObject");
return 0;
return nullptr;
}
vpd = static_cast<ViewProviderDocumentObjectPy*>(vobj)->getViewProviderDocumentObjectPtr();
}
@@ -328,7 +328,7 @@ PyObject* LinkViewPy::getBoundBox(PyObject* args) {
PyObject *LinkViewPy::getCustomAttributes(const char*) const
{
return 0;
return nullptr;
}
int LinkViewPy::setCustomAttributes(const char*, PyObject*)
@@ -372,7 +372,7 @@ void LinkViewPy::setVisibilities(Py::Object value) {
PyObject* LinkViewPy::getChildren(PyObject *args) {
if (!PyArg_ParseTuple(args, ""))
return 0;
return nullptr;
auto children = getLinkViewPtr()->getChildren();
if(children.empty())
Py_Return;