Cleanup: Use enum class for DataType.

7 files changed, 31 insertions, 31 deletions

diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc
index 91439f54710..d5bce636b8c 100644
--- a/source/blender/compositor/intern/COM_Converter.cc
+++ b/source/blender/compositor/intern/COM_Converter.cc
@@ -428,22 +428,22 @@ NodeOperation *COM_convert_data_type(const NodeOperationOutput &from, const Node
   const DataType src_data_type = from.getDataType();
   const DataType dst_data_type = to.getDataType();
 
-  if (src_data_type == COM_DT_VALUE && dst_data_type == COM_DT_COLOR) {
+  if (src_data_type == DataType::Value && dst_data_type == DataType::Color) {
     return new ConvertValueToColorOperation();
   }
-  if (src_data_type == COM_DT_VALUE && dst_data_type == COM_DT_VECTOR) {
+  if (src_data_type == DataType::Value && dst_data_type == DataType::Vector) {
     return new ConvertValueToVectorOperation();
   }
-  if (src_data_type == COM_DT_COLOR && dst_data_type == COM_DT_VALUE) {
+  if (src_data_type == DataType::Color && dst_data_type == DataType::Value) {
     return new ConvertColorToValueOperation();
   }
-  if (src_data_type == COM_DT_COLOR && dst_data_type == COM_DT_VECTOR) {
+  if (src_data_type == DataType::Color && dst_data_type == DataType::Vector) {
     return new ConvertColorToVectorOperation();
   }
-  if (src_data_type == COM_DT_VECTOR && dst_data_type == COM_DT_VALUE) {
+  if (src_data_type == DataType::Vector && dst_data_type == DataType::Value) {
     return new ConvertVectorToValueOperation();
   }
-  if (src_data_type == COM_DT_VECTOR && dst_data_type == COM_DT_COLOR) {
+  if (src_data_type == DataType::Vector && dst_data_type == DataType::Color) {
     return new ConvertVectorToColorOperation();
   }
 
diff --git a/source/blender/compositor/intern/COM_Debug.cc b/source/blender/compositor/intern/COM_Debug.cc
index c97d3a4a00a..c299bd1c72d 100644
--- a/source/blender/compositor/intern/COM_Debug.cc
+++ b/source/blender/compositor/intern/COM_Debug.cc
@@ -165,13 +165,13 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system,
       }
       len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<IN_%p>", socket);
       switch (socket->getDataType()) {
-        case COM_DT_VALUE:
+        case DataType::Value:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value");
           break;
-        case COM_DT_VECTOR:
+        case DataType::Vector:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector");
           break;
-        case COM_DT_COLOR:
+        case DataType::Color:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color");
           break;
       }
@@ -203,13 +203,13 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system,
       }
       len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<OUT_%p>", socket);
       switch (socket->getDataType()) {
-        case COM_DT_VALUE:
+        case DataType::Value:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value");
           break;
-        case COM_DT_VECTOR:
+        case DataType::Vector:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector");
           break;
-        case COM_DT_COLOR:
+        case DataType::Color:
           len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color");
           break;
       }
@@ -390,13 +390,13 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
 
       std::string color;
       switch (from->getDataType()) {
-        case COM_DT_VALUE:
+        case DataType::Value:
           color = "gray";
           break;
-        case COM_DT_VECTOR:
+        case DataType::Vector:
           color = "blue";
           break;
-        case COM_DT_COLOR:
+        case DataType::Color:
           color = "orange";
           break;
       }
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index 9a51baf55d7..6a50cc6906b 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -64,8 +64,8 @@ class ExecutionGroup;
  * \see NodeOperation base class for all operations in the system
  *
  * \section EM_Step3 Step3: add additional conversions to the operation system
- *   - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR,
- * COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered
+ *   - Data type conversions: the system has 3 data types DataType::Value, DataType::Vector,
+ * DataType::Color. The user can connect a Value socket to a color socket. As values are ordered
  * differently than colors a conversion happens.
  *
  *   - Image size conversions: the system can automatically convert when resolutions do not match.
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cc b/source/blender/compositor/intern/COM_MemoryBuffer.cc
index 17a73efeab2..60f74e2ae2f 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cc
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cc
@@ -23,11 +23,11 @@
 static unsigned int determine_num_channels(DataType datatype)
 {
   switch (datatype) {
-    case COM_DT_VALUE:
+    case DataType::Value:
       return COM_NUM_CHANNELS_VALUE;
-    case COM_DT_VECTOR:
+    case DataType::Vector:
       return COM_NUM_CHANNELS_VECTOR;
-    case COM_DT_COLOR:
+    case DataType::Color:
     default:
       return COM_NUM_CHANNELS_COLOR;
   }
@@ -204,7 +204,7 @@ static void read_ewa_pixel_sampled(void *userdata, int x, int y, float result[4]
 
 void MemoryBuffer::readEWA(float *result, const float uv[2], const float derivatives[2][2])
 {
-  BLI_assert(this->m_datatype == COM_DT_COLOR);
+  BLI_assert(this->m_datatype == DataType::Color);
   float inv_width = 1.0f / (float)this->getWidth(), inv_height = 1.0f / (float)this->getHeight();
   /* TODO(sergey): Render pipeline uses normalized coordinates and derivatives,
    * but compositor uses pixel space. For now let's just divide the values and
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 41e4b86bdd2..77661f54db5 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -60,7 +60,7 @@ class MemoryBuffer {
   MemoryProxy *m_memoryProxy;
 
   /**
-   * \brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR
+   * \brief the type of buffer DataType::Value, DataType::Vector, DataType::Color
    */
   DataType m_datatype;
 
diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc
index 665b4720b23..819f1c02b14 100644
--- a/source/blender/compositor/intern/COM_Node.cc
+++ b/source/blender/compositor/intern/COM_Node.cc
@@ -45,12 +45,12 @@ Node::Node(bNode *editorNode, bool create_sockets)
   if (create_sockets) {
     bNodeSocket *input = (bNodeSocket *)editorNode->inputs.first;
     while (input != nullptr) {
-      DataType dt = COM_DT_VALUE;
+      DataType dt = DataType::Value;
       if (input->type == SOCK_RGBA) {
-        dt = COM_DT_COLOR;
+        dt = DataType::Color;
       }
       if (input->type == SOCK_VECTOR) {
-        dt = COM_DT_VECTOR;
+        dt = DataType::Vector;
       }
 
       this->addInputSocket(dt, input);
@@ -58,12 +58,12 @@ Node::Node(bNode *editorNode, bool create_sockets)
     }
     bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first;
     while (output != nullptr) {
-      DataType dt = COM_DT_VALUE;
+      DataType dt = DataType::Value;
       if (output->type == SOCK_RGBA) {
-        dt = COM_DT_COLOR;
+        dt = DataType::Color;
       }
       if (output->type == SOCK_VECTOR) {
-        dt = COM_DT_VECTOR;
+        dt = DataType::Vector;
       }
 
       this->addOutputSocket(dt, output);
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
index 492f7cb8768..818f2e4bcf6 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc
@@ -297,7 +297,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input,
                                                     const NodeInput *node_input)
 {
   switch (input->getDataType()) {
-    case COM_DT_VALUE: {
+    case DataType::Value: {
       float value;
       if (node_input && node_input->getbNodeSocket()) {
         value = node_input->getEditorValueFloat();
@@ -312,7 +312,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input,
       addLink(op->getOutputSocket(), input);
       break;
     }
-    case COM_DT_COLOR: {
+    case DataType::Color: {
       float value[4];
       if (node_input && node_input->getbNodeSocket()) {
         node_input->getEditorValueColor(value);
@@ -327,7 +327,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input,
       addLink(op->getOutputSocket(), input);
       break;
     }
-    case COM_DT_VECTOR: {
+    case DataType::Vector: {
       float value[3];
       if (node_input && node_input->getbNodeSocket()) {
         node_input->getEditorValueVector(value);