[Bf-blender-cvs] [ffad1508681] functions-experimental-refactor: rename

[Jacques Lucke]

Commit: ffad1508681c59a4349dc49d2e8efde295e78fe1
Author: Jacques Lucke
Date:   Tue Oct 8 10:45:30 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rBffad1508681c59a4349dc49d2e8efde295e78fe1

rename

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

R087	source/blender/blenkernel/BKE_function_cpp.h	source/blender/blenkernel/BKE_cpp_function.h
M	source/blender/blenkernel/BKE_cpp_type.h
M	source/blender/blenkernel/BKE_cpp_types.h
M	source/blender/blenkernel/CMakeLists.txt
R085	source/blender/blenkernel/intern/function_cpp.cc	source/blender/blenkernel/intern/cpp_function.cc

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

diff --git a/source/blender/blenkernel/BKE_function_cpp.h b/source/blender/blenkernel/BKE_cpp_function.h
similarity index 87%
rename from source/blender/blenkernel/BKE_function_cpp.h
rename to source/blender/blenkernel/BKE_cpp_function.h
index 4b8240bc4f9..93e1f647426 100644
--- a/source/blender/blenkernel/BKE_function_cpp.h
+++ b/source/blender/blenkernel/BKE_cpp_function.h
@@ -1,5 +1,5 @@
-#ifndef __BKE_FUNCTION_CPP_H__
-#define __BKE_FUNCTION_CPP_H__
+#ifndef __BKE_CPP_FUNCTION_H__
+#define __BKE_CPP_FUNCTION_H__
 
 #include "BKE_cpp_type.h"
 #include "BKE_tuple.h"
@@ -13,7 +13,7 @@ using BLI::StringRef;
 using BLI::StringRefNull;
 using BLI::Vector;
 
-class FunctionCPP;
+class CPPFunction;
 
 struct SignatureData {
   std::string name;
@@ -27,7 +27,7 @@ class SignatureBuilderCPP {
  private:
   SignatureData m_data;
 
-  friend FunctionCPP;
+  friend CPPFunction;
 
  public:
   void set_name(StringRef name)
@@ -48,14 +48,14 @@ class SignatureBuilderCPP {
   }
 };
 
-class FunctionCPP {
+class CPPFunction {
  private:
   SignatureData m_signature;
 
  public:
-  FunctionCPP();
+  CPPFunction();
 
-  virtual ~FunctionCPP();
+  virtual ~CPPFunction();
 
   StringRefNull name() const
   {
@@ -88,4 +88,4 @@ class FunctionCPP {
 
 }  // namespace BKE
 
-#endif /* __BKE_FUNCTION_CPP_H__ */
\ No newline at end of file
+#endif /* __BKE_CPP_FUNCTION_H__ */
\ No newline at end of file
diff --git a/source/blender/blenkernel/BKE_cpp_type.h b/source/blender/blenkernel/BKE_cpp_type.h
index 9c762b21121..8e94652f88b 100644
--- a/source/blender/blenkernel/BKE_cpp_type.h
+++ b/source/blender/blenkernel/BKE_cpp_type.h
@@ -1,5 +1,5 @@
-#ifndef __BKE_DATA_TYPE_H__
-#define __BKE_DATA_TYPE_H__
+#ifndef __BKE_CPP_TYPE_H__
+#define __BKE_CPP_TYPE_H__
 
 #include "BLI_string_ref.h"
 #include "BLI_utility_mixins.h"
@@ -170,4 +170,4 @@ class CPPType {
 
 }  // namespace BKE
 
-#endif /* __BKE_DATA_TYPE_H__ */
+#endif /* __BKE_CPP_TYPE_H__ */
diff --git a/source/blender/blenkernel/BKE_cpp_types.h b/source/blender/blenkernel/BKE_cpp_types.h
index 0f2fc5c9ee4..940fc89e726 100644
--- a/source/blender/blenkernel/BKE_cpp_types.h
+++ b/source/blender/blenkernel/BKE_cpp_types.h
@@ -1,5 +1,5 @@
-#ifndef __BKE_DATA_TYPES_H__
-#define __BKE_DATA_TYPES_H__
+#ifndef __BKE_CPP_TYPES_H__
+#define __BKE_CPP_TYPES_H__
 
 #include "BKE_cpp_type.h"
 
@@ -12,4 +12,4 @@ template<typename T> CPPType &get_cpp_type();
 
 }  // namespace BKE
 
-#endif /* __BKE_DATA_TYPES_H__ */
+#endif /* __BKE_CPP_TYPES_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index e8b1a17e3a2..ad339f865d1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -120,7 +120,7 @@ set(SRC
   intern/fmodifier.c
   intern/font.c
   intern/freestyle.c
-  intern/function_cpp.cc
+  intern/cpp_function.cc
   intern/generic_array_ref.cc
   intern/gpencil.c
   intern/gpencil_modifier.c
diff --git a/source/blender/blenkernel/intern/function_cpp.cc b/source/blender/blenkernel/intern/cpp_function.cc
similarity index 85%
rename from source/blender/blenkernel/intern/function_cpp.cc
rename to source/blender/blenkernel/intern/cpp_function.cc
index f25c3596fe4..fa1168ca6ef 100644
--- a/source/blender/blenkernel/intern/function_cpp.cc
+++ b/source/blender/blenkernel/intern/cpp_function.cc
@@ -1,21 +1,21 @@
-#include "BKE_function_cpp.h"
+#include "BKE_cpp_function.h"
 #include "BKE_cpp_types.h"
 #include "BKE_generic_array_ref.h"
 
 namespace BKE {
 
-FunctionCPP::FunctionCPP()
+CPPFunction::CPPFunction()
 {
   SignatureBuilderCPP signature;
   this->signature(signature);
   m_signature = std::move(signature.m_data);
 }
 
-FunctionCPP::~FunctionCPP()
+CPPFunction::~CPPFunction()
 {
 }
 
-class AddFloatsFunction : public FunctionCPP {
+class AddFloatsFunction : public CPPFunction {
   void signature(SignatureBuilderCPP &signature) override
   {
     signature.add_input("A", get_cpp_type<float>());
@@ -32,7 +32,7 @@ class AddFloatsFunction : public FunctionCPP {
   }
 };
 
-class AddFloatsArray : public FunctionCPP {
+class AddFloatsArray : public CPPFunction {
   void signature(SignatureBuilderCPP &signature) override
   {
     signature.add_input("A", get_generic_array_ref_cpp_type(get_cpp_type<float>()));