Prefer for loop over lambda (paceholder#181)

Author: facontidavide

src/ConnectionGraphicsObject.cpp

@@ -100,9 +100,7 @@ void
 ConnectionGraphicsObject::
 move()
 {
-
-  auto moveEndPoint =
-  [this] (PortType portType)
+  for(PortType portType: { PortType::In, PortType::Out } )
   {
     if (auto node = _connection.getNode(portType))
     {
@@ -115,22 +113,18 @@ move()
                                    portType,
                                    nodeGraphics.sceneTransform());
 
-      {
-        QTransform sceneTransform = this->sceneTransform();
+      QTransform sceneTransform = this->sceneTransform();
 
-        QPointF connectionPos = sceneTransform.inverted().map(scenePos);
+      QPointF connectionPos = sceneTransform.inverted().map(scenePos);
 
-        _connection.connectionGeometry().setEndPoint(portType,
-                                                     connectionPos);
+      _connection.connectionGeometry().setEndPoint(portType,
+                                                   connectionPos);
 
-        _connection.getConnectionGraphicsObject().setGeometryChanged();
-        _connection.getConnectionGraphicsObject().update();
-      }
+      _connection.getConnectionGraphicsObject().setGeometryChanged();
+      _connection.getConnectionGraphicsObject().update();
     }
-  };
+  }
 
-  moveEndPoint(PortType::In);
-  moveEndPoint(PortType::Out);
 }
 
 void ConnectionGraphicsObject::lock(bool locked)
@@ -221,7 +215,6 @@ mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
   }
   else if (_connection.connectionState().requiresPort())
   {
-
     _scene.deleteConnection(_connection);
   }
 }

src/FlowScene.cpp

@@ -223,21 +223,17 @@ removeNode(Node& node)
   // call signal
   nodeDeleted(node);
 
-  auto deleteConnections =
-    [&node, this] (PortType portType)
-    {
-      auto nodeState = node.nodeState();
-      auto const & nodeEntries = nodeState.getEntries(portType);
-
-      for (auto &connections : nodeEntries)
-      {
-        for (auto const &pair : connections)
-          deleteConnection(*pair.second);
-      }
-    };
+  for(auto portType: {PortType::In,PortType::Out})
+  {
+    auto nodeState = node.nodeState();
+    auto const & nodeEntries = nodeState.getEntries(portType);
 
-  deleteConnections(PortType::In);
-  deleteConnections(PortType::Out);
+    for (auto &connections : nodeEntries)
+    {
+      for (auto const &pair : connections)
+        deleteConnection(*pair.second);
+    }
+  }
 
   _nodes.erase(node.id());
 }

src/FlowView.cpp

@@ -189,14 +189,8 @@ contextMenuEvent(QContextMenuEvent *event)
       {
         auto child = topLvlItem->child(i);
         auto modelName = child->data(0, Qt::UserRole).toString();
-        if (modelName.contains(text, Qt::CaseInsensitive))
-        {
-          child->setHidden(false);
-        }
-        else
-        {
-          child->setHidden(true);
-        }
+        const bool match = (modelName.contains(text, Qt::CaseInsensitive));
+        child->setHidden(!match);
       }
     }
   });

src/NodeGraphicsObject.cpp

@@ -137,25 +137,19 @@ void
 NodeGraphicsObject::
 moveConnections() const
 {
-
   NodeState const & nodeState = _node.nodeState();
 
-  auto moveConnections =
-    [&](PortType portType)
-    {
-      auto const & connectionEntries =
+  for(PortType portType: {PortType::In, PortType::Out})
+  {
+    auto const & connectionEntries =
         nodeState.getEntries(portType);
 
-      for (auto const & connections : connectionEntries)
-      {
-        for (auto & con : connections)
-          con.second->getConnectionGraphicsObject().move();
-      }
-    };
-
-  moveConnections(PortType::In);
-
-  moveConnections(PortType::Out);
+    for (auto const & connections : connectionEntries)
+    {
+      for (auto & con : connections)
+        con.second->getConnectionGraphicsObject().move();
+    }
+  };
 }
 
 void NodeGraphicsObject::lock(bool locked)
@@ -205,60 +199,55 @@ mousePressEvent(QGraphicsSceneMouseEvent * event)
     _scene.clearSelection();
   }
 
-  auto clickPort =
-    [&](PortType portToCheck)
-    {
-      NodeGeometry & nodeGeometry = _node.nodeGeometry();
-
-      // TODO do not pass sceneTransform
-      int portIndex = nodeGeometry.checkHitScenePoint(portToCheck,
-                                                      event->scenePos(),
-                                                      sceneTransform());
+  for(PortType portToCheck: {PortType::In, PortType::Out})
+  {
+    NodeGeometry & nodeGeometry = _node.nodeGeometry();
 
-      if (portIndex != INVALID)
-      {
-        NodeState const & nodeState = _node.nodeState();
+    // TODO do not pass sceneTransform
+    int portIndex = nodeGeometry.checkHitScenePoint(portToCheck,
+                                                    event->scenePos(),
+                                                    sceneTransform());
+    if (portIndex != INVALID)
+    {
+      NodeState const & nodeState = _node.nodeState();
 
-        std::unordered_map<QUuid, Connection*> connections =
+      std::unordered_map<QUuid, Connection*> connections =
           nodeState.connections(portToCheck, portIndex);
 
-        // start dragging existing connection
-        if (!connections.empty() && portToCheck == PortType::In)
-        {
-          auto con = connections.begin()->second;
+      // start dragging existing connection
+      if (!connections.empty() && portToCheck == PortType::In)
+      {
+        auto con = connections.begin()->second;
 
-          NodeConnectionInteraction interaction(_node, *con, _scene);
+        NodeConnectionInteraction interaction(_node, *con, _scene);
 
-          interaction.disconnect(portToCheck);
-        }
-        else // initialize new Connection
+        interaction.disconnect(portToCheck);
+      }
+      else // initialize new Connection
+      {
+        if (portToCheck == PortType::Out)
         {
-          if (portToCheck == PortType::Out)
+          const auto outPolicy = _node.nodeDataModel()->portOutConnectionPolicy(portIndex);
+          if (!connections.empty() &&
+              outPolicy == NodeDataModel::ConnectionPolicy::One)
           {
-            const auto outPolicy = _node.nodeDataModel()->portOutConnectionPolicy(portIndex);
-            if (!connections.empty() &&
-                outPolicy == NodeDataModel::ConnectionPolicy::One)
-            {
-              _scene.deleteConnection( *connections.begin()->second );
-            }
-
-            // todo add to FlowScene
-            auto connection = _scene.createConnection(portToCheck,
-                                                      _node,
-                                                      portIndex);
-
-            _node.nodeState().setConnection(portToCheck,
-                                            portIndex,
-                                            *connection);
-
-            connection->getConnectionGraphicsObject().grabMouse();
+            _scene.deleteConnection( *connections.begin()->second );
           }
+
+          // todo add to FlowScene
+          auto connection = _scene.createConnection(portToCheck,
+                                                    _node,
+                                                    portIndex);
+
+          _node.nodeState().setConnection(portToCheck,
+                                          portIndex,
+                                          *connection);
+
+          connection->getConnectionGraphicsObject().grabMouse();
         }
       }
-    };
-
-  clickPort(PortType::In);
-  clickPort(PortType::Out);
+    }
+  }
 
   auto pos     = event->pos();
   auto & geom  = _node.nodeGeometry();