From 5931199b2497faff3e3f77e4571a34844f4583e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Tue, 12 Jul 2022 18:15:23 +0200 Subject: [PATCH] [TechDraw] Improve readability of ViewProviderWeld.cpp --- src/Mod/TechDraw/Gui/ViewProviderWeld.cpp | 24 ++++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp index 6ceb5b694f..f682499697 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp @@ -112,25 +112,22 @@ std::vector ViewProviderWeld::claimChildren(void) const } return temp; } catch (...) { - std::vector tmp; - return tmp; + return std::vector(); } } bool ViewProviderWeld::setEdit(int ModNum) { // Base::Console().Message("VPW::setEdit(%d)\n",ModNum); - if (ModNum == ViewProvider::Default ) { - if (Gui::Control().activeDialog()) { //TaskPanel already open! - return false; - } - // clear the selection (convenience) - Gui::Selection().clearSelection(); - Gui::Control().showDialog(new TaskDlgWeldingSymbol(getFeature())); - return true; - } else { + if (ModNum != ViewProvider::Default ) { return ViewProviderDrawingView::setEdit(ModNum); } + if (Gui::Control().activeDialog()) { //TaskPanel already open! + return false; + } + // clear the selection (convenience) + Gui::Selection().clearSelection(); + Gui::Control().showDialog(new TaskDlgWeldingSymbol(getFeature())); return true; } @@ -188,9 +185,8 @@ bool ViewProviderWeld::onDelete(const std::vector &) QMessageBox::Ok); return false; } - else { - return true; - } + + return true; } bool ViewProviderWeld::canDelete(App::DocumentObject *obj) const