[Bf-blender-cvs] [6dedb028d88] functions: use string ref in more places

[Jacques Lucke]

Commit: 6dedb028d886a0e7fcd28afced45d8a7e199836f
Author: Jacques Lucke
Date:   Wed May 15 11:17:20 2019 +0200
Branches: functions
https://developer.blender.org/rB6dedb028d886a0e7fcd28afced45d8a7e199836f

use string ref in more places

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

M	source/blender/functions/core/data_flow_graph.hpp
M	source/blender/functions/core/data_flow_graph_builder.cpp
M	source/blender/functions/core/data_flow_graph_builder.hpp
M	source/blender/functions/core/parameter.hpp
M	source/blender/functions/core/type.hpp

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

diff --git a/source/blender/functions/core/data_flow_graph.hpp b/source/blender/functions/core/data_flow_graph.hpp
index 1aed1c5695b..cc0f9e07d38 100644
--- a/source/blender/functions/core/data_flow_graph.hpp
+++ b/source/blender/functions/core/data_flow_graph.hpp
@@ -327,7 +327,7 @@ class DataFlowGraph : public RefCountedBase {
     return this->index_of_output(output_socket.id());
   }
 
-  const std::string &name_of_socket(DFGraphSocket socket)
+  const StringRefNull name_of_socket(DFGraphSocket socket)
   {
     if (socket.is_input()) {
       return this->name_of_input(socket.id());
@@ -347,12 +347,12 @@ class DataFlowGraph : public RefCountedBase {
     }
   }
 
-  const std::string &name_of_input(uint input_socket)
+  const StringRefNull name_of_input(uint input_socket)
   {
     return this->input_parameter(input_socket).name();
   }
 
-  const std::string &name_of_output(uint output_socket)
+  const StringRefNull name_of_output(uint output_socket)
   {
     return this->output_parameter(output_socket).name();
   }
diff --git a/source/blender/functions/core/data_flow_graph_builder.cpp b/source/blender/functions/core/data_flow_graph_builder.cpp
index 8ad3a0f7bfb..1d2a3e74e79 100644
--- a/source/blender/functions/core/data_flow_graph_builder.cpp
+++ b/source/blender/functions/core/data_flow_graph_builder.cpp
@@ -12,7 +12,7 @@ SharedType &DFGB_Socket::type() const
   }
 }
 
-std::string DFGB_Socket::name() const
+const StringRefNull DFGB_Socket::name() const
 {
   if (m_is_output) {
     return this->node()->signature().outputs()[m_index].name();
diff --git a/source/blender/functions/core/data_flow_graph_builder.hpp b/source/blender/functions/core/data_flow_graph_builder.hpp
index b5019234484..0f6e58213c4 100644
--- a/source/blender/functions/core/data_flow_graph_builder.hpp
+++ b/source/blender/functions/core/data_flow_graph_builder.hpp
@@ -33,7 +33,7 @@ class DFGB_Socket {
   inline DataFlowGraphBuilder &builder();
 
   SharedType &type() const;
-  std::string name() const;
+  const StringRefNull name() const;
 
   inline Optional<DFGB_Socket> origin();
   inline ArrayRef<DFGB_Socket> targets();
diff --git a/source/blender/functions/core/parameter.hpp b/source/blender/functions/core/parameter.hpp
index 08537e656d8..fdad1771f60 100644
--- a/source/blender/functions/core/parameter.hpp
+++ b/source/blender/functions/core/parameter.hpp
@@ -6,11 +6,11 @@ namespace FN {
 
 class Parameter {
  public:
-  Parameter(const std::string &name, const SharedType &type) : m_name(name), m_type(type)
+  Parameter(StringRef name, const SharedType &type) : m_name(name.to_std_string()), m_type(type)
   {
   }
 
-  const std::string &name() const
+  const StringRefNull name() const
   {
     return m_name;
   }
@@ -34,14 +34,14 @@ class Parameter {
 
 class InputParameter final : public Parameter {
  public:
-  InputParameter(const std::string &name, const SharedType &type) : Parameter(name, type)
+  InputParameter(StringRef name, const SharedType &type) : Parameter(name, type)
   {
   }
 };
 
 class OutputParameter final : public Parameter {
  public:
-  OutputParameter(const std::string &name, const SharedType &type) : Parameter(name, type)
+  OutputParameter(StringRef name, const SharedType &type) : Parameter(name, type)
   {
   }
 };
diff --git a/source/blender/functions/core/type.hpp b/source/blender/functions/core/type.hpp
index 50bba24ab1f..2a4f137207e 100644
--- a/source/blender/functions/core/type.hpp
+++ b/source/blender/functions/core/type.hpp
@@ -36,7 +36,7 @@ class TypeExtension {
 class Type final : public RefCountedBase {
  public:
   Type() = delete;
-  Type(const std::string &name) : m_name(name)
+  Type(StringRef name) : m_name(name.to_std_string())
   {
   }