kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TechDraw] Simplify return logic

Browse Source 
Normal warmup
This commit is contained in:
Benjamin Bræstrup Sayoc
2023-04-09 19:03:50 +02:00
committed by WandererFan
parent 6df0a20214
commit a93060c6b9
16 changed files with 164 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/TechDraw/App/DrawProjGroupItem.cpp
View File

@@ -97,7 +97,6 @@ bool DrawProjGroupItem::isLocked(void) const
bool DrawProjGroupItem::showLock(void) const
{
bool result = DrawView::showLock();
DrawProjGroup* parent = getPGroup();
bool parentLock = false;
if (parent) {
@@ -106,10 +105,10 @@ bool DrawProjGroupItem::showLock(void) const
if (isAnchor() && //don't show lock for Front if DPG is not locked
!parentLock) {
result = false;
return false;
}
return result;
return DrawView::showLock();
}
App::DocumentObjectExecReturn *DrawProjGroupItem::execute(void)
@@ -181,15 +180,14 @@ void DrawProjGroupItem::onDocumentRestored()
DrawProjGroup* DrawProjGroupItem::getPGroup() const
{
DrawProjGroup* result = nullptr;
std::vector<App::DocumentObject*> parent = getInList();
for (std::vector<App::DocumentObject*>::iterator it = parent.begin(); it != parent.end(); ++it) {
if ((*it)->getTypeId().isDerivedFrom(DrawProjGroup::getClassTypeId())) {
result = dynamic_cast<TechDraw::DrawProjGroup *>(*it);
break;
DrawProjGroup* result = dynamic_cast<TechDraw::DrawProjGroup *>(*it);
return result;
}
}
return result;
return nullptr;
}
bool DrawProjGroupItem::isAnchor(void) const