From d4c673d4c6dc3323327ec7bd5969551e410885a8 Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jeroen@blender.org>
Date: Fri, 5 Mar 2021 16:28:08 +0100
Subject: Cleanup: use blender::Vector.

---
 source/blender/compositor/intern/COM_NodeGraph.cpp |  2 +-
 source/blender/compositor/intern/COM_NodeGraph.h   | 26 +++++++---------------
 .../compositor/intern/COM_NodeOperationBuilder.cpp |  8 +++----
 3 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'source')

diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp
index dc5ae52ba8e..421a762d9b5 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cpp
+++ b/source/blender/compositor/intern/COM_NodeGraph.cpp
@@ -90,7 +90,7 @@ void NodeGraph::add_node(Node *node,
 
 void NodeGraph::add_link(NodeOutput *fromSocket, NodeInput *toSocket)
 {
-  m_links.push_back(Link(fromSocket, toSocket));
+  m_links.append(Link(fromSocket, toSocket));
 
   /* register with the input */
   toSocket->setLink(fromSocket);
diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h
index 7252d546fce..990e3a30831 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.h
+++ b/source/blender/compositor/intern/COM_NodeGraph.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "BLI_vector.hh"
+
 #include <map>
 #include <set>
 #include <vector>
@@ -39,33 +41,21 @@ class NodeOutput;
  */
 class NodeGraph {
  public:
-  class Link {
-   private:
-    NodeOutput *m_from;
-    NodeInput *m_to;
-
-   public:
-    Link(NodeOutput *from, NodeInput *to) : m_from(from), m_to(to)
-    {
-    }
+  struct Link {
+    NodeOutput *from;
+    NodeInput *to;
 
-    NodeOutput *getFromSocket() const
-    {
-      return m_from;
-    }
-    NodeInput *getToSocket() const
+    Link(NodeOutput *from, NodeInput *to) : from(from), to(to)
     {
-      return m_to;
     }
   };
 
   typedef std::vector<Node *> Nodes;
   typedef Nodes::iterator NodeIterator;
-  typedef std::vector<Link> Links;
 
  private:
   Nodes m_nodes;
-  Links m_links;
+  blender::Vector<Link> m_links;
 
  public:
   NodeGraph();
@@ -75,7 +65,7 @@ class NodeGraph {
   {
     return m_nodes;
   }
-  const Links &links() const
+  const blender::Vector<Link> &links() const
   {
     return m_links;
   }
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index d08290a2fb9..507dfab2627 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -72,11 +72,9 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
     inverse_input_map[it->second].push_back(it->first);
   }
 
-  for (NodeGraph::Links::const_iterator it = m_graph.links().begin(); it != m_graph.links().end();
-       ++it) {
-    const NodeGraph::Link &link = *it;
-    NodeOutput *from = link.getFromSocket();
-    NodeInput *to = link.getToSocket();
+  for (const NodeGraph::Link &link : m_graph.links()) {
+    NodeOutput *from = link.from;
+    NodeInput *to = link.to;
 
     NodeOperationOutput *op_from = find_operation_output(m_output_map, from);
     const OpInputs &op_to_list = find_operation_inputs(inverse_input_map, to);
-- 
cgit v1.2.3