Changeset 241 for code/branches/objecthierarchie/src

Timestamp:

Nov 25, 2007, 3:24:17 AM (17 years ago)

Author:

landauf

Message:

added some "const" qualifiers

Location:

code/branches/objecthierarchie/src

Files:

• Identifier.cc (modified) (6 diffs)
• Identifier.h (modified) (3 diffs)
• IdentifierList.cc (modified) (1 diff)
• IdentifierList.h (modified) (1 diff)

code/branches/objecthierarchie/src/Identifier.cc

@@ -14 +14 @@
         this->directChildren_ = new IdentifierList;
         this->allChildren_ = new IdentifierList;
-        this->directParents_ = new IdentifierList;
-        this->allParents_ = new IdentifierList;
     }
 
@@ -24 +22 @@
         delete this->directChildren_;
         delete this->allChildren_;
-        delete this->directParents_;
-        delete this->allParents_;
     }
 
@@ -44 +40 @@
             while (temp1)
             {
-                temp2 = temp1->identifier_->directParents_->first_;
+                temp2 = temp1->identifier_->directParents_.first_;
                 while (temp2)
                 {
@@ -66 +62 @@
                 if (temp1->bDirect_)
                 {
-                    this->directParents_->add(temp1->identifier_);
-                    temp1->identifier_->directChildren_->add(this);
+                    this->directParents_.add(temp1->identifier_);
+                    temp1->identifier_->getDirectChildren().add(this);
                 }
 
-                this->allParents_->add(temp1->identifier_);
-                temp1->identifier_->allChildren_->add(this);
+                this->allParents_.add(temp1->identifier_);
+                temp1->identifier_->getAllChildren().add(this);
 
                 temp1 = temp1->next_;
@@ -80 +76 @@
     bool Identifier::isA(const Identifier* identifier) const
     {
-        return (identifier == this || this->allParents_->isInList(identifier));
+        return (identifier == this || this->allParents_.isInList(identifier));
     }
 
@@ -90 +86 @@
     bool Identifier::isChildOf(const Identifier* identifier) const
     {
-        return this->allParents_->isInList(identifier);
+        return this->allParents_.isInList(identifier);
     }
 
     bool Identifier::isDirectChildOf(const Identifier* identifier) const
     {
-        return this->directParents_->isInList(identifier);
+        return this->directParents_.isInList(identifier);
     }
 

code/branches/objecthierarchie/src/Identifier.h

@@ -39 +39 @@
 
             const std::string& getName() const { return this->name_; }
-            const IdentifierList* getDirectParents() const { return this->directParents_; }
-            const IdentifierList* getAllParents() const { return this->allParents_; }
-            const IdentifierList* getDirectChildren() const { return this->directChildren_; }
-            const IdentifierList* getAllChildren() const { return this->allChildren_; }
+            const IdentifierList& getDirectParents() const { return this->directParents_; }
+            const IdentifierList& getAllParents() const { return this->allParents_; }
+            IdentifierList& getDirectChildren() const { return *this->directChildren_; }
+            IdentifierList& getAllChildren() const { return *this->allChildren_; }
 
             static bool isCreatingHierarchy() { return (hierarchyCreatingCounter_s > 0); }
@@ -68 +68 @@
             }
 
-            IdentifierList* directParents_;
-            IdentifierList* allParents_;
+            IdentifierList directParents_;
+            IdentifierList allParents_;
             IdentifierList* directChildren_;
             IdentifierList* allChildren_;
@@ -221 +221 @@
         this->objects_->remove(object, bIterateForwards);
 
-        IdentifierListElement* temp = this->directParents_->first_;
+        IdentifierListElement* temp = this->directParents_.first_;
         while (temp)
         {

code/branches/objecthierarchie/src/IdentifierList.cc

@@ -60 +60 @@
     }
 
-    bool IdentifierList::isInList(const Identifier* identifier)
+    bool IdentifierList::isInList(const Identifier* identifier) const
     {
         IdentifierListElement* temp = this->first_;

code/branches/objecthierarchie/src/IdentifierList.h

@@ -26 +26 @@
             void add(const Identifier* identifier);
             void remove(const Identifier* identifier);
-            bool isInList(const Identifier* identifier);
+            bool isInList(const Identifier* identifier) const;
             std::string toString() const;