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

Core/Mod: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-09 21:55:31 +01:00
parent f4a51f3788
commit 08b77bff08
16 changed files with 248 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/App/GroupExtensionPyImp.cpp
View File

@@ -42,8 +42,8 @@ std::string GroupExtensionPy::representation(void) const
PyObject* GroupExtensionPy::newObject(PyObject *args)
{
char *sType,*sName=0;
if (!PyArg_ParseTuple(args, "s|s", &sType,&sName)) // convert args: Python->C
return NULL;
if (!PyArg_ParseTuple(args, "s|s", &sType,&sName))
return nullptr;
DocumentObject *object = getGroupExtensionPtr()->addObject(sType, sName);
if ( object ) {
@@ -51,35 +51,35 @@ PyObject* GroupExtensionPy::newObject(PyObject *args)
}
else {
PyErr_Format(Base::BaseExceptionFreeCADError, "Cannot create object of type '%s'", sType);
return NULL;
return nullptr;
}
}
PyObject* GroupExtensionPy::addObject(PyObject *args)
{
PyObject *object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object))
return nullptr;
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add an invalid object");
return NULL;
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add an object from another document to this group");
return NULL;
return nullptr;
}
if (docObj->getDocumentObjectPtr() == this->getGroupExtensionPtr()->getExtendedObject()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add a group object to itself");
return NULL;
return nullptr;
}
if (docObj->getDocumentObjectPtr()->hasExtension(GroupExtension::getExtensionClassTypeId())) {
App::GroupExtension* docGrp = docObj->getDocumentObjectPtr()->getExtensionByType<GroupExtension>();
if (docGrp->hasObject(getGroupExtensionPtr()->getExtendedObject())) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add a group object to a child group");
return NULL;
return nullptr;
}
}
@@ -96,8 +96,8 @@ PyObject* GroupExtensionPy::addObject(PyObject *args)
PyObject* GroupExtensionPy::addObjects(PyObject *args) {
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "O", &object))
return nullptr;
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
@@ -133,8 +133,8 @@ PyObject* GroupExtensionPy::addObjects(PyObject *args) {
PyObject* GroupExtensionPy::setObjects(PyObject *args) {
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "O", &object))
return nullptr;
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
@@ -170,17 +170,17 @@ PyObject* GroupExtensionPy::setObjects(PyObject *args) {
PyObject* GroupExtensionPy::removeObject(PyObject *args)
{
PyObject *object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object))
return nullptr;
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot remove an invalid object");
return NULL;
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot remove an object from another document from this group");
return NULL;
return nullptr;
}
GroupExtension* grp = getGroupExtensionPtr();
@@ -196,8 +196,8 @@ PyObject* GroupExtensionPy::removeObject(PyObject *args)
PyObject* GroupExtensionPy::removeObjects(PyObject *args) {
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "O", &object))
return nullptr;
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
@@ -232,8 +232,8 @@ PyObject* GroupExtensionPy::removeObjects(PyObject *args) {
PyObject* GroupExtensionPy::removeObjectsFromDocument(PyObject *args)
{
if (!PyArg_ParseTuple(args, "")) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, ""))
return nullptr;
getGroupExtensionPtr()->removeObjectsFromDocument();
Py_Return;
@@ -242,8 +242,8 @@ PyObject* GroupExtensionPy::removeObjectsFromDocument(PyObject *args)
PyObject* GroupExtensionPy::getObject(PyObject *args)
{
char* pcName;
if (!PyArg_ParseTuple(args, "s", &pcName)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "s", &pcName))
return nullptr;
DocumentObject* obj = getGroupExtensionPtr()->getObject(pcName);
if ( obj ) {
@@ -259,23 +259,23 @@ PyObject* GroupExtensionPy::hasObject(PyObject *args)
PyObject *recursivePy = 0;
int recursive = 0;
if (!PyArg_ParseTuple(args, "O!|O", &(DocumentObjectPy::Type), &object, &recursivePy))
return NULL; // NULL triggers exception
return nullptr;
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot check an invalid object");
return NULL;
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot check an object from another document with this group");
return NULL;
return nullptr;
}
if (recursivePy) {
recursive = PyObject_IsTrue(recursivePy);
if ( recursive == -1) {
// Note: shouldn't happen
PyErr_SetString(PyExc_ValueError, "The recursive parameter should be of boolean type");
return 0;
return nullptr;
}
}