From 0b0cb56c1ed235dd27d21a780dcab5d4e915369c Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 29 Jun 2015 15:42:34 -0300
Subject: [PATCH] Replace some UI_FOREACH_WIDGET() with range-based for loops

---
 src/ui/manager.cpp  | 28 ++++++++++++++--------------
 src/ui/tooltips.cpp |  4 ++--
 src/ui/widget.cpp   |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 4815ce86f..f56662c8d 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -557,11 +557,11 @@ void Manager::setFocus(Widget* widget)
 
       Message* msg = new Message(kFocusLeaveMessage);
 
-      UI_FOREACH_WIDGET(focus_parents, it) {
+      for (Widget* parent1 : focus_parents) {
         if (widget) {
-          UI_FOREACH_WIDGET(widget_parents, it2) {
-            if (*it == *it2) {
-              common_parent = *it;
+          for (Widget* parent2 : widget_parents) {
+            if (parent1 == parent2) {
+              common_parent = parent1;
               break;
             }
           }
@@ -569,9 +569,9 @@ void Manager::setFocus(Widget* widget)
             break;
         }
 
-        if ((*it)->hasFocus()) {
-          (*it)->disableFlags(HAS_FOCUS);
-          msg->addRecipient(*it);
+        if (parent1->hasFocus()) {
+          parent1->disableFlags(HAS_FOCUS);
+          msg->addRecipient(parent1);
         }
       }
 
@@ -638,11 +638,11 @@ void Manager::setMouse(Widget* widget)
 
       Message* msg = new Message(kMouseLeaveMessage);
 
-      UI_FOREACH_WIDGET(mouse_parents, it) {
+      for (Widget* parent1 : mouse_parents) {
         if (widget) {
-          UI_FOREACH_WIDGET(widget_parents, it2) {
-            if (*it == *it2) {
-              common_parent = *it;
+          for (Widget* parent2 : widget_parents) {
+            if (parent1 == parent2) {
+              common_parent = parent1;
               break;
             }
           }
@@ -650,9 +650,9 @@ void Manager::setMouse(Widget* widget)
             break;
         }
 
-        if ((*it)->hasMouse()) {
-          (*it)->disableFlags(HAS_MOUSE);
-          msg->addRecipient(*it);
+        if (parent1->hasMouse()) {
+          parent1->disableFlags(HAS_MOUSE);
+          msg->addRecipient(parent1);
         }
       }
 
diff --git a/src/ui/tooltips.cpp b/src/ui/tooltips.cpp
index b8c4db673..fd5545fce 100644
--- a/src/ui/tooltips.cpp
+++ b/src/ui/tooltips.cpp
@@ -59,8 +59,8 @@ bool TooltipManager::onProcessMessage(Message* msg)
   switch (msg->type()) {
 
     case kMouseEnterMessage: {
-      UI_FOREACH_WIDGET(msg->recipients(), itWidget) {
-        Tips::iterator it = m_tips.find(*itWidget);
+      for (Widget* widget : msg->recipients()) {
+        Tips::iterator it = m_tips.find(widget);
         if (it != m_tips.end()) {
           m_target.widget = it->first;
           m_target.tipInfo = it->second;
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 1cdc518fd..2d72c7fe9 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -410,14 +410,14 @@ Widget* Widget::getPreviousSibling()
 
 Widget* Widget::pick(const gfx::Point& pt)
 {
-  Widget* inside, *picked = NULL;
+  Widget* inside, *picked = nullptr;
 
   if (!hasFlags(HIDDEN) &&          // Is visible
       getBounds().contains(pt)) {   // The point is inside the bounds
     picked = this;
 
-    UI_FOREACH_WIDGET(m_children, it) {
-      inside = (*it)->pick(pt);
+    for (Widget* child : m_children) {
+      inside = child->pick(pt);
       if (inside) {
         picked = inside;
         break;