From 3913f5c49ed4eb6482b10744d5ccba6c2db779fd Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Fri, 16 Feb 2024 12:26:04 +0100
Subject: [PATCH] Moved into Model.hpp

---
 src/libslic3r/Model.hpp    | 35 ++++++++++++++++++++++++++++++++
 src/libslic3r/ObjectID.hpp | 41 --------------------------------------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index 2078cd2081..346d585235 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -233,6 +233,41 @@ private:
     friend class ModelObject;
 };
 
+class CutObjectBase
+{
+    size_t m_unique_id;      // 0 = invalid
+    size_t m_check_sum;      // check sum of CutParts in initial Object
+    size_t m_connectors_cnt; // connectors count
+
+public:
+    CutObjectBase() { invalidate(); }
+    CutObjectBase(size_t id, size_t check_sum, size_t connectors_cnt) :
+        m_unique_id{ id }, m_check_sum{ check_sum }, m_connectors_cnt{ connectors_cnt } {}
+
+    void invalidate() {
+        m_unique_id = 0;
+        m_check_sum = 1;
+        m_connectors_cnt = 0;
+    }
+    void init()                                 { m_unique_id = 1 + rand(); }
+    bool has_same_id(const CutObjectBase& rhs) const { return id() == rhs.id(); }
+    bool is_equal(const CutObjectBase& rhs) const    { return id()             == rhs.id() &&
+                                                              check_sum()      == rhs.check_sum() &&
+                                                              connectors_cnt() == rhs.connectors_cnt() ; }
+    size_t id() const                     { return m_unique_id; }
+    bool valid() const                    { return m_unique_id != 0; }
+    size_t check_sum() const              { return m_check_sum; }
+    void increase_check_sum(size_t cnt)   { m_check_sum += cnt; }
+
+    size_t connectors_cnt() const                           { return m_connectors_cnt; }
+    void   increase_connectors_cnt(size_t connectors_cnt)   { m_connectors_cnt += connectors_cnt; }
+
+private:
+    template<class Archive> void serialize(Archive &ar) {
+        ar(m_unique_id, m_check_sum, m_connectors_cnt);
+    }
+};
+
 enum class CutConnectorType : int {
     Plug
     , Dowel
diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
index 77cac44149..529538074d 100644
--- a/src/libslic3r/ObjectID.hpp
+++ b/src/libslic3r/ObjectID.hpp
@@ -6,12 +6,6 @@
 #define slic3r_ObjectID_hpp_
 
 #include <cereal/access.hpp>
-#include <cereal/types/base_class.hpp>
-#include <stddef.h>
-#include <stdint.h>
-#include <cereal/cereal.hpp>
-#include <cinttypes>
-#include <cstddef>
 
 namespace Slic3r {
 
@@ -140,41 +134,6 @@ private:
 	template<class Archive> void serialize(Archive &ar) { ar(m_timestamp); }
 };
 
-class CutObjectBase
-{
-    size_t m_unique_id;      // 0 = invalid
-    size_t m_check_sum;      // check sum of CutParts in initial Object    
-    size_t m_connectors_cnt; // connectors count   
-
-public:
-    CutObjectBase() { invalidate(); }
-    CutObjectBase(size_t id, size_t check_sum, size_t connectors_cnt) :
-        m_unique_id{ id }, m_check_sum{ check_sum }, m_connectors_cnt{ connectors_cnt } {}
-
-    void invalidate() {
-        m_unique_id = 0;
-        m_check_sum = 1;
-        m_connectors_cnt = 0;
-    }
-    void init()                                 { m_unique_id = 1 + rand(); }
-    bool has_same_id(const CutObjectBase& rhs) const { return id() == rhs.id(); }
-    bool is_equal(const CutObjectBase& rhs) const    { return id()             == rhs.id() &&
-                                                              check_sum()      == rhs.check_sum() &&
-                                                              connectors_cnt() == rhs.connectors_cnt() ; }
-    size_t id() const                     { return m_unique_id; }
-    bool valid() const                    { return m_unique_id != 0; }
-    size_t check_sum() const              { return m_check_sum; }
-    void increase_check_sum(size_t cnt)   { m_check_sum += cnt; }
-
-    size_t connectors_cnt() const                           { return m_connectors_cnt; }
-    void   increase_connectors_cnt(size_t connectors_cnt)   { m_connectors_cnt += connectors_cnt; }
-
-private:
-    template<class Archive> void serialize(Archive &ar) {
-        ar(m_unique_id, m_check_sum, m_connectors_cnt);
-    }
-};
-
 // Unique object / instance ID for the wipe tower.
 extern ObjectID wipe_tower_object_id();
 extern ObjectID wipe_tower_instance_id();