From c9b709d814efba409220e401e80bb93524317825 Mon Sep 17 00:00:00 2001 From: Uwe Date: Tue, 26 Jul 2022 00:28:57 +0200 Subject: [PATCH] [TD] remove unnecessary nullptr checks --- src/Mod/TechDraw/App/DrawViewDetail.cpp | 2 +- src/Mod/TechDraw/App/DrawViewDimExtent.cpp | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp index b6be110069..5fcd93a8c8 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.cpp +++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp @@ -267,7 +267,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) double newScale = autoScale(); Scale.setValue(newScale); Scale.purgeTouched(); - if (geometryObject != nullptr) { + if (geometryObject) { delete geometryObject; geometryObject = nullptr; detailExec(shape, dvp, dvs); diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp index 3d8d19a620..a0942cbd8f 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp @@ -133,10 +133,8 @@ App::DocumentObjectExecReturn *DrawViewDimExtent::execute(void) TechDraw::VertexPtr v0 = dvp->getProjVertexByCosTag(cTags[0]); TechDraw::VertexPtr v1 = dvp->getProjVertexByCosTag(cTags[1]); - if (v0 == nullptr || - v1 != nullptr) { + if (!v0 || v1) return DrawViewDimension::execute(); - } double length00 = (v0->pnt - refMin).Length(); double length11 = (v1->pnt - refMax).Length(); @@ -192,9 +190,8 @@ pointPair DrawViewDimExtent::getPointsTwoVerts() TechDraw::VertexPtr v0 = dvp->getProjVertexByCosTag(cTags[0]); TechDraw::VertexPtr v1 = dvp->getProjVertexByCosTag(cTags[1]); - if (v0 == nullptr || v1 == nullptr ) { + if (!v0 || !v1) return errorValue; - } return pointPair(v0->pnt, v1->pnt); } @@ -215,9 +212,8 @@ bool DrawViewDimExtent::checkReferences2D() const CosmeticVertex* cv0 = dvp->getCosmeticVertex(cTags[0]); CosmeticVertex* cv1 = dvp->getCosmeticVertex(cTags[1]); - if (cv0 == nullptr || cv1 == nullptr) { + if (!cv0 || !cv1) return false; - } return true; }