Add Missing Includes to Code Merged Since the Previous Sweep

# Conflicts:
#	tests/libslic3r/test_locales_utils.cpp

src/OrcaSlicer.cpp

@@ -37,6 +37,7 @@
 #include "libslic3r/TriangleSelector.hpp"
 #include <algorithm>
 #include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/Format/AssembleList.hpp"
 #include <cstdlib>
 #include <stdlib.h>
 #include <stdexcept>

src/libslic3r/Format/AssembleList.cpp

@@ -3,9 +3,16 @@
 #include <algorithm>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <string>
+#include <vector>
+#include <map>
+#include <utility>
+#include <exception>
 
 #include "nlohmann/json.hpp"
 

src/libslic3r/GCode/AdaptivePAProcessor.cpp

@@ -18,6 +18,7 @@
 #include <cmath>
 #include <cctype>
 #include <string>
+#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/GCode/ExtrusionProcessor.hpp

@@ -15,6 +15,7 @@
 #include "../ClipperUtils.hpp"
 #include "../Flow.hpp"
 #include "../Config.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/ExPolygon.hpp"
 
@@ -22,6 +23,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <limits>
 #include <memory>

src/libvgcode/include/Viewer.hpp

@@ -7,6 +7,7 @@
 
 #include "Types.hpp"
 
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <string>

src/libvgcode/src/Viewer.cpp

@@ -4,6 +4,7 @@
 ///|/
 #include "../include/Viewer.hpp"
 #include "ViewerImpl.hpp"
+#include <array>
 #include <string>
 #include <utility>
 #include "../include/Types.hpp"

src/slic3r/GUI/FrameProfiler.cpp

@@ -3,10 +3,15 @@
 
 #include "3DScene.hpp"
 
+#include <chrono>
+#include <array>
 #include <glad/gl.h>
 
 #include <algorithm>
 #include <cstring>
+#include <ratio>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/GCodeViewer.cpp

@@ -28,6 +28,8 @@
 #include "libslic3r/Layer.hpp"
 #include "Widgets/ProgressDialog.hpp"
 #include "MsgDialog.hpp"
+#include <boost/container_hash/hash.hpp>
+#include "slic3r/GUI/MeshUtils.hpp"
 #include <string>
 #include "libvgcode/include/Types.hpp"
 #include <vector>

src/slic3r/GUI/GCodeViewer.hpp

@@ -28,6 +28,7 @@
 #include <cstdint>
 #include <float.h>
 #include <set>
+#include "slic3r/GUI/MeshUtils.hpp"
 #include <string>
 #include <unordered_set>
 #include <utility>

src/slic3r/GUI/GLCanvas3D.hpp

@@ -4,6 +4,7 @@
 #include "libslic3r/Point.hpp"
 #include "slic3r/GUI/3DScene.hpp"
 #include <cstdlib>
+#include <imgui.h>
 #include <map>
 #include <cmath>
 #include "libslic3r/Geometry.hpp"

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -29,6 +29,7 @@
 #include "slic3r/GUI/Gizmos/GLGizmoSVG.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoAssembly.hpp"
+#include <initializer_list>
 #include <wx/timer.h>
 #include <vector>
 #include <cstddef>

src/slic3r/GUI/ParamsDialog.cpp

@@ -8,6 +8,7 @@
 
 #include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Preset.hpp"
 #include <wx/wx.h>
 #include <wx/gdicmn.h>
 #include <wx/toplevel.h>

src/slic3r/GUI/PrinterWebView.cpp

@@ -9,6 +9,7 @@
 #include "libslic3r_version.h"
 
 #include <boost/filesystem/path.hpp>
+#include <utility>
 #include <wx/panel.h>
 #include <wx/gdicmn.h>
 #include <memory>

src/slic3r/GUI/Project.cpp

@@ -13,6 +13,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <utility>
 #include <vector>
 #include <string>
 #include "slic3r/GUI/GUI.hpp"

src/slic3r/GUI/SceneBenchmark.cpp

@@ -21,12 +21,30 @@
 
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r_version.h"
 
+#include <array>
 #include <glad/gl.h>
+#include <vector>
+#include <string>
+#include "slic3r/GUI/FrameProfiler.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <ratio>
+#include "libslic3r/Preset.hpp"
+#include <ios>
 #include <wx/clipbrd.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/dataobj.h>
 #include <wx/glcanvas.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
 
 #include <algorithm>

src/slic3r/GUI/WebViewDialog.cpp

@@ -14,6 +14,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
+#include <utility>
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/gdicmn.h>

src/slic3r/plugin/host/PluginPages.cpp

@@ -22,6 +22,7 @@
 #include "slic3r/GUI/WebPanel.hpp"
 #include <optional>
 #include "slic3r/plugin/PythonPluginInterface.hpp"
+#include "slic3r/GUI/LazyPage.hpp"
 #include <stdexcept>
 #include <string>
 #include <wx/app.h>

tests/fff_print/test_extrusion_processor.cpp

@@ -25,6 +25,10 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Layer.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 #include <string>
 #include <string_view>
 #include <vector>

tests/fff_print/test_gcode.cpp

@@ -1,6 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <catch2/catch_message.hpp>
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/ModelArrange.hpp"
@@ -9,6 +10,8 @@
 
 #include "test_helpers.hpp"
 
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Point.hpp"
 #include <string>
 #include <vector>
 

tests/fff_print/test_gcodeprocessor.cpp

@@ -2,15 +2,21 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/Utils.hpp"
 
 #include "test_utils.hpp"
 
+#include <cstddef>
 #include <fstream>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 using namespace Slic3r;

tests/libslic3r/test_appconfig.cpp

@@ -1,6 +1,7 @@
 #include <catch2/catch_all.hpp>
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/AppConfig.hpp"
 
 using namespace Slic3r;

tests/libslic3r/test_assemble_list.cpp

@@ -1,10 +1,16 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Format/AssembleList.hpp"
 
 #include "test_utils.hpp"
 
 #include <boost/nowide/fstream.hpp>
+#include <cstddef>
 #include <nlohmann/json.hpp>
 
 #include <string>

tests/libslic3r/test_clipper_utils.cpp

@@ -8,6 +8,7 @@
 #include <numeric>
 #include <iostream>
 #include <boost/filesystem.hpp>
+#include <utility>
 #include <vector>
 
 #include <catch2/catch_test_macros.hpp>

tests/libslic3r/test_config.cpp

@@ -19,6 +19,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 #include "libslic3r/Config.hpp"
+#include <initializer_list>
 #include <memory>
 #include <map>
 #include <iterator>

tests/libslic3r/test_gcodereader.cpp

@@ -2,6 +2,7 @@
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/Config.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/PrintConfig.hpp"

tests/libslic3r/test_locales_utils.cpp

@@ -5,6 +5,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/LocalesUtils.hpp"
 
 #include <string>

tests/libslic3r/test_toolordering_nozzle_group.cpp

@@ -18,6 +18,7 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r/GCode/ToolOrderUtils.hpp"
 #include "libslic3r/PrintBase.hpp"
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>

tests/libslic3r/test_trianglemesh_slicer.cpp

@@ -1,7 +1,13 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
 #include <tbb/global_control.h>
+#include <vector>
+#include <utility>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 

tests/slic3rutils/test_scene_benchmark.cpp

@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "slic3r/GUI/SceneBenchmark.hpp"
 
 #include <algorithm>