[Bf-blender-cvs] [5266e17ed54] master: Cleanup: Modernize iterators.

Jeroen Bakker noreply at git.blender.org
Tue Mar 16 15:08:37 CET 2021


Commit: 5266e17ed545670cb2182eae9d748b38f70020ac
Author: Jeroen Bakker
Date:   Tue Mar 16 13:47:30 2021 +0100
Branches: master
https://developer.blender.org/rB5266e17ed545670cb2182eae9d748b38f70020ac

Cleanup: Modernize iterators.

===================================================================

M	source/blender/compositor/intern/COM_NodeGraph.cc
M	source/blender/compositor/intern/COM_NodeOperation.cc
M	source/blender/compositor/intern/COM_NodeOperationBuilder.cc

===================================================================

diff --git a/source/blender/compositor/intern/COM_NodeGraph.cc b/source/blender/compositor/intern/COM_NodeGraph.cc
index 89b5a660dbd..f932acfa49e 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cc
+++ b/source/blender/compositor/intern/COM_NodeGraph.cc
@@ -202,8 +202,7 @@ void NodeGraph::add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink
   }
 
   NodeInputs inputs = find_inputs(node_range, b_nodelink->tosock);
-  for (NodeInputs::const_iterator it = inputs.begin(); it != inputs.end(); ++it) {
-    NodeInput *input = *it;
+  for (NodeInput *input : inputs) {
     if (input->isLinked()) {
       continue;
     }
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc
index ce7d3a6389e..0cc642479ac 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cc
+++ b/source/blender/compositor/intern/COM_NodeOperation.cc
@@ -151,8 +151,7 @@ NodeOperation *NodeOperation::getInputOperation(unsigned int inputSocketIndex)
 
 void NodeOperation::getConnectedInputSockets(Inputs *sockets)
 {
-  for (Inputs::const_iterator it = m_inputs.begin(); it != m_inputs.end(); ++it) {
-    NodeOperationInput *input = *it;
+  for (NodeOperationInput *input : m_inputs) {
     if (input->isConnected()) {
       sockets->push_back(input);
     }
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
index 688b693080f..6fdedfef241 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
@@ -270,8 +270,7 @@ void NodeOperationBuilder::registerViewer(ViewerOperation *viewer)
 void NodeOperationBuilder::add_datatype_conversions()
 {
   Links convert_links;
-  for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
-    const Link &link = *it;
+  for (const Link &link : m_links) {
 
     /* proxy operations can skip data type conversion */
     NodeOperation *from_op = &link.from()->getOperation();
@@ -284,8 +283,7 @@ void NodeOperationBuilder::add_datatype_conversions()
       convert_links.push_back(link);
     }
   }
-  for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); ++it) {
-    const Link &link = *it;
+  for (const Link &link : convert_links) {
     NodeOperation *converter = COM_convert_data_type(*link.from(), *link.to());
     if (converter) {
       addOperation(converter);



More information about the Bf-blender-cvs mailing list