Code cleanup. Actually use the added Contains() & Find() functions.

Engine/Audio/Audio.cpp

@@ -460,14 +460,9 @@ void Audio::RemoveSoundSource(SoundSource* channel)
 {
     MutexLock Lock(audioMutex_);
     
-    for (PODVector<SoundSource*>::Iterator i = soundSources_.Begin(); i != soundSources_.End(); ++i)
-    {
-        if (*i == channel)
-        {
-            soundSources_.Erase(i);
-            return;
-        }
-    }
+    PODVector<SoundSource*>::Iterator i = soundSources_.Find(channel);
+    if (i != soundSources_.End())
+        soundSources_.Erase(i);
 }
 
 #ifdef USE_OPENGL

Engine/Core/Context.cpp

@@ -121,12 +121,9 @@ void Context::CopyBaseAttributes(ShortStringHash baseType, ShortStringHash deriv
 void Context::AddEventReceiver(Object* receiver, StringHash eventType)
 {
     PODVector<Object*>& receivers = eventReceivers_[eventType];
-    for (PODVector<Object*>::ConstIterator j = receivers.Begin(); j != receivers.End(); ++j)
-    {
-        // Check if already registered
-        if (*j == receiver)
-            return;
-    }
+    // Check if already registered
+    if (receivers.Contains(receiver))
+        return;
     
     receivers.Push(receiver);
 }
@@ -134,11 +131,8 @@ void Context::AddEventReceiver(Object* receiver, StringHash eventType)
 void Context::AddEventReceiver(Object* receiver, Object* sender, StringHash eventType)
 {
     PODVector<Object*>& receivers = specificEventReceivers_[MakePair(sender, eventType)];
-    for (PODVector<Object*>::ConstIterator j = receivers.Begin(); j != receivers.End(); ++j)
-    {
-        if (*j == receiver)
-            return;
-    }
+    if (receivers.Contains(receiver))
+        return;
     
     receivers.Push(receiver);
 }
@@ -168,19 +162,16 @@ void Context::RemoveEventReceiver(Object* receiver, StringHash eventType)
     if (!group)
         return;
     
-    for (PODVector<Object*>::Iterator i = group->Begin(); i != group->End(); ++i)
+    PODVector<Object*>::Iterator i = group->Find(receiver);
+    if (i != group->End())
     {
-        if (*i == receiver)
+        // If no event handling going on, can erase the receiver. Otherwise reset the pointer and clean up later
+        if (eventSenders_.Empty())
+            group->Erase(i);
+        else
         {
-            // If no event handling going on, can erase the receiver. Otherwise reset the pointer and clean up later
-            if (eventSenders_.Empty())
-                group->Erase(i);
-            else
-            {
-                *i = 0;
-                dirtyReceivers_.Insert(eventType);
-            }
-            return;
+            *i = 0;
+            dirtyReceivers_.Insert(eventType);
         }
     }
 }
@@ -191,19 +182,17 @@ void Context::RemoveEventReceiver(Object* receiver, Object* sender, StringHash e
     if (!group)
         return;
     
-    for (PODVector<Object*>::Iterator i = group->Begin(); i != group->End(); ++i)
+    PODVector<Object*>::Iterator i = group->Find(receiver);
+    if (i != group->End())
     {
-        if (*i == receiver)
+        if (eventSenders_.Empty())
+            group->Erase(i);
+        else
         {
-            if (eventSenders_.Empty())
-                group->Erase(i);
-            else
-            {
-                *i = 0;
-                dirtySpecificReceivers_.Insert(MakePair(sender, eventType));
-            }
-            return;
+            *i = 0;
+            dirtySpecificReceivers_.Insert(MakePair(sender, eventType));
         }
+        return;
     }
 }
 

Engine/Graphics/Animation.cpp

@@ -180,7 +180,7 @@ const AnimationTrack* Animation::GetTrack(const String& name) const
 {
     for (Vector<AnimationTrack>::ConstIterator i = tracks_.Begin(); i != tracks_.End(); ++i)
     {
-        if ((*i).name_ == name)
+        if (i->name_ == name)
             return &(*i);
     }
     
@@ -191,7 +191,7 @@ const AnimationTrack* Animation::GetTrack(StringHash nameHash) const
 {
     for (Vector<AnimationTrack>::ConstIterator i = tracks_.Begin(); i != tracks_.End(); ++i)
     {
-        if ((*i).nameHash_ == nameHash)
+        if (i->nameHash_ == nameHash)
             return &(*i);
     }
     

Engine/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -1941,14 +1941,9 @@ void Graphics::AddGPUObject(GPUObject* object)
 
 void Graphics::RemoveGPUObject(GPUObject* object)
 {
-    for (Vector<GPUObject*>::Iterator i = gpuObjects_.Begin(); i != gpuObjects_.End(); ++i)
-    {
-        if ((*i) == object)
-        {
-            gpuObjects_.Erase(i);
-            return;
-        }
-    }
+    Vector<GPUObject*>::Iterator i = gpuObjects_.Find(object);
+    if (i != gpuObjects_.End())
+        gpuObjects_.Erase(i);
 }
 
 unsigned Graphics::GetAlphaFormat()

Engine/Graphics/Octree.h

@@ -64,16 +64,13 @@ public:
     /// Remove a drawable object from this octant
     void RemoveDrawable(Drawable* drawable, bool resetOctant = true)
     {
-        for (PODVector<Drawable*>::Iterator i = drawables_.Begin(); i != drawables_.End(); ++i)
+        PODVector<Drawable*>::Iterator i = drawables_.Find(drawable);
+        if (i != drawables_.End())
         {
-            if (*i == drawable)
-            {
-                if (resetOctant)
-                    drawable->SetOctant(0);
-                drawables_.Erase(i);
-                DecDrawableCount();
-                return;
-            }
+            if (resetOctant)
+                drawable->SetOctant(0);
+            drawables_.Erase(i);
+            DecDrawableCount();
         }
     }
     

Engine/Graphics/OpenGL/OGLGraphics.cpp

@@ -1982,14 +1982,9 @@ void Graphics::AddGPUObject(GPUObject* object)
 
 void Graphics::RemoveGPUObject(GPUObject* object)
 {
-    for (Vector<GPUObject*>::Iterator i = gpuObjects_.Begin(); i != gpuObjects_.End(); ++i)
-    {
-        if ((*i) == object)
-        {
-            gpuObjects_.Erase(i);
-            return;
-        }
-    }
+    Vector<GPUObject*>::Iterator i = gpuObjects_.Find(object);
+    if (i != gpuObjects_.End())
+        gpuObjects_.Erase(i);
 }
 
 unsigned Graphics::GetAlphaFormat()

Engine/Physics/PhysicsWorld.cpp

@@ -362,14 +362,9 @@ void PhysicsWorld::AddRigidBody(RigidBody* body)
 
 void PhysicsWorld::RemoveRigidBody(RigidBody* body)
 {
-    for (PODVector<RigidBody*>::Iterator i = rigidBodies_.Begin(); i != rigidBodies_.End(); ++i)
-    {
-        if ((*i) == body)
-        {
-            rigidBodies_.Erase(i);
-            return;
-        }
-    }
+    PODVector<RigidBody*>::Iterator i = rigidBodies_.Find(body);
+    if (i != rigidBodies_.End())
+        rigidBodies_.Erase(i);
 }
 
 void PhysicsWorld::SendCollisionEvents()

Engine/Resource/ResourceCache.cpp

@@ -149,7 +149,7 @@ void ResourceCache::RemovePackageFile(PackageFile* package, bool ReleaseResource
 {
     for (Vector<SharedPtr<PackageFile> >::Iterator i = packages_.Begin(); i != packages_.End(); ++i)
     {
-        if ((*i) == package)
+        if (*i == package)
         {
             if (ReleaseResources)
                 ReleasePackageResources(*i, forceRelease);

Engine/Scene/Node.cpp

@@ -463,7 +463,7 @@ void Node::RemoveChild(Node* node)
     
     for (Vector<SharedPtr<Node> >::Iterator i = children_.Begin(); i != children_.End(); ++i)
     {
-        if (i->Get() == node)
+        if (*i == node)
         {
             RemoveChild(i);
             return;
@@ -538,7 +538,7 @@ void Node::AddListener(Component* component)
     // Check for not adding twice
     for (Vector<WeakPtr<Component> >::Iterator i = listeners_.Begin(); i != listeners_.End(); ++i)
     {
-        if ((*i) == component)
+        if (*i == component)
             return;
     }
     
@@ -552,7 +552,7 @@ void Node::RemoveListener(Component* component)
 {
     for (Vector<WeakPtr<Component> >::Iterator i = listeners_.Begin(); i != listeners_.End(); ++i)
     {
-        if ((*i) == component)
+        if (*i == component)
         {
             listeners_.Erase(i);
             return;

Engine/UI/UIElement.cpp

@@ -792,7 +792,7 @@ void UIElement::RemoveChild(UIElement* element)
 {
     for (Vector<SharedPtr<UIElement> >::Iterator i = children_.Begin(); i != children_.End(); ++i)
     {
-        if ((*i) == element)
+        if (*i == element)
         {
             element->parent_ = 0;
             element->MarkDirty();

Tools/AssetImporter/AssetImporter.cpp

@@ -516,7 +516,7 @@ void CollectBones(OutModel& model)
         aiNode* commonParent = (*rootNodes.Begin())->mParent;
         for (Set<aiNode*>::Iterator i = rootNodes.Begin(); i != rootNodes.End(); ++i)
         {
-            if ((*i) != commonParent)
+            if (*i != commonParent)
             {
                 if (!commonParent || (*i)->mParent != commonParent)
                     ErrorExit("Skeleton with multiple root nodes found, not supported");