[Bf-blender-cvs] [55ae55af664] master: Cleanup: remove unnecessary namespace specifiers

Jacques Lucke noreply at git.blender.org
Tue Jun 30 10:35:57 CEST 2020


Commit: 55ae55af6646514f54f1ea581b9d36b854dc6dd8
Author: Jacques Lucke
Date:   Tue Jun 30 10:35:50 2020 +0200
Branches: master
https://developer.blender.org/rB55ae55af6646514f54f1ea581b9d36b854dc6dd8

Cleanup: remove unnecessary namespace specifiers

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

M	source/blender/blenkernel/BKE_derived_node_tree.hh
M	source/blender/blenkernel/BKE_node_tree_ref.hh

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

diff --git a/source/blender/blenkernel/BKE_derived_node_tree.hh b/source/blender/blenkernel/BKE_derived_node_tree.hh
index f84d5a7f89f..a9a94e75d9f 100644
--- a/source/blender/blenkernel/BKE_derived_node_tree.hh
+++ b/source/blender/blenkernel/BKE_derived_node_tree.hh
@@ -43,7 +43,7 @@ class DParentNode;
 class DGroupInput;
 class DerivedNodeTree;
 
-class DSocket : blender::NonCopyable, blender::NonMovable {
+class DSocket : NonCopyable, NonMovable {
  protected:
   DNode *m_node;
   const SocketRef *m_socket_ref;
@@ -96,7 +96,7 @@ class DOutputSocket : public DSocket {
   Span<const DInputSocket *> linked_sockets() const;
 };
 
-class DGroupInput : blender::NonCopyable, blender::NonMovable {
+class DGroupInput : NonCopyable, NonMovable {
  private:
   const InputSocketRef *m_socket_ref;
   DParentNode *m_parent;
@@ -113,7 +113,7 @@ class DGroupInput : blender::NonCopyable, blender::NonMovable {
   StringRefNull name() const;
 };
 
-class DNode : blender::NonCopyable, blender::NonMovable {
+class DNode : NonCopyable, NonMovable {
  private:
   const NodeRef *m_node_ref;
   DParentNode *m_parent;
@@ -145,7 +145,7 @@ class DNode : blender::NonCopyable, blender::NonMovable {
   void destruct_with_sockets();
 };
 
-class DParentNode : blender::NonCopyable, blender::NonMovable {
+class DParentNode : NonCopyable, NonMovable {
  private:
   const NodeRef *m_node_ref;
   DParentNode *m_parent;
@@ -161,7 +161,7 @@ class DParentNode : blender::NonCopyable, blender::NonMovable {
 
 using NodeTreeRefMap = Map<bNodeTree *, std::unique_ptr<const NodeTreeRef>>;
 
-class DerivedNodeTree : blender::NonCopyable, blender::NonMovable {
+class DerivedNodeTree : NonCopyable, NonMovable {
  private:
   LinearAllocator<> m_allocator;
   bNodeTree *m_btree;
diff --git a/source/blender/blenkernel/BKE_node_tree_ref.hh b/source/blender/blenkernel/BKE_node_tree_ref.hh
index e71ab83dd16..718a93b0089 100644
--- a/source/blender/blenkernel/BKE_node_tree_ref.hh
+++ b/source/blender/blenkernel/BKE_node_tree_ref.hh
@@ -67,7 +67,7 @@ class OutputSocketRef;
 class NodeRef;
 class NodeTreeRef;
 
-class SocketRef : blender::NonCopyable, blender::NonMovable {
+class SocketRef : NonCopyable, NonMovable {
  protected:
   NodeRef *m_node;
   bNodeSocket *m_bsocket;
@@ -120,7 +120,7 @@ class OutputSocketRef final : public SocketRef {
   Span<const InputSocketRef *> directly_linked_sockets() const;
 };
 
-class NodeRef : blender::NonCopyable, blender::NonMovable {
+class NodeRef : NonCopyable, NonMovable {
  private:
   NodeTreeRef *m_tree;
   bNode *m_bnode;
@@ -155,7 +155,7 @@ class NodeRef : blender::NonCopyable, blender::NonMovable {
   bool is_group_output_node() const;
 };
 
-class NodeTreeRef : blender::NonCopyable, blender::NonMovable {
+class NodeTreeRef : NonCopyable, NonMovable {
  private:
   LinearAllocator<> m_allocator;
   bNodeTree *m_btree;



More information about the Bf-blender-cvs mailing list