Changeset 5783 for code/branches/core5/src/libraries/core/Identifier.cc

Timestamp:

Sep 24, 2009, 8:58:27 PM (15 years ago)

Author:

landauf

Message:

some cleanup

File:

• code/branches/core5/src/libraries/core/Identifier.cc (modified) (8 diffs)

code/branches/core5/src/libraries/core/Identifier.cc

@@ -66 +66 @@
         this->bHasConsoleCommands_ = false;
 
-        this->children_ = new std::set<const Identifier*>();
-        this->directChildren_ = new std::set<const Identifier*>();
-
         // Default network ID is the class ID
         this->networkID_ = this->classID_;
@@ -78 +75 @@
     Identifier::~Identifier()
     {
-        delete this->children_;
-        delete this->directChildren_;
         delete this->objects_;
 
@@ -165 +160 @@
             {
                 // Tell the parent we're one of it's children
-                (*it)->getChildrenIntern().insert((*it)->getChildrenIntern().end(), this);
+                (*it)->children_.insert((*it)->children_.end(), this);
 
                 // Erase all parents of our parent from our direct-parent-list
@@ -187 +182 @@
             {
                 // Tell the parent we're one of it's direct children
-                (*it)->getDirectChildrenIntern().insert((*it)->getDirectChildrenIntern().end(), this);
+                (*it)->directChildren_.insert((*it)->directChildren_.end(), this);
 
                 // Create the super-function dependencies
@@ -201 +196 @@
     {
         COUT(3) << "*** Identifier: Create class-hierarchy" << std::endl;
-        std::map<std::string, Identifier*>::const_iterator it;
-        it = Identifier::getStringIdentifierMap().begin();
-        Identifier::getStringIdentifierMap().begin()->second->startCreatingHierarchy();
-        for (it = Identifier::getStringIdentifierMap().begin(); it != Identifier::getStringIdentifierMap().end(); ++it)
+        Identifier::startCreatingHierarchy();
+        for (std::map<std::string, Identifier*>::const_iterator it = Identifier::getStringIdentifierMap().begin(); it != Identifier::getStringIdentifierMap().end(); ++it)
         {
             // To create the new branch of the class-hierarchy, we create a new object and delete it afterwards.
@@ -213 +206 @@
             }
         }
-        Identifier::getStringIdentifierMap().begin()->second->stopCreatingHierarchy();
+        Identifier::stopCreatingHierarchy();
         COUT(3) << "*** Identifier: Finished class-hierarchy creation" << std::endl;
     }
@@ -315 +308 @@
     bool Identifier::isParentOf(const Identifier* identifier) const
     {
-        return (this->children_->find(identifier) != this->children_->end());
+        return (this->children_.find(identifier) != this->children_.end());
     }
 
@@ -324 +317 @@
     bool Identifier::isDirectParentOf(const Identifier* identifier) const
     {
-        return (this->directChildren_->find(identifier) != this->directChildren_->end());
+        return (this->directChildren_.find(identifier) != this->directChildren_.end());
     }