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

Refactor all element name pairs into clearer struct names - renames

Browse Source
This commit is contained in:
bgbsww
2024-07-19 16:23:27 -04:00
parent d4d40efbc5
commit 19e450a667
27 changed files with 268 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/App/ObjectIdentifier.cpp
View File

@@ -461,8 +461,8 @@ bool ObjectIdentifier::replaceObject(ObjectIdentifier &res, const App::DocumentO
}
res.subObjectName = String(r.second,true);
res._cache.clear();
res.shadowSub.first.clear();
res.shadowSub.second.clear();
res.shadowSub.newName.clear();
res.shadowSub.oldName.clear();
return true;
}
@@ -1833,10 +1833,10 @@ void ObjectIdentifier::setValue(const App::any &value) const
}
const std::string &ObjectIdentifier::getSubObjectName(bool newStyle) const {
if(newStyle && !shadowSub.first.empty())
return shadowSub.first;
if(!shadowSub.second.empty())
return shadowSub.second;
if(newStyle && !shadowSub.newName.empty())
return shadowSub.newName;
if(!shadowSub.oldName.empty())
return shadowSub.oldName;
return subObjectName.getString();
}
@@ -1873,8 +1873,8 @@ void ObjectIdentifier::importSubNames(const ObjectIdentifier::SubNameMap &subNam
return;
subObjectName = String(it->second,true);
_cache.clear();
shadowSub.first.clear();
shadowSub.second.clear();
shadowSub.newName.clear();
shadowSub.oldName.clear();
}
bool ObjectIdentifier::updateElementReference(ExpressionVisitor &v,