FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Due to a misunderstanding of what removeChild() actually does, some used it to detach a subtree from the main tree. The previous patch broke that behaviour so a new function call detchChild() is now added.

Browse Source
This commit is contained in:
ehofman
2005-06-28 11:19:09 +00:00
parent 901592a88e
commit 84e87f0e8a
2 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
simgear/props/props.cxx
View File

@@ -913,13 +913,39 @@ SGPropertyNode::getChildren (const char * name) const
}
/**
* Detach a child node from the tree and return a guarded pointer to it.
*/
SGPropertyNode_ptr
SGPropertyNode::detachChild (const char * name, int index, bool keep)
{
SGPropertyNode_ptr ret;
int pos = find_child(name, index, _children);
if (pos >= 0) {
vector<SGPropertyNode_ptr>::iterator it = _children.begin();
it += pos;
SGPropertyNode_ptr node = _children[pos];
_children.erase(it);
if (keep) {
_removedChildren.push_back(node);
}
if (_path_cache)
_path_cache->erase(name); // EMH - TODO: Take "index" into account!
node->setAttribute(REMOVED, true);
node->clearValue();
ret = node;
fireChildRemoved(node);
}
return ret;
}
/**
* Remove a child node, and all children that aren't referenced.
* "keep" does only apply to the outmost item. Returns "true" if
* not all nodes could be removed.
* Returns "true" if not all nodes could be deleted.
*/
bool
SGPropertyNode::removeChild (const char * name, int index, bool keep)
SGPropertyNode::removeChild (const char * name, int index)
{
bool dirty = false;
int pos = find_child(name, index, _children);
@@ -933,9 +959,6 @@ SGPropertyNode::removeChild (const char * name, int index, bool keep)
if (node->isTied() || node->_count != 1 || node->nChildren())
dirty = true;
else {
if (keep)
_removedChildren.push_back(node);
if (_path_cache)
_path_cache->erase(name); // EMH - TODO: Take "index" into account!
@@ -948,9 +971,10 @@ SGPropertyNode::removeChild (const char * name, int index, bool keep)
return dirty;
}
/**
* Remove all children nodes, or all with a given name. Returns
* "true" if not all nodes could be removed.
* "true" if not all nodes could be deleted.
*/
bool
SGPropertyNode::removeChildren(const char *name)

11
simgear/props/props.hxx
View File

@@ -707,10 +707,17 @@ public:
/**
* Remove a child node (returns true if at least one node had to remain,
* Detach a child node from the tree and return guarded pointr to it.
*/
SGPropertyNode_ptr detachChild (const char * name, int index = 0,
bool keep = true);
/**
* Remove a child node. Returns "true" if at least one node had to remain,
* because it was tied, aliased, or refcounted through SGPropertyNode_ptr.
*/
bool removeChild (const char * name, int index = 0, bool keep = true);
bool removeChild (const char * name, int index = 0);
/**