Changeset 11071 for code/trunk/src/libraries/core/object/Listable.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/object/Listable.cc
r10624 r11071 44 44 @brief Constructor: Allocates space in the element list. 45 45 */ 46 Listable::Listable() 46 Listable::Listable() : Listable(Context::getRootContext()) 47 47 { 48 this->context_ = Context::getRootContext();49 this->elements_.reserve(6);50 51 RegisterObject(Listable);52 48 } 53 49 … … 76 72 void Listable::unregisterObject() 77 73 { 78 for ( size_t i = 0; i < this->elements_.size(); ++i)79 Listable::deleteObjectListElement( this->elements_[i]);74 for (ObjectListBaseElement* element : this->elements_) 75 Listable::deleteObjectListElement(element); 80 76 this->elements_.clear(); 81 77 } … … 91 87 this->elements_.clear(); 92 88 93 for ( size_t i = 0; i < copy.size(); ++i)89 for (ObjectListBaseElement* element : copy) 94 90 { 95 copy[i]->changeContext(this->context_, context);96 Listable::deleteObjectListElement( copy[i]);91 element->changeContext(this->context_, context); 92 Listable::deleteObjectListElement(element); 97 93 } 98 94
Note: See TracChangeset
for help on using the changeset viewer.