From 48071e171de41a23197c7328ba038331a936e0eb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 19 Jan 2013 15:25:24 +0300
Subject: Replace for to FOR_EACH in some classes.

---
 src/touchmanager.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/touchmanager.cpp')

diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index c8d813998..18bcd4a0d 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -158,11 +158,8 @@ void TouchManager::clear()
     Theme *theme = Theme::instance();
     if (!theme)
         return;
-    for (TouchItemVectorCIter it = mObjects.begin(), it_end = mObjects.end();
-         it != it_end; ++ it)
-    {
+    FOR_EACH (TouchItemVectorCIter, it, mObjects)
         unload(*it);
-    }
     mObjects.clear();
     mRedraw = true;
 }
@@ -175,9 +172,7 @@ void TouchManager::draw()
         {
             mRedraw = false;
             mVertexes->clear();
-            for (TouchItemVectorCIter it = mObjects.begin(),
-                 it_end = mObjects.end();
-                 it != it_end; ++ it)
+            FOR_EACH (TouchItemVectorCIter, it, mObjects)
             {
                 const TouchItem *const item = *it;
                 if (item && item->images && (mShow ||
@@ -199,9 +194,7 @@ void TouchManager::draw()
     }
     else
     {
-        for (TouchItemVectorCIter it = mObjects.begin(),
-             it_end = mObjects.end();
-             it != it_end; ++ it)
+        FOR_EACH (TouchItemVectorCIter, it, mObjects)
         {
             const TouchItem *const item = *it;
             if (item && item->images && (mShow ||
@@ -226,8 +219,7 @@ bool TouchManager::processEvent(const MouseInput &mouseInput)
     const int x = mouseInput.getTouchX();
     const int y = mouseInput.getTouchY();
 
-    for (TouchItemVectorCIter it = mObjects.begin(), it_end = mObjects.end();
-         it != it_end; ++ it)
+    FOR_EACH (TouchItemVectorCIter, it, mObjects)
     {
         const TouchItem *const item = *it;
         if (!item || (!mShow && (item != mKeyboard || !mShowKeyboard)))
@@ -278,8 +270,7 @@ bool TouchManager::isActionActive(const int index) const
 void TouchManager::resize(int width, int height)
 {
     mRedraw = true;
-    for (TouchItemVectorCIter it = mObjects.begin(),
-         it_end = mObjects.end(); it != it_end; ++ it)
+    FOR_EACH (TouchItemVectorCIter, it, mObjects)
     {
         TouchItem *const item = *it;
         if (!item)
@@ -338,8 +329,7 @@ void TouchManager::unloadTouchItem(TouchItem **unloadItem)
     Theme *theme = Theme::instance();
     if (!theme)
         return;
-    for (TouchItemVectorIter it = mObjects.begin(), it_end = mObjects.end();
-         it != it_end; ++ it)
+    FOR_EACH (TouchItemVectorIter, it, mObjects)
     {
         TouchItem *item = *it;
         if (item && *unloadItem == item)
-- 
cgit v1.2.3-60-g2f50