From 6f230d740401f914d5340a4b4be1a1c1df7b444a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 29 Mar 2022 12:37:21 -0500 Subject: [PATCH] PD: PR6497 move return statement to new line --- src/Mod/PartDesign/Gui/Command.cpp | 45 ++++++++++++------- src/Mod/PartDesign/Gui/CommandBody.cpp | 19 +++++--- src/Mod/PartDesign/Gui/CommandPrimitive.cpp | 3 +- .../Gui/TaskMultiTransformParameters.cpp | 3 +- .../Gui/TaskTransformedParameters.cpp | 3 +- src/Mod/PartDesign/Gui/Utils.cpp | 7 ++- src/Mod/PartDesign/Gui/ViewProviderDatum.cpp | 3 +- .../PartDesign/Gui/ViewProviderDressUp.cpp | 6 ++- .../Gui/ViewProviderShapeBinder.cpp | 6 ++- 9 files changed, 64 insertions(+), 31 deletions(-) diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 1e70a25181..09be681a2e 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -121,7 +121,8 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) support.removeValue(pcActiveBody); auto Feat = pcActiveBody->getDocument()->getObject(FeatName.c_str()); - if (!Feat) return; + if (!Feat) + return; //test if current selection fits a mode. if (support.getSize() > 0) { @@ -311,7 +312,8 @@ void CmdPartDesignShapeBinder::activated(int iMsg) support.removeValue(pcActiveBody); auto Feat = pcActiveBody->getObject(FeatName.c_str()); - if (!Feat) return; + if (!Feat) + return; //test if current selection fits a mode. if (support.getSize() > 0) { @@ -395,7 +397,8 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) binder = dynamic_cast( App::GetApplication().getActiveDocument()->getObject(FeatName.c_str())); } - if (!binder) return; + if (!binder) + return; binder->setLinks(std::move(values)); updateActive(); commitCommand(); @@ -1386,7 +1389,8 @@ void CmdPartDesignHole::activated(int iMsg) Gui::Command* cmd = this; auto worker = [cmd](Part::Feature* sketch, App::DocumentObject *Feat) { - if (!Feat) return; + if (!Feat) + return; finishProfileBased(cmd, sketch, Feat); cmd->adjustCameraPosition(); @@ -1432,7 +1436,8 @@ void CmdPartDesignRevolution::activated(int iMsg) Gui::Command* cmd = this; auto worker = [cmd, &pcActiveBody](Part::Feature* sketch, App::DocumentObject *Feat) { - if (!Feat) return; + if (!Feat) + return; if (sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) { FCMD_OBJ_CMD(Feat,"ReferenceAxis = (" << getObjectCmd(sketch) << ",['V_Axis'])"); @@ -1490,7 +1495,8 @@ void CmdPartDesignGroove::activated(int iMsg) Gui::Command* cmd = this; auto worker = [cmd, &pcActiveBody](Part::Feature* sketch, App::DocumentObject *Feat) { - if (!Feat) return; + if (!Feat) + return; if (sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) { FCMD_OBJ_CMD(Feat,"ReferenceAxis = ("<getUniqueObjectName(which.c_str(), base); auto body = PartDesignGui::getBodyFor(base, false); - if (!body) return; + if (!body) + return; cmd->openCommand((std::string("Make ") + which).c_str()); FCMD_OBJ_CMD(body,"newObject('PartDesign::"<getDocument()->getObject(FeatName.c_str()); @@ -2532,7 +2545,8 @@ void CmdPartDesignMultiTransform::activated(int iMsg) f++; } - if (features.empty()) return; + if (features.empty()) + return; // Note: If multiple Transformed features were selected, only the first one is used PartDesign::Transformed* trFeat = static_cast(features.front()); @@ -2634,7 +2648,8 @@ void CmdPartDesignBoolean::activated(int iMsg) { Q_UNUSED(iMsg); PartDesign::Body *pcActiveBody = PartDesignGui::getBody(/*messageIfNot = */true); - if (!pcActiveBody) return; + if (!pcActiveBody) + return; Gui::SelectionFilter BodyFilter("SELECT Part::Feature COUNT 1.."); diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index dacf18823f..4a24405f56 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -667,10 +667,13 @@ void CmdPartDesignMoveFeature::activated(int iMsg) { Q_UNUSED(iMsg); std::vector features = getSelection().getObjectsOfType(Part::Feature::getClassTypeId()); - if (features.empty()) return; + if (features.empty()) + return; // Check if all features are valid to move - if (std::any_of(std::begin(features), std::end(features), [](App::DocumentObject* obj){return !PartDesignGui::isFeatureMovable(obj); })) + if (std::any_of(std::begin(features), std::end(features), [](App::DocumentObject* obj){ + return !PartDesignGui::isFeatureMovable(obj); + })) { //show messagebox and cancel QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Features cannot be moved"), @@ -725,9 +728,11 @@ void CmdPartDesignMoveFeature::activated(int iMsg) qApp->translate("PartDesign_MoveFeature", "Select body"), qApp->translate("PartDesign_MoveFeature", "Select a body from the list"), items, 0, false, &ok, Qt::MSWindowsFixedSizeDialogHint); - if (!ok) return; + if (!ok) + return; int index = items.indexOf(text); - if (index < 0) return; + if (index < 0) + return; PartDesign::Body* target = static_cast(target_bodies[index]); @@ -829,7 +834,8 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) { Q_UNUSED(iMsg); std::vector features = getSelection().getObjectsOfType(Part::Feature::getClassTypeId()); - if (features.empty()) return; + if (features.empty()) + return; PartDesign::Body *body = PartDesignGui::getBodyFor ( features.front(), false ); App::DocumentObject * bodyBase = nullptr; @@ -875,7 +881,8 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) qApp->translate("PartDesign_MoveFeatureInTree", "Select feature"), qApp->translate("PartDesign_MoveFeatureInTree", "Select a feature from the list"), items, 0, false, &ok, Qt::MSWindowsFixedSizeDialogHint); - if (!ok) return; + if (!ok) + return; int index = items.indexOf(text); // first object is the beginning of the body App::DocumentObject* target = index != 0 ? model[index-1] : nullptr; diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index cb8dd7f158..702120a21a 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -118,7 +118,8 @@ void CmdPrimtiveCompAdditive::activated(int iMsg) auto* prm = static_cast( pcActiveBody->getDocument()->getObject(FeatName.c_str())); - if(!prm) return; + if(!prm) + return; FCMD_OBJ_CMD(pcActiveBody,"addObject("<(TransformedView->getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); - if (transformFeatures.empty()) return; + if (transformFeatures.empty()) + return; App::DocumentObject* feature = transformFeatures[row]; transformFeatures.erase(transformFeatures.begin() + row); diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index d9facc0bc6..03771b7fd5 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -203,7 +203,8 @@ void TaskTransformedParameters::onButtonAddFeature(bool checked) void TaskTransformedParameters::checkVisibility() { auto feat = getObject(); auto body = feat->getFeatureBody(); - if(!body) return; + if(!body) + return; auto inset = feat->getInListEx(true); inset.emplace(feat); for(auto o : body->Group.getValues()) { diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 6db7922e22..9fd9d45dc5 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -68,7 +68,8 @@ bool setEdit(App::DocumentObject *obj, PartDesign::Body *body) { } } auto *activeView = Gui::Application::Instance->activeView(); - if(!activeView) return false; + if(!activeView) + return false; App::DocumentObject *parent = nullptr; std::string subname; auto activeBody = activeView->getActiveObject(PDBODYKEY,&parent,&subname); @@ -451,7 +452,9 @@ bool isFeatureMovable(App::DocumentObject* const feat) return false; if (auto prop = static_cast(prim->getPropertyByName("Sections"))) { - if (std::any_of(prop->getValues().begin(), prop->getValues().end(), [](App::DocumentObject* obj){return !isFeatureMovable(obj); })) + if (std::any_of(prop->getValues().begin(), prop->getValues().end(), [](App::DocumentObject* obj){ + return !isFeatureMovable(obj); + })) return false; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp index 5a3c167b25..62b7f8bc6c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp @@ -274,7 +274,8 @@ bool ViewProviderDatum::doubleClicked(void) if(!activeDoc) activeDoc = getDocument(); auto activeView = activeDoc->getActiveView(); - if(!activeView) return false; + if(!activeView) + return false; std::string Msg("Edit "); Msg += this->pcObject->Label.getValue(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index b961423f1c..7196da835e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -86,10 +86,12 @@ void ViewProviderDressUp::highlightReferences(const bool on) { PartDesign::DressUp* pcDressUp = static_cast(getObject()); Part::Feature* base = pcDressUp->getBaseObject (/*silent =*/ true); - if (base == nullptr) return; + if (base == nullptr) + return; PartGui::ViewProviderPart* vp = dynamic_cast( Gui::Application::Instance->getViewProvider(base)); - if (vp == nullptr) return; + if (vp == nullptr) + return; std::vector faces = pcDressUp->Base.getSubValuesStartsWith("Face"); std::vector edges = pcDressUp->Base.getSubValuesStartsWith("Edge"); diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index dc527007e3..2234fee4da 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -144,7 +144,8 @@ void ViewProviderShapeBinder::highlightReferences(const bool on, bool /*auxiliar PartGui::ViewProviderPart* svp = dynamic_cast( Gui::Application::Instance->getViewProvider(obj)); - if (svp == nullptr) return; + if (svp == nullptr) + return; if (on) { if (!subs.empty() && originalLineColors.empty()) { @@ -270,7 +271,8 @@ std::string ViewProviderSubShapeBinder::dropObjectEx(App::DocumentObject* obj, A const char* subname, const std::vector& elements) { auto self = dynamic_cast(getObject()); - if (!self) return std::string(); + if (!self) + return std::string(); std::map > values; if (!subname) subname = ""; std::string sub(subname);