Changeset 10376 for code/branches/core7/src/libraries/core

Timestamp:

Apr 19, 2015, 10:13:42 PM (10 years ago)

Author:

landauf

Message:

added helper function to reduce code duplication

Location:

code/branches/core7/src/libraries/core/class

Files:

• Identifier.cc (modified) (2 diffs)
• Identifier.h (modified) (1 diff)

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -205 +205 @@
             {
                 for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(*it_parent)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(*it_parent)->parents_.end(); ++it_parent_parent)
-                    if (std::find(this->parents_.begin(), this->parents_.end(), *it_parent_parent) == this->parents_.end())
-                        this->parents_.push_back(*it_parent_parent);
-                if (std::find(this->parents_.begin(), this->parents_.end(), *it_parent) == this->parents_.end())
-                    this->parents_.push_back(*it_parent);
+                    this->addIfNotExists(this->parents_, *it_parent_parent);
+                this->addIfNotExists(this->parents_, *it_parent);
             }
         }
@@ -236 +234 @@
 
     /**
+     * Adds @param identifierToAdd to @param list if this identifier is not already contained in the list.
+     */
+    void Identifier::addIfNotExists(std::list<const Identifier*>& list, const Identifier* identifierToAdd) const
+    {
+        if (std::find(list.begin(), list.end(), identifierToAdd) == list.end())
+            list.push_back(identifierToAdd);
+    }
+
+    /**
         @brief Returns true, if the Identifier is at least of the given type.
         @param identifier The identifier to compare with

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -215 +215 @@
 
         private:
+            void addIfNotExists(std::list<const Identifier*>& list, const Identifier* identifierToAdd) const;
+
             std::list<const Identifier*> directParents_;                    //!< The direct parents of the class the Identifier belongs to (sorted by their order of initialization)
             std::list<const Identifier*> parents_;                          //!< The parents of the class the Identifier belongs to (sorted by their order of initialization)