xrCDB: use range-based for

OpenXRay · Dec 19, 2017 · 4807cad · 4807cad
1 parent ad7c518
commit 4807cad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/src/xrCDB/ISpatial_q_box.cpp b/src/xrCDB/ISpatial_q_box.cpp
@@ -23,6 +23,7 @@ class walker
         box.setb(center, size);
         space = _space;
     }
+
     void walk(ISpatial_NODE* N, Fvector& n_C, float n_R)
     {
         // box
@@ -33,11 +34,9 @@ class walker
             return;
 
         // test items
-        xr_vector<ISpatial*>::iterator _it = N->items.begin();
-        xr_vector<ISpatial*>::iterator _end = N->items.end();
-        for (; _it != _end; _it++)
+        for (auto& it : N->items)
         {
-            ISpatial* S = *_it;
+            ISpatial* S = it;
             if (0 == (S->GetSpatialData().type & mask))
                 continue;
 

diff --git a/src/xrCDB/ISpatial_q_frustum.cpp b/src/xrCDB/ISpatial_q_frustum.cpp
@@ -29,11 +29,9 @@ class walker
             return;
 
         // test items
-        xr_vector<ISpatial*>::iterator _it = N->items.begin();
-        xr_vector<ISpatial*>::iterator _end = N->items.end();
-        for (; _it != _end; _it++)
+        for (auto& it : N->items)
         {
-            ISpatial* S = *_it;
+            ISpatial* S = it;
             if (0 == (S->GetSpatialData().type & mask))
                 continue;
 

diff --git a/src/xrCDB/ISpatial_q_ray.cpp b/src/xrCDB/ISpatial_q_ray.cpp
@@ -290,11 +290,9 @@ class _MM_ALIGN16 walker
         }
 
         // test items
-        xr_vector<ISpatial*>::iterator _it = N->items.begin();
-        xr_vector<ISpatial*>::iterator _end = N->items.end();
-        for (; _it != _end; _it++)
+        for (auto& it : N->items)
         {
-            ISpatial* S = *_it;
+            ISpatial* S = it;
             if (mask != (S->GetSpatialData().type & mask))
                 continue;
             Fsphere& sS = S->GetSpatialData().sphere;

diff --git a/src/xrCDB/xrCDB_Collector.cpp b/src/xrCDB/xrCDB_Collector.cpp
@@ -15,6 +15,7 @@ u32 Collector::VPack(const Fvector& V, float eps)
     for (; I != E; I++)
         if (I->similar(V, eps))
             return u32(I - verts.begin());
+
     verts.push_back(V);
     return verts.size() - 1;
 }
@@ -364,8 +365,7 @@ u32 CollectorPacked::VPack(const Fvector& V)
     clamp(iz, (u32)0, clpMZ);
 
     {
-        DWORDList* vl;
-        vl = &(VM[ix][iy][iz]);
+        DWORDList* vl = &(VM[ix][iy][iz]);
         for (DWORDIt it = vl->begin(); it != vl->end(); it++)
             if (verts[*it].similar(V))
             {

diff --git a/src/xrCDB/xr_area.cpp b/src/xrCDB/xr_area.cpp
@@ -58,11 +58,9 @@ int CObjectSpace::GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<IGameObj
     g_SpatialSpace->q_box(q_spatial, 0, STYPE_COLLIDEABLE, point, B);
 
     // Iterate
-    xr_vector<ISpatial*>::iterator it = q_spatial.begin();
-    xr_vector<ISpatial*>::iterator end = q_spatial.end();
-    for (; it != end; it++)
+    for (auto& it : q_spatial)
     {
-        IGameObject* O = (*it)->dcast_GameObject();
+        IGameObject* O = it->dcast_GameObject();
         if (0 == O)
             continue;
         if (O == ignore_object)