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

Avoids using getNameInDocument() to test if DocumentObject is attached to a Document.

Browse Source 
This patch substitutes by isAttachedToDocument() (almost) everywhere where
getNameInDocument() is used for this purpose.

The very few places not touched by this patch demand a (just a little) less trivial change.
When we change the returning type of getNameInDocument() to std::string,
those places will be easily found, because they shall generate a compiler error
(converting std::string to bool).

Rationale:
The fact that getNameInDocument() return nullptr to indicate
that the object is not attached to a document is responsible for lots of bugs
where the developer does not check for "nullptr".

The idea is to eliminate all those uses of getNameInDocument() and, in the near future,
make getNameInDocument() return always a valid std::string.
This commit is contained in:
André Caldas
2023-10-21 21:42:35 -03:00
committed by Yorik van Havre
parent 7bee0fbde6
commit 89dbab9b0e
49 changed files with 229 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App/Document.cpp
View File

@@ -1126,7 +1126,7 @@ void Document::exportObjects(const std::vector<App::DocumentObject*>& obj, std::
if(FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
for(auto o : obj) {
if(o && o->getNameInDocument()) {
if(o && o->isAttachedToDocument()) {
FC_LOG("exporting " << o->getFullName());
if (!o->getPropertyByName("_ObjectUUID")) {
auto prop = static_cast<PropertyUUID*>(o->addDynamicProperty(
@@ -1492,7 +1492,7 @@ Document::importObjects(Base::XMLReader& reader)
std::vector<App::DocumentObject*> objs = readObjects(reader);
for(auto o : objs) {
if(o && o->getNameInDocument()) {
if(o && o->isAttachedToDocument()) {
o->setStatus(App::ObjImporting,true);
FC_LOG("importing " << o->getFullName());
if (auto propUUID = Base::freecad_dynamic_cast<PropertyUUID>(
@@ -1519,7 +1519,7 @@ Document::importObjects(Base::XMLReader& reader)
signalFinishImportObjects(objs);
for(auto o : objs) {
if(o && o->getNameInDocument())
if(o && o->isAttachedToDocument())
o->setStatus(App::ObjImporting,false);
}
@@ -2424,7 +2424,7 @@ static void _buildDependencyList(const std::vector<App::DocumentObject*> &object
while(!objs.empty()) {
auto obj = objs.front();
objs.pop_front();
if(!obj || !obj->getNameInDocument())
if(!obj || !obj->isAttachedToDocument())
continue;
auto it = outLists.find(obj);
@@ -2451,7 +2451,7 @@ static void _buildDependencyList(const std::vector<App::DocumentObject*> &object
if(objectMap && depList) {
for (const auto &v : outLists) {
for(auto obj : v.second) {
if(obj && obj->getNameInDocument())
if(obj && obj->isAttachedToDocument())
add_edge((*objectMap)[v.first],(*objectMap)[obj],*depList);
}
}
@@ -2846,7 +2846,7 @@ int Document::recompute(const std::vector<App::DocumentObject*> &objs, bool forc
FC_LOG("Recompute pass " << passes);
for (; idx < topoSortedObjects.size(); ++idx) {
auto obj = topoSortedObjects[idx];
if(!obj->getNameInDocument() || filter.find(obj)!=filter.end())
if(!obj->isAttachedToDocument() || filter.find(obj)!=filter.end())
continue;
// ask the object if it should be recomputed
bool doRecompute = false;
@@ -2903,7 +2903,7 @@ int Document::recompute(const std::vector<App::DocumentObject*> &objs, bool forc
FC_TIME_LOG(t2, "Recompute");
for(auto obj : topoSortedObjects) {
if(!obj->getNameInDocument())
if(!obj->isAttachedToDocument())
continue;
obj->setStatus(ObjectStatus::PendingRecompute,false);
obj->setStatus(ObjectStatus::Recompute2,false);
@@ -3064,8 +3064,8 @@ std::vector<App::DocumentObject*> DocumentP::topologicalSort(const std::vector<A
for (auto objectIt : objects) {
// We now support externally linked objects
// if(!obj->getNameInDocument() || obj->getDocument()!=this)
if(!objectIt->getNameInDocument())
// if(!obj->isAttachedToDocument() || obj->getDocument()!=this)
if(!objectIt->isAttachedToDocument())
continue;
//we need inlist with unique entries
auto in = objectIt->getInList();
@@ -3179,7 +3179,7 @@ bool Document::recomputeFeature(DocumentObject* Feat, bool recursive)
d->clearRecomputeLog(Feat);
// verify that the feature is (active) part of the document
if (Feat->getNameInDocument()) {
if (Feat->isAttachedToDocument()) {
if(recursive) {
bool hasError = false;
recompute({Feat},true,&hasError);