diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-13 22:16:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-13 22:16:31 +0100 |
| commit | db4bc6812d69d960a558b89c18f08b17a2e38d27 (patch) | |
| tree | 15d6547e929635baaffd9a4008a872e9d1c246e6 /configmgr/source/components.cxx | |
| parent | 39cbce553da1834f78b77f48b2f1be9578d6cc05 (diff) | |
Unified configmgr::Node::getMember{s,Map} again.
(With the insight that Data::components is RootNode::members.)
Diffstat (limited to 'configmgr/source/components.cxx')
| -rw-r--r-- | configmgr/source/components.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 56c597593395..77f8c012e368 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -385,7 +385,7 @@ void Components::removeExtensionXcuFile( i != item->additions.rend(); ++i) { rtl::Reference< Node > parent; - NodeMap const * map = &data_.components; + NodeMap const * map = &data_.getComponents(); rtl::Reference< Node > node; for (Path::const_iterator j(i->begin()); j != i->end(); ++j) { parent = node; @@ -402,9 +402,7 @@ void Components::removeExtensionXcuFile( node->kind() == Node::KIND_GROUP || node->kind() == Node::KIND_SET); if (canRemoveFromLayer(item->layer, node)) { - NodeMap * members = parent->getMemberMap(); - assert(members != 0); - members->erase(i->back()); + parent->getMembers().erase(i->back()); data_.modifications.remove(*i); modifications->add(*i); } |