[Bf-blender-cvs] [b51d6e8012e] master: Cleanup: Use blender namespace in blenkernel

[Jacques Lucke]

Commit: b51d6e8012e56148228ed7b047356c9ec653d168
Author: Jacques Lucke
Date:   Mon Jun 29 11:48:22 2020 +0200
Branches: master
https://developer.blender.org/rBb51d6e8012e56148228ed7b047356c9ec653d168

Cleanup: Use blender namespace in blenkernel

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

M	source/blender/blenkernel/BKE_derived_node_tree.hh
M	source/blender/blenkernel/BKE_node_tree_ref.hh
M	source/blender/blenkernel/intern/derived_node_tree.cc
M	source/blender/blenkernel/intern/node_tree_ref.cc

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

diff --git a/source/blender/blenkernel/BKE_derived_node_tree.hh b/source/blender/blenkernel/BKE_derived_node_tree.hh
index 009d9b747f9..f84d5a7f89f 100644
--- a/source/blender/blenkernel/BKE_derived_node_tree.hh
+++ b/source/blender/blenkernel/BKE_derived_node_tree.hh
@@ -32,7 +32,8 @@
 
 #include "BKE_node_tree_ref.hh"
 
-namespace BKE {
+namespace blender {
+namespace bke {
 
 class DSocket;
 class DInputSocket;
@@ -448,6 +449,7 @@ inline Span<const DOutputSocket *> DerivedNodeTree::output_sockets() const
   return m_output_sockets.as_span();
 }
 
-}  // namespace BKE
+}  // namespace bke
+}  // namespace blender
 
 #endif /* __BKE_DERIVED_NODE_TREE_HH__ */
diff --git a/source/blender/blenkernel/BKE_node_tree_ref.hh b/source/blender/blenkernel/BKE_node_tree_ref.hh
index 043ef957af7..e71ab83dd16 100644
--- a/source/blender/blenkernel/BKE_node_tree_ref.hh
+++ b/source/blender/blenkernel/BKE_node_tree_ref.hh
@@ -58,17 +58,8 @@
 
 #include "RNA_access.h"
 
-namespace BKE {
-
-using blender::Array;
-using blender::IndexRange;
-using blender::LinearAllocator;
-using blender::Map;
-using blender::MutableSpan;
-using blender::Span;
-using blender::StringRef;
-using blender::StringRefNull;
-using blender::Vector;
+namespace blender {
+namespace bke {
 
 class SocketRef;
 class InputSocketRef;
@@ -443,6 +434,7 @@ inline bNodeTree *NodeTreeRef::btree() const
   return m_btree;
 }
 
-}  // namespace BKE
+}  // namespace bke
+}  // namespace blender
 
 #endif /* __BKE_NODE_TREE_REF_HH__ */
diff --git a/source/blender/blenkernel/intern/derived_node_tree.cc b/source/blender/blenkernel/intern/derived_node_tree.cc
index 961fef958b7..33601468a30 100644
--- a/source/blender/blenkernel/intern/derived_node_tree.cc
+++ b/source/blender/blenkernel/intern/derived_node_tree.cc
@@ -20,7 +20,8 @@
 
 #define UNINITIALIZED_ID UINT32_MAX
 
-namespace BKE {
+namespace blender {
+namespace bke {
 
 static const NodeTreeRef &get_tree_ref(NodeTreeRefMap &node_tree_refs, bNodeTree *btree)
 {
@@ -439,4 +440,5 @@ std::string DerivedNodeTree::to_dot() const
   return digraph.to_dot_string();
 }
 
-}  // namespace BKE
+}  // namespace bke
+}  // namespace blender
diff --git a/source/blender/blenkernel/intern/node_tree_ref.cc b/source/blender/blenkernel/intern/node_tree_ref.cc
index 517c1b85aff..7209e845843 100644
--- a/source/blender/blenkernel/intern/node_tree_ref.cc
+++ b/source/blender/blenkernel/intern/node_tree_ref.cc
@@ -18,7 +18,8 @@
 
 #include "BLI_dot_export.hh"
 
-namespace BKE {
+namespace blender {
+namespace bke {
 
 NodeTreeRef::NodeTreeRef(bNodeTree *btree) : m_btree(btree)
 {
@@ -175,4 +176,5 @@ std::string NodeTreeRef::to_dot() const
   return digraph.to_dot_string();
 }
 
-}  // namespace BKE
+}  // namespace bke
+}  // namespace blender