From 5fd66d53ad646d03dc8a11c318b141a61bf7437a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0ach?= <martin.sachin@gmail.com>
Date: Fri, 5 Apr 2024 11:59:06 +0200
Subject: [PATCH] Add missing headers and replace size_t with std::size_t.

---
 src/libslic3r/ProfilesSharingUtils.hpp      |  3 +++
 src/libslic3r/Utils/DirectoriesUtils.cpp    |  1 +
 src/libslic3r/Utils/JsonUtils.cpp           |  2 ++
 src/libvgcode/include/ColorRange.hpp        |  6 ++---
 src/libvgcode/include/Types.hpp             | 14 +++++-----
 src/libvgcode/src/Bitset.hpp                | 30 ++++++++++-----------
 src/libvgcode/src/ExtrusionRoles.cpp        |  4 +--
 src/libvgcode/src/ExtrusionRoles.hpp        |  2 +-
 src/libvgcode/src/Layers.hpp                | 16 +++++------
 src/slic3r/GUI/DesktopIntegrationDialog.cpp |  1 +
 src/slic3r/GUI/UserAccountCommunication.hpp |  3 ++-
 src/slic3r/Utils/PrusaConnect.cpp           |  1 +
 12 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/src/libslic3r/ProfilesSharingUtils.hpp b/src/libslic3r/ProfilesSharingUtils.hpp
index 51e72e5dfa..d4e18f2a54 100644
--- a/src/libslic3r/ProfilesSharingUtils.hpp
+++ b/src/libslic3r/ProfilesSharingUtils.hpp
@@ -5,6 +5,9 @@
 #ifndef slic3r_ProfilesSharingUtils_hpp_
 #define slic3r_ProfilesSharingUtils_hpp_
 
+#include <string>
+#include "Config.hpp"
+
 namespace Slic3r {
 
 std::string get_json_printer_models(PrinterTechnology printer_technology);
diff --git a/src/libslic3r/Utils/DirectoriesUtils.cpp b/src/libslic3r/Utils/DirectoriesUtils.cpp
index 202da3b591..9766f8de16 100644
--- a/src/libslic3r/Utils/DirectoriesUtils.cpp
+++ b/src/libslic3r/Utils/DirectoriesUtils.cpp
@@ -1,6 +1,7 @@
 #include "DirectoriesUtils.hpp"
 #include "../libslic3r.h"
 
+#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 
 #if defined(_WIN32)
diff --git a/src/libslic3r/Utils/JsonUtils.cpp b/src/libslic3r/Utils/JsonUtils.cpp
index 0419075987..e4f4710b7c 100644
--- a/src/libslic3r/Utils/JsonUtils.cpp
+++ b/src/libslic3r/Utils/JsonUtils.cpp
@@ -1,4 +1,6 @@
 #include "JsonUtils.hpp"
+#include <boost/algorithm/string/replace.hpp>
+#include <regex>
 
 namespace Slic3r {
 
diff --git a/src/libvgcode/include/ColorRange.hpp b/src/libvgcode/include/ColorRange.hpp
index 3c5cbc0f87..e6c83cb21d 100644
--- a/src/libvgcode/include/ColorRange.hpp
+++ b/src/libvgcode/include/ColorRange.hpp
@@ -69,7 +69,7 @@ public:
     //
     // Return the size of the palette, in bytes
     //
-    size_t size_in_bytes_cpu() const;
+    std::size_t size_in_bytes_cpu() const;
 
     static const ColorRange DUMMY_COLOR_RANGE;
 
@@ -87,7 +87,7 @@ private:
     //
     // Count of different values passed to update()
     // 
-    size_t m_count{ 0 };
+    std::size_t m_count{ 0 };
 
     //
     // Use the passed value to update the range.
@@ -104,4 +104,4 @@ private:
 
 } // namespace libvgcode
 
-#endif // VGCODE_COLORRANGE_HPP
\ No newline at end of file
+#endif // VGCODE_COLORRANGE_HPP
diff --git a/src/libvgcode/include/Types.hpp b/src/libvgcode/include/Types.hpp
index c1e33b4426..53ceff7581 100644
--- a/src/libvgcode/include/Types.hpp
+++ b/src/libvgcode/include/Types.hpp
@@ -72,7 +72,7 @@ using AABox = std::array<Vec3, 2>;
 // [0] -> min
 // [1] -> max
 //
-using Interval = std::array<size_t, 2>;
+using Interval = std::array<std::size_t, 2>;
 
 //
 // View types
@@ -95,7 +95,7 @@ enum class EViewType : uint8_t
     COUNT
 };
 
-static constexpr size_t VIEW_TYPES_COUNT = static_cast<size_t>(EViewType::COUNT);
+static constexpr std::size_t VIEW_TYPES_COUNT = static_cast<std::size_t>(EViewType::COUNT);
 
 //
 // Move types
@@ -116,7 +116,7 @@ enum class EMoveType : uint8_t
     COUNT
 };
 
-static constexpr size_t MOVE_TYPES_COUNT = static_cast<size_t>(EMoveType::COUNT);
+static constexpr std::size_t MOVE_TYPES_COUNT = static_cast<std::size_t>(EMoveType::COUNT);
 
 //
 // Extrusion roles
@@ -141,7 +141,7 @@ enum class EGCodeExtrusionRole : uint8_t
     COUNT
 };
 
-static constexpr size_t GCODE_EXTRUSION_ROLES_COUNT = static_cast<size_t>(EGCodeExtrusionRole::COUNT);
+static constexpr std::size_t GCODE_EXTRUSION_ROLES_COUNT = static_cast<std::size_t>(EGCodeExtrusionRole::COUNT);
 
 //
 // Option types
@@ -164,7 +164,7 @@ enum class EOptionType : uint8_t
     COUNT
 };
 
-static constexpr size_t OPTION_TYPES_COUNT = static_cast<size_t>(EOptionType::COUNT);
+static constexpr std::size_t OPTION_TYPES_COUNT = static_cast<std::size_t>(EOptionType::COUNT);
 
 //
 // Time modes
@@ -176,7 +176,7 @@ enum class ETimeMode : uint8_t
     COUNT
 };
 
-static constexpr size_t TIME_MODES_COUNT = static_cast<size_t>(ETimeMode::COUNT);
+static constexpr std::size_t TIME_MODES_COUNT = static_cast<std::size_t>(ETimeMode::COUNT);
 
 //
 // Color range types
@@ -188,7 +188,7 @@ enum class EColorRangeType : uint8_t
     COUNT
 };
 
-static constexpr size_t COLOR_RANGE_TYPES_COUNT = static_cast<size_t>(EColorRangeType::COUNT);
+static constexpr std::size_t COLOR_RANGE_TYPES_COUNT = static_cast<std::size_t>(EColorRangeType::COUNT);
 
 //
 // Predefined colors
diff --git a/src/libvgcode/src/Bitset.hpp b/src/libvgcode/src/Bitset.hpp
index b05fd159e3..eebe297262 100644
--- a/src/libvgcode/src/Bitset.hpp
+++ b/src/libvgcode/src/Bitset.hpp
@@ -20,22 +20,22 @@ template<typename T = unsigned long long>
 struct BitSet
 {
     BitSet() = default;
-    BitSet(size_t size) : size(size), blocks(1 + (size / (sizeof(T) * 8))) { clear(); }
+    BitSet(std::size_t size) : size(size), blocks(1 + (size / (sizeof(T) * 8))) { clear(); }
 
     void clear() {
-        for (size_t i = 0; i < blocks.size(); ++i) {
+        for (std::size_t i = 0; i < blocks.size(); ++i) {
             blocks[i] &= T(0);
         }
     }
 
     void setAll() {
-        for (size_t i = 0; i < blocks.size(); ++i) {
+        for (std::size_t i = 0; i < blocks.size(); ++i) {
             blocks[i] |= ~T(0);
         }
     }
 
     //return true if bit changed
-    bool set(size_t index) {
+    bool set(std::size_t index) {
         const auto [block_idx, bit_idx] = get_coords(index);
         const T mask = (T(1) << bit_idx);
         bool flip = mask ^ blocks[block_idx];
@@ -44,7 +44,7 @@ struct BitSet
     }
 
     //return true if bit changed
-    bool reset(size_t index) {
+    bool reset(std::size_t index) {
         const auto [block_idx, bit_idx] = get_coords(index);
         const T mask = (T(1) << bit_idx);
         const bool flip = mask ^ blocks[block_idx];
@@ -52,7 +52,7 @@ struct BitSet
         return flip;
     }
 
-    bool operator [] (size_t index) const {
+    bool operator [] (std::size_t index) const {
         const auto [block_idx, bit_idx] = get_coords(index);
         return ((blocks[block_idx] >> bit_idx) & 1) != 0;
     }
@@ -60,7 +60,7 @@ struct BitSet
     template<typename U>
     BitSet& operator &= (const BitSet<U>& other) {
         static_assert(sizeof(T) == sizeof(U), "Type1 and Type2 must be of the same size.");
-        for (size_t i = 0; i < blocks.size(); ++i) {
+        for (std::size_t i = 0; i < blocks.size(); ++i) {
             blocks[i] &= other.blocks[i];
         }
         return *this;
@@ -68,7 +68,7 @@ struct BitSet
 
     // Atomic set operation (enabled only for atomic types), return true if bit changed
     template<typename U = T>
-    inline typename std::enable_if<is_atomic<U>, bool>::type set_atomic(size_t index) {
+    inline typename std::enable_if<is_atomic<U>, bool>::type set_atomic(std::size_t index) {
         const auto [block_idx, bit_idx] = get_coords(index);
         const T mask = static_cast<T>(1) << bit_idx;
         const T oldval = blocks[block_idx].fetch_or(mask, std::memory_order_relaxed);
@@ -77,27 +77,27 @@ struct BitSet
 
     // Atomic reset operation (enabled only for atomic types), return true if bit changed
     template<typename U = T>
-    inline typename std::enable_if<is_atomic<U>, bool>::type reset_atomic(size_t index) {
+    inline typename std::enable_if<is_atomic<U>, bool>::type reset_atomic(std::size_t index) {
         const auto [block_idx, bit_idx] = get_coords(index);
         const T mask = ~(static_cast<T>(1) << bit_idx);
         const T oldval = blocks[block_idx].fetch_and(mask, std::memory_order_relaxed);
         return oldval ^ (oldval and mask);
     }
 
-    std::pair<size_t, size_t> get_coords(size_t index) const {
-        const size_t block_idx = index / (sizeof(T) * 8);
-        const size_t bit_idx = index % (sizeof(T) * 8);
+    std::pair<std::size_t, std::size_t> get_coords(std::size_t index) const {
+        const std::size_t block_idx = index / (sizeof(T) * 8);
+        const std::size_t bit_idx = index % (sizeof(T) * 8);
         return { block_idx, bit_idx };
     }
 
-    size_t size_in_bytes_cpu() const {
+    std::size_t size_in_bytes_cpu() const {
         return blocks.size() * sizeof(T);
     }
 
-    size_t size{ 0 };
+    std::size_t size{ 0 };
     std::vector<T> blocks{ 0 };
 };
 
 } // namespace libvgcode
 
-#endif // VGCODE_BITSET_HPP
\ No newline at end of file
+#endif // VGCODE_BITSET_HPP
diff --git a/src/libvgcode/src/ExtrusionRoles.cpp b/src/libvgcode/src/ExtrusionRoles.cpp
index 29995ed248..e38886c57b 100644
--- a/src/libvgcode/src/ExtrusionRoles.cpp
+++ b/src/libvgcode/src/ExtrusionRoles.cpp
@@ -12,7 +12,7 @@ void ExtrusionRoles::add(EGCodeExtrusionRole role, const std::array<float, TIME_
     if (role_it == m_items.end())
         role_it = m_items.insert(std::make_pair(role, Item())).first;
 
-    for (size_t i = 0; i < TIME_MODES_COUNT; ++i) {
+    for (std::size_t i = 0; i < TIME_MODES_COUNT; ++i) {
         role_it->second.times[i] += times[i];
     }
 }
@@ -33,7 +33,7 @@ float ExtrusionRoles::get_time(EGCodeExtrusionRole role, ETimeMode mode) const
     if (role_it == m_items.end())
         return 0.0f;
 
-    return (mode < ETimeMode::COUNT) ? role_it->second.times[static_cast<size_t>(mode)] : 0.0f;
+    return (mode < ETimeMode::COUNT) ? role_it->second.times[static_cast<std::size_t>(mode)] : 0.0f;
 }
 
 } // namespace libvgcode
diff --git a/src/libvgcode/src/ExtrusionRoles.hpp b/src/libvgcode/src/ExtrusionRoles.hpp
index e140b48420..ee949fbf0d 100644
--- a/src/libvgcode/src/ExtrusionRoles.hpp
+++ b/src/libvgcode/src/ExtrusionRoles.hpp
@@ -21,7 +21,7 @@ public:
 
     void add(EGCodeExtrusionRole role, const std::array<float, TIME_MODES_COUNT>& times);
 
-    size_t get_roles_count() const { return m_items.size(); }
+    std::size_t get_roles_count() const { return m_items.size(); }
     std::vector<EGCodeExtrusionRole> get_roles() const;
     float get_time(EGCodeExtrusionRole role, ETimeMode mode) const;
 
diff --git a/src/libvgcode/src/Layers.hpp b/src/libvgcode/src/Layers.hpp
index 03c4b32bbc..bf3386016c 100644
--- a/src/libvgcode/src/Layers.hpp
+++ b/src/libvgcode/src/Layers.hpp
@@ -18,29 +18,29 @@ public:
     void reset();
     
     bool empty() const { return m_items.empty(); }
-    size_t count() const { return m_items.size(); }
+    std::size_t count() const { return m_items.size(); }
 
     std::vector<float> get_times(ETimeMode mode) const;
     std::vector<float> get_zs() const;
     
-    float get_layer_time(ETimeMode mode, size_t layer_id) const {
+    float get_layer_time(ETimeMode mode, std::size_t layer_id) const {
         return (mode < ETimeMode::COUNT&& layer_id < m_items.size()) ?
-            m_items[layer_id].times[static_cast<size_t>(mode)] : 0.0f;
+            m_items[layer_id].times[static_cast<std::size_t>(mode)] : 0.0f;
     }
-    float get_layer_z(size_t layer_id) const {
+    float get_layer_z(std::size_t layer_id) const {
         return (layer_id < m_items.size()) ? m_items[layer_id].z : 0.0f;
     }
-    size_t get_layer_id_at(float z) const;
+    std::size_t get_layer_id_at(float z) const;
     
     const Interval& get_view_range() const { return m_view_range.get(); }
     void set_view_range(const Interval& range) { set_view_range(range[0], range[1]); }
     void set_view_range(Interval::value_type min, Interval::value_type max) { m_view_range.set(min, max); }
     
-    bool layer_contains_colorprint_options(size_t layer_id) const {
+    bool layer_contains_colorprint_options(std::size_t layer_id) const {
         return (layer_id < m_items.size()) ? m_items[layer_id].contains_colorprint_options : false;
     }
 
-    size_t size_in_bytes_cpu() const;
+    std::size_t size_in_bytes_cpu() const;
 
 private:
     struct Item
@@ -57,4 +57,4 @@ private:
 
 } // namespace libvgcode
 
-#endif // VGCODE_LAYERS_HPP
\ No newline at end of file
+#endif // VGCODE_LAYERS_HPP
diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
index 19ce09c569..4aa15fd0e5 100644
--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
@@ -16,6 +16,7 @@
 #include "libslic3r/Config.hpp"
 
 #include <boost/nowide/fstream.hpp>
+#include <boost/nowide/convert.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/dll/runtime_symbol_info.hpp>
diff --git a/src/slic3r/GUI/UserAccountCommunication.hpp b/src/slic3r/GUI/UserAccountCommunication.hpp
index 12e0924ae9..168ff11836 100644
--- a/src/slic3r/GUI/UserAccountCommunication.hpp
+++ b/src/slic3r/GUI/UserAccountCommunication.hpp
@@ -6,6 +6,7 @@
 #include "libslic3r/AppConfig.hpp"
 
 #include <queue>
+#include <condition_variable>
 #include <map>
 #include <thread>
 #include <mutex>
@@ -89,4 +90,4 @@ private:
 };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/slic3r/Utils/PrusaConnect.cpp b/src/slic3r/Utils/PrusaConnect.cpp
index 6ba4be633c..eb1ce3b8d8 100644
--- a/src/slic3r/Utils/PrusaConnect.cpp
+++ b/src/slic3r/Utils/PrusaConnect.cpp
@@ -8,6 +8,7 @@
 #include "slic3r/GUI/UserAccount.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <boost/nowide/convert.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/filesystem.hpp>