Cleanup: Make ChunkOrder a struct.

1 files changed, 15 insertions, 28 deletions

diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h
index 32d8c07de83..993622b346c 100644
--- a/source/blender/compositor/intern/COM_ChunkOrder.h
+++ b/source/blender/compositor/intern/COM_ChunkOrder.h
@@ -18,37 +18,24 @@
 
 #pragma once
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#  include "MEM_guardedalloc.h"
+#endif
+
 #include "COM_ChunkOrderHotspot.h"
-class ChunkOrder {
- private:
-  unsigned int m_number;
-  int m_x;
-  int m_y;
-  double m_distance;
+struct ChunkOrder {
+  unsigned int number;
+  int x;
+  int y;
+  double distance;
 
- public:
   ChunkOrder();
-  void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots);
+
   friend bool operator<(const ChunkOrder &a, const ChunkOrder &b);
 
-  void setChunkNumber(unsigned int chunknumber)
-  {
-    this->m_number = chunknumber;
-  }
-  void setX(int x)
-  {
-    this->m_x = x;
-  }
-  void setY(int y)
-  {
-    this->m_y = y;
-  }
-  unsigned int getChunkNumber()
-  {
-    return this->m_number;
-  }
-  double getDistance()
-  {
-    return this->m_distance;
-  }
+  void update_distance(ChunkOrderHotspot **hotspots, unsigned int len_hotspots);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+  MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")
+#endif
 };