From c44ccc0ff231b7a91deb4425fa7b484725e98683 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 29 Mar 2022 13:26:01 -0500 Subject: [PATCH] TD: PR6497 move return statement to new line --- src/Mod/TechDraw/App/DrawProjGroup.cpp | 3 ++- src/Mod/TechDraw/Gui/QGTracker.cpp | 3 ++- src/Mod/TechDraw/Gui/TaskCosVertex.cpp | 6 ++++-- src/Mod/TechDraw/Gui/TaskDetail.cpp | 6 ++++-- src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 6 ++++-- src/Mod/TechDraw/Gui/TaskLineDecor.cpp | 6 ++++-- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 6 ++++-- src/Mod/TechDraw/Gui/TaskRichAnno.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp | 6 ++++-- src/Mod/TechDraw/Gui/ViewProviderHatch.cpp | 6 ++++-- 10 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index 91d52f2b76..442057120f 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -220,7 +220,8 @@ short DrawProjGroup::mustExecute() const spacingX.isTouched() || spacingY.isTouched(); } - if (result) return result; + if (result) + return result; return TechDraw::DrawViewCollection::mustExecute(); } diff --git a/src/Mod/TechDraw/Gui/QGTracker.cpp b/src/Mod/TechDraw/Gui/QGTracker.cpp index de45e5b523..87b79460d0 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.cpp +++ b/src/Mod/TechDraw/Gui/QGTracker.cpp @@ -200,7 +200,8 @@ void QGTracker::sleep(bool b) QPointF QGTracker::snapToAngle(QPointF dumbPt) { // If no point selected yet, snapping has no sense - if (m_points.size() < 1) return dumbPt; + if (m_points.size() < 1) + return dumbPt; QPointF result(dumbPt); double angleIncr = M_PI / 8.0; //15* diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp index 5c91f29e88..029a3a8cdd 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp @@ -318,7 +318,8 @@ void TaskCosVertex::enableTaskButtons(bool b) bool TaskCosVertex::accept() { Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; removeTracker(); double x = ui->dsbX->value().getValue(); @@ -338,7 +339,8 @@ bool TaskCosVertex::accept() bool TaskCosVertex::reject() { Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; removeTracker(); m_trackerMode = QGTracker::TrackerMode::None; diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp index 2da087d99d..8be89aedd7 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.cpp +++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp @@ -620,7 +620,8 @@ bool TaskDetail::accept() // Base::Console().Message("TD::accept()\n"); Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; m_ghost->hide(); getDetailFeat()->requestPaint(); @@ -634,7 +635,8 @@ bool TaskDetail::reject() { // Base::Console().Message("TD::reject()\n"); Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; m_ghost->hide(); if (m_mode == CREATEMODE) { diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index b27ec4b9c2..ab1fc28ba7 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -807,7 +807,8 @@ bool TaskLeaderLine::accept() } Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; if (!getCreateMode()) { // removeTracker(); @@ -838,7 +839,8 @@ bool TaskLeaderLine::reject() } Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; if (getCreateMode() && (m_lineFeat != nullptr) ) { diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp index f12dd1512e..d9599c6a4c 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp @@ -230,7 +230,8 @@ bool TaskLineDecor::accept() { // Base::Console().Message("TLD::accept()\n"); Gui::Document* doc = Gui::Application::Instance->getDocument(m_partFeat->getDocument()); - if (!doc) return false; + if (!doc) + return false; if (apply()) { applyDecorations(); @@ -248,7 +249,8 @@ bool TaskLineDecor::reject() { // Base::Console().Message("TLD::reject()\n"); Gui::Document* doc = Gui::Application::Instance->getDocument(m_partFeat->getDocument()); - if (!doc) return false; + if (!doc) + return false; Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()"); return false; diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index cffb499243..be2e31b035 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -526,7 +526,8 @@ bool TaskProjGroup::accept() { // Base::Console().Message("TPG::accept()\n"); Gui::Document* doc = Gui::Application::Instance->getDocument(multiView->getDocument()); - if (!doc) return false; + if (!doc) + return false; multiView->recomputeChildren(); multiView->recomputeFeature(); @@ -539,7 +540,8 @@ bool TaskProjGroup::accept() bool TaskProjGroup::reject() { Gui::Document* doc = Gui::Application::Instance->getDocument(multiView->getDocument()); - if (!doc) return false; + if (!doc) + return false; if (getCreateMode()) { //remove the object completely from the document diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index b0050c51b4..d3207e31e2 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -530,7 +530,8 @@ bool TaskRichAnno::accept() } Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument()); - if (!doc) return false; + if (!doc) + return false; if (!getCreateMode()) { updateAnnoFeature(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp index 4662505fe1..e4ffb68b26 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp @@ -194,8 +194,10 @@ TechDraw::DrawGeomHatch* ViewProviderGeomHatch::getViewObject() const Gui::MDIView *ViewProviderGeomHatch::getMDIView() const { auto obj = getViewObject(); - if(!obj) return nullptr; + if(!obj) + return nullptr; auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView()); - if(!vp) return nullptr; + if(!vp) + return nullptr; return vp->getMDIView(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index fd74b9b2f8..3e7289da34 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -163,8 +163,10 @@ bool ViewProviderHatch::canDelete(App::DocumentObject *obj) const Gui::MDIView *ViewProviderHatch::getMDIView() const { auto obj = getViewObject(); - if(!obj) return nullptr; + if(!obj) + return nullptr; auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView()); - if(!vp) return nullptr; + if(!vp) + return nullptr; return vp->getMDIView(); }