[Path] remove superfluous nullptr checks

This commit is contained in:
Uwe
2022-07-18 02:52:48 +02:00
parent 16c86a6d08
commit c35579227b
9 changed files with 11 additions and 11 deletions

View File

@@ -192,7 +192,7 @@ void Voronoi::colorExterior(const Voronoi::diagram_type::edge_type *edge, std::s
edge->color(colorValue);
edge->twin()->color(colorValue);
auto v = edge->vertex1();
if (v == nullptr || !edge->is_primary()) {
if (!v || !edge->is_primary()) {
return;
}
v->color(colorValue);

View File

@@ -55,7 +55,7 @@ VoronoiCell::~VoronoiCell() {
}
bool VoronoiCell::isBound(void) const {
if (ptr != nullptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (&(dia->cells()[index]) == ptr) {
return true;
}

View File

@@ -56,7 +56,7 @@ VoronoiEdge::~VoronoiEdge() {
}
bool VoronoiEdge::isBound(void) const {
if (ptr != nullptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (&(dia->edges()[index]) == ptr) {
return true;
}

View File

@@ -188,7 +188,7 @@ static bool callbackWithVertex(Voronoi::diagram_type *dia, PyObject *callback, c
#endif
Py_DECREF(arglist);
Py_DECREF(vx);
if (result == nullptr) {
if (!result) {
bail = true;
} else {
rc = result == Py_True;

View File

@@ -56,7 +56,7 @@ VoronoiVertex::~VoronoiVertex() {
}
bool VoronoiVertex::isBound(void) const {
if (ptr != nullptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) {
if (&(dia->vertices()[index]) == ptr) {
return true;
}

View File

@@ -588,7 +588,7 @@ private:
colorindex.push_back(color);
}
if (next != nullptr) {
if (next) {
points.push_back(*next);
markers.push_back(*next);
colorindex.push_back(color);

View File

@@ -46,9 +46,9 @@ PathSim::PathSim()
PathSim::~PathSim()
{
if (m_stock != nullptr)
if (m_stock)
delete m_stock;
if (m_tool != nullptr)
if (m_tool)
delete m_tool;
}
@@ -68,7 +68,7 @@ Base::Placement * PathSim::ApplyCommand(Base::Placement * pos, Command * cmd)
Point3D fromPos(*pos);
Point3D toPos(*pos);
toPos.UpdateCmd(*cmd);
if (m_tool != nullptr)
if (m_tool)
{
if (cmd->Name == "G0" || cmd->Name == "G1")
{

View File

@@ -87,7 +87,7 @@ PyObject* PathSimPy::GetResultMesh(PyObject * args)
if (!PyArg_ParseTuple(args, ""))
return nullptr;
cStock *stock = getPathSimPtr()->m_stock;
if (stock == nullptr)
if (!stock)
{
PyErr_SetString(PyExc_RuntimeError, "Simulation has stock object");
return nullptr;

View File

@@ -119,7 +119,7 @@ public:
~Array2D()
{
if (data != nullptr)
if (data)
delete[] data;
}