From 16b25c5dab55f9fd010c8be4eb0fd15659aeadc8 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 17 Jul 2022 15:32:23 +0200 Subject: [PATCH] [PD] remove superfluous nullptr checks --- src/Mod/PartDesign/Gui/Command.cpp | 2 +- src/Mod/PartDesign/Gui/ReferenceSelection.cpp | 6 +++--- src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp | 4 ++-- src/Mod/PartDesign/Gui/TaskHelixParameters.cpp | 4 ++-- src/Mod/PartDesign/Gui/TaskHoleParameters.cpp | 2 +- .../PartDesign/Gui/TaskLinearPatternParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp | 2 +- .../PartDesign/Gui/TaskPolarPatternParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp | 4 ++-- src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp | 4 ++-- src/Mod/PartDesign/Gui/TaskTransformedParameters.h | 2 +- src/Mod/PartDesign/Gui/Utils.cpp | 12 ++++++------ src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp | 4 ++-- .../PartDesign/Gui/ViewProviderMultiTransform.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 8bf0b727c3..dc9d611b72 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -299,7 +299,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) PartDesignGui::setEdit(support.getValue()); } else { PartDesign::Body *pcActiveBody = PartDesignGui::getBody(/*messageIfNot = */true); - if (pcActiveBody == nullptr) + if (!pcActiveBody) return; std::string FeatName = getUniqueObjectName("ShapeBinder",pcActiveBody); diff --git a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp index 0d9672d7a8..0e17063653 100644 --- a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp +++ b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp @@ -340,7 +340,7 @@ bool getReferencedSelection(const App::DocumentObject* thisObj, const Gui::Selec QString getRefStr(const App::DocumentObject* obj, const std::vector& sub) { - if (obj == nullptr) + if (!obj) return QString::fromLatin1(""); if (PartDesign::Feature::isDatum(obj)) @@ -354,7 +354,7 @@ QString getRefStr(const App::DocumentObject* obj, const std::vector std::string buildLinkSubPythonStr(const App::DocumentObject* obj, const std::vector& subs) { - if ( obj == nullptr) + if (!obj) return "None"; std::string result("["); @@ -369,7 +369,7 @@ std::string buildLinkSubPythonStr(const App::DocumentObject* obj, const std::vec std::string buildLinkSingleSubPythonStr(const App::DocumentObject* obj, const std::vector& subs) { - if (obj == nullptr) + if (!obj) return "None"; if (PartDesign::Feature::isDatum(obj)) diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp index 2259c1577a..374812e043 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp @@ -107,13 +107,13 @@ void TaskBooleanParameters::onSelectionChanged(const Gui::SelectionChanges& msg) if (body.empty()) return; App::DocumentObject* pcBody = pcBoolean->getDocument()->getObject(body.c_str()); - if (pcBody == nullptr) + if (!pcBody) return; // if the selected object is not a body then get the body it is part of if (!pcBody->getTypeId().isDerivedFrom(PartDesign::Body::getClassTypeId())) { pcBody = PartDesign::Body::findBodyOf(pcBody); - if (pcBody == nullptr) + if (!pcBody) return; body = pcBody->getNameInDocument(); } diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index dd8defbca9..a8340781de 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -460,7 +460,7 @@ void TaskHelixParameters::onAxisChanged(int num) oldRefName = oldSubRefAxis.front(); App::PropertyLinkSub& lnk = *(axesInList[num]); - if (lnk.getValue() == nullptr) { + if (!lnk.getValue()) { // enter reference selection mode TaskSketchBasedParameters::onSelectReference( AllowSelection::EDGE | @@ -587,7 +587,7 @@ void TaskHelixParameters::getReferenceAxis(App::DocumentObject*& obj, std::vecto int num = ui->axis->currentIndex(); const App::PropertyLinkSub& lnk = *(axesInList.at(num)); - if (lnk.getValue() == nullptr) { + if (!lnk.getValue()) { throw Base::RuntimeError("Still in reference selection mode; reference wasn't selected yet"); } else { diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp index a5b48d5500..8c2c9873e5 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp @@ -689,7 +689,7 @@ void TaskHoleParameters::changeEvent(QEvent* e) void TaskHoleParameters::changedObject(const App::Document&, const App::Property& Prop) { // happens when aborting the command - if (vp == nullptr) + if (!vp) return; PartDesign::Hole* pcHole = static_cast(vp->getObject()); diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index 2a465d4752..44f26771d5 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -318,7 +318,7 @@ void TaskLinearPatternParameters::onDirectionChanged(int /*num*/) return; PartDesign::LinearPattern* pcLinearPattern = static_cast(getObject()); try{ - if(dirLinks.getCurrentLink().getValue() == nullptr){ + if (!dirLinks.getCurrentLink().getValue()) { // enter reference selection mode hideObject(); showBase(); diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index aeb0ea2e8c..17bc2becb6 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -230,7 +230,7 @@ void TaskMirroredParameters::onPlaneChanged(int /*num*/) setupTransaction(); PartDesign::Mirrored* pcMirrored = static_cast(getObject()); try{ - if(planeLinks.getCurrentLink().getValue() == nullptr){ + if (!planeLinks.getCurrentLink().getValue()) { // enter reference selection mode hideObject(); showBase(); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index b40abaa4a0..e7a2afedca 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -318,7 +318,7 @@ void TaskPolarPatternParameters::onAxisChanged(int /*num*/) PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); try{ - if(axesLinks.getCurrentLink().getValue() == nullptr){ + if (!axesLinks.getCurrentLink().getValue()) { // enter reference selection mode hideObject(); showBase(); diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index f0f73d2a2f..43eb0331db 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -248,7 +248,7 @@ void TaskRevolutionParameters::onAxisChanged(int num) oldRefName = oldSubRefAxis.front(); App::PropertyLinkSub &lnk = *(axesInList[num]); - if (lnk.getValue() == nullptr) { + if (!lnk.getValue()) { // enter reference selection mode TaskSketchBasedParameters::onSelectReference(AllowSelection::EDGE | AllowSelection::PLANAR | @@ -317,7 +317,7 @@ void TaskRevolutionParameters::getReferenceAxis(App::DocumentObject*& obj, std:: int num = ui->axis->currentIndex(); const App::PropertyLinkSub &lnk = *(axesInList[num]); - if (lnk.getValue() == nullptr) { + if (!lnk.getValue()) { throw Base::RuntimeError("Still in reference selection mode; reference wasn't selected yet"); } else { PartDesign::ProfileBased* pcRevolution = static_cast(vp->getObject()); diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index b5175cc3e5..cd1bc567fb 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -142,7 +142,7 @@ QVariant TaskSketchBasedParameters::setUpToFace(const QString& text) // Check whether this is the name of an App::Plane or Part::Datum feature App::DocumentObject* obj = vp->getObject()->getDocument()->getObject(parts[0].toLatin1()); - if (obj == nullptr) + if (!obj) return QVariant(); if (obj->getTypeId().isDerivedFrom(App::Plane::getClassTypeId())) { diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index bbaa4d4cd4..53b8fece5c 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -498,7 +498,7 @@ int ComboLinks::addLink(const App::PropertyLinkSub &lnk, QString itemText) this->linksInList.push_back(new App::PropertyLinkSub()); App::PropertyLinkSub &newitem = *(linksInList[linksInList.size()-1]); newitem.Paste(lnk); - if (newitem.getValue() && this->doc == nullptr) + if (newitem.getValue() && !this->doc) this->doc = newitem.getValue()->getDocument(); return linksInList.size()-1; } @@ -511,7 +511,7 @@ int ComboLinks::addLink(App::DocumentObject *linkObj, std::string linkSubname, Q this->linksInList.push_back(new App::PropertyLinkSub()); App::PropertyLinkSub &newitem = *(linksInList[linksInList.size()-1]); newitem.setValue(linkObj,std::vector(1,linkSubname)); - if (newitem.getValue() && this->doc == nullptr) + if (newitem.getValue() && !this->doc) this->doc = newitem.getValue()->getDocument(); return linksInList.size()-1; } diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index d5f9d1ec07..4f869595c7 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -66,7 +66,7 @@ public: */ ComboLinks(QComboBox &combo); ComboLinks() {_combo = nullptr; doc = nullptr;} - void setCombo(QComboBox &combo) {assert(_combo == nullptr); this->_combo = &combo; _combo->clear();} + void setCombo(QComboBox &combo) {assert(!_combo); this->_combo = &combo; _combo->clear();} /** * @brief addLink adds an item to the combo. Doesn't check for duplicates. diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 9fd9d45dc5..2018d680ae 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -56,27 +56,27 @@ using namespace Attacher; namespace PartDesignGui { bool setEdit(App::DocumentObject *obj, PartDesign::Body *body) { - if(!obj || !obj->getNameInDocument()) { + if (!obj || !obj->getNameInDocument()) { FC_ERR("invalid object"); return false; } - if(body == nullptr) { + if (!body) { body = getBodyFor(obj, false); - if(!body) { + if (!body) { FC_ERR("no body found"); return false; } } auto *activeView = Gui::Application::Instance->activeView(); - if(!activeView) + if (!activeView) return false; App::DocumentObject *parent = nullptr; std::string subname; auto activeBody = activeView->getActiveObject(PDBODYKEY,&parent,&subname); - if(activeBody != body) { + if (activeBody != body) { parent = obj; subname.clear(); - }else{ + } else { subname += obj->getNameInDocument(); subname += '.'; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index ce5ac372cf..1367837838 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -505,7 +505,7 @@ void ViewProviderBody::dropObject(App::DocumentObject* obj) e.ReportException(); } } - else if (body->BaseFeature.getValue() == nullptr) { + else if (!body->BaseFeature.getValue()) { body->BaseFeature.setValue(obj); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index 0b1643fe74..2dfc60755e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -86,11 +86,11 @@ void ViewProviderDressUp::highlightReferences(const bool on) { PartDesign::DressUp* pcDressUp = static_cast(getObject()); Part::Feature* base = pcDressUp->getBaseObject (/*silent =*/ true); - if (base == nullptr) + if (!base) return; PartGui::ViewProviderPart* vp = dynamic_cast( Gui::Application::Instance->getViewProvider(base)); - if (vp == nullptr) + if (!vp) return; std::vector faces = pcDressUp->Base.getSubValuesStartsWith("Face"); diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index 884d28ca4c..5451404694 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -46,7 +46,7 @@ void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver std::vector ViewProviderMultiTransform::claimChildren(void) const { PartDesign::MultiTransform* pcMultiTransform = static_cast(getObject()); - if (pcMultiTransform == nullptr) + if (!pcMultiTransform) return std::vector(); // TODO: Show error? std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 36fdad51f6..3867ee8124 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -144,7 +144,7 @@ void ViewProviderShapeBinder::highlightReferences(bool on) PartGui::ViewProviderPart* svp = dynamic_cast( Gui::Application::Instance->getViewProvider(obj)); - if (svp == nullptr) + if (!svp) return; if (on) {