Cleanup: use `_` suffix for non-public data members in Compositor

For code style and clarity.

7 files changed, 24 insertions, 24 deletions

diff --git a/source/blender/compositor/intern/COM_BufferOperation.cc b/source/blender/compositor/intern/COM_BufferOperation.cc
index 21238733925..81ea645e482 100644
--- a/source/blender/compositor/intern/COM_BufferOperation.cc
+++ b/source/blender/compositor/intern/COM_BufferOperation.cc
@@ -26,8 +26,8 @@ BufferOperation::BufferOperation(MemoryBuffer *buffer, DataType data_type)
   inflated_buffer_ = nullptr;
   set_canvas(buffer->get_rect());
   add_output_socket(data_type);
-  flags.is_constant_operation = buffer_->is_a_single_elem();
-  flags.is_fullframe_operation = false;
+  flags_.is_constant_operation = buffer_->is_a_single_elem();
+  flags_.is_fullframe_operation = false;
 }
 
 const float *BufferOperation::get_constant_elem()
diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
index 7ccf6f76d9f..d118027202a 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
@@ -7,7 +7,7 @@ MultiThreadedOperation::MultiThreadedOperation()
 {
   num_passes_ = 1;
   current_pass_ = 0;
-  flags.is_fullframe_operation = true;
+  flags_.is_fullframe_operation = true;
 }
 
 void MultiThreadedOperation::update_memory_buffer(MemoryBuffer *output,
diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc
index 58b2b195579..67af9496ca4 100644
--- a/source/blender/compositor/intern/COM_Node.cc
+++ b/source/blender/compositor/intern/COM_Node.cc
@@ -66,11 +66,11 @@ Node::Node(bNode *editor_node, bool create_sockets)
 
 Node::~Node()
 {
-  while (!this->outputs.is_empty()) {
-    delete (this->outputs.pop_last());
+  while (!outputs_.is_empty()) {
+    delete (outputs_.pop_last());
   }
-  while (!this->inputs.is_empty()) {
-    delete (this->inputs.pop_last());
+  while (!inputs_.is_empty()) {
+    delete (inputs_.pop_last());
   }
 }
 
@@ -82,7 +82,7 @@ void Node::add_input_socket(DataType datatype)
 void Node::add_input_socket(DataType datatype, bNodeSocket *bSocket)
 {
   NodeInput *socket = new NodeInput(this, bSocket, datatype);
-  this->inputs.append(socket);
+  inputs_.append(socket);
 }
 
 void Node::add_output_socket(DataType datatype)
@@ -92,17 +92,17 @@ void Node::add_output_socket(DataType datatype)
 void Node::add_output_socket(DataType datatype, bNodeSocket *bSocket)
 {
   NodeOutput *socket = new NodeOutput(this, bSocket, datatype);
-  outputs.append(socket);
+  outputs_.append(socket);
 }
 
 NodeOutput *Node::get_output_socket(unsigned int index) const
 {
-  return outputs[index];
+  return outputs_[index];
 }
 
 NodeInput *Node::get_input_socket(unsigned int index) const
 {
-  return inputs[index];
+  return inputs_[index];
 }
 
 bNodeSocket *Node::get_editor_input_socket(int editor_node_input_socket_index)
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index 41283b821bb..bd8b37276a0 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -62,12 +62,12 @@ class Node {
   /**
    * \brief the list of actual input-sockets \see NodeInput
    */
-  Vector<NodeInput *> inputs;
+  Vector<NodeInput *> inputs_;
 
   /**
    * \brief the list of actual output-sockets \see NodeOutput
    */
-  Vector<NodeOutput *> outputs;
+  Vector<NodeOutput *> outputs_;
 
  public:
   Node(bNode *editor_node, bool create_sockets = true);
@@ -114,7 +114,7 @@ class Node {
    */
   const Vector<NodeInput *> &get_input_sockets() const
   {
-    return this->inputs;
+    return inputs_;
   }
 
   /**
@@ -122,7 +122,7 @@ class Node {
    */
   const Vector<NodeOutput *> &get_output_sockets() const
   {
-    return this->outputs;
+    return outputs_;
   }
 
   /**
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc
index 41c645b9eea..8a7ae1f4fcb 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cc
+++ b/source/blender/compositor/intern/COM_NodeOperation.cc
@@ -205,7 +205,7 @@ void NodeOperation::deinit_execution()
 void NodeOperation::set_canvas(const rcti &canvas_area)
 {
   canvas_ = canvas_area;
-  flags.is_canvas_set = true;
+  flags_.is_canvas_set = true;
 }
 
 const rcti &NodeOperation::get_canvas() const
@@ -220,7 +220,7 @@ const rcti &NodeOperation::get_canvas() const
 void NodeOperation::unset_canvas()
 {
   BLI_assert(inputs_.size() == 0);
-  flags.is_canvas_set = false;
+  flags_.is_canvas_set = false;
 }
 
 SocketReader *NodeOperation::get_input_socket_reader(unsigned int index)
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 3c172faca50..627fffb1ec7 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -356,7 +356,7 @@ class NodeOperation {
   /**
    * Flags how to evaluate this operation.
    */
-  NodeOperationFlags flags;
+  NodeOperationFlags flags_;
 
   ExecutionSystem *exec_system_;
 
@@ -390,7 +390,7 @@ class NodeOperation {
 
   const NodeOperationFlags get_flags() const
   {
-    return flags;
+    return flags_;
   }
 
   std::optional<NodeOperationHash> generate_hash();
@@ -674,12 +674,12 @@ class NodeOperation {
   void set_width(unsigned int width)
   {
     canvas_.xmax = canvas_.xmin + width;
-    this->flags.is_canvas_set = true;
+    flags_.is_canvas_set = true;
   }
   void set_height(unsigned int height)
   {
     canvas_.ymax = canvas_.ymin + height;
-    this->flags.is_canvas_set = true;
+    flags_.is_canvas_set = true;
   }
 
   SocketReader *get_input_socket_reader(unsigned int index);
@@ -697,7 +697,7 @@ class NodeOperation {
    */
   void set_complex(bool complex)
   {
-    this->flags.complex = complex;
+    flags_.complex = complex;
   }
 
   /**
diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.cc b/source/blender/compositor/intern/COM_SingleThreadedOperation.cc
index fab6c352a02..5ad324459fd 100644
--- a/source/blender/compositor/intern/COM_SingleThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.cc
@@ -23,8 +23,8 @@ namespace blender::compositor {
 SingleThreadedOperation::SingleThreadedOperation()
 {
   cached_instance_ = nullptr;
-  flags.complex = true;
-  flags.single_threaded = true;
+  flags_.complex = true;
+  flags_.single_threaded = true;
 }
 
 void SingleThreadedOperation::init_execution()