Merge branch 'main' into hanif/using-dead-cleanup

Remove Unused Usings and the Includes Kept Only for Them
151 using-directives, using-declarations, type aliases and namespace aliases in source and test files that nothing refers to: the name is never used, it duplicates a using already in scope, or the code sits inside the namespace it names. Each one was removed on its own and the file still compiled, both as it is and with every header-level using taken away, so none of them was only redundant because a header leaks the same name. With the using gone, 28 #include lines and one forward declaration had no other reference left in their file (boost/optional.hpp without any optional, property_tree headers without any ptree) and go with it. No header is touched.
2026-10-06 23:31:19 +00:00 · 2026-10-07 02:38:02 +08:00 · 2026-10-07 01:38:53 +08:00
107 changed files with 5473 additions and 11338 deletions
@@ -303,7 +303,7 @@ jobs:
      - name: Mint profiles-repo token
        id: token
        if: steps.vendors.outputs.vendors != ''
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v1
        with:
          app-id: ${{ secrets.PROFILES_APP_ID }}
          private-key: ${{ secrets.PROFILES_APP_PRIVATE_KEY }}
@@ -96,7 +96,7 @@ jobs:
      issues: write
    runs-on: ubuntu-latest
    steps:
-      - name: Auto-label localization changes and remind contributors about the glossary
+      - name: Auto-label and remind about the localization glossary
        uses: actions/github-script@v9
        with:
          script: |
@@ -106,37 +106,37 @@ jobs:

            const pr = context.payload.pull_request;

-            // Mirrors the `localization/**` paths filter in check_locale.yml
+            // List changed files once (mirrors the `localization/**` paths filter in check_locale.yml)
            const files = await github.paginate(github.rest.pulls.listFiles, {
              owner: context.repo.owner,
              repo: context.repo.repo,
              pull_number: pr.number,
              per_page: 100
            });
-            if (!files.some((file) => file.filename.startsWith('localization/'))) {
-              core.info('No localization changes detected; skipping Localization label.');
-              return;
-            }
+            const touchesLocalization = files.some((file) => file.filename.startsWith('localization/'));
+            const onlyPoFiles = files.length > 0 && files.every((file) => file.filename.endsWith('.po'));

-            try {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels: ['Localization']
-              });
-              core.info('Applied Localization label.');
-            } catch (error) {
-              if (isPermissionDenied(error)) {
-                core.warning('Cannot add Localization label because token cannot write.');
-              } else {
-                throw error;
+            // If the PR changes only .po files, automatically apply the Localization label
+            if (onlyPoFiles) {
+              try {
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: pr.number,
+                  labels: ['Localization']
+                });
+                core.info('Applied Localization label (PR changes only .po files).');
+              } catch (error) {
+                if (isPermissionDenied(error)) {
+                  core.warning('Cannot add Localization label because token cannot write.');
+                } else {
+                  throw error;
+                }
              }
            }

-            // Collaborators know the glossary; only remind outside contributors
-            if (['COLLABORATOR', 'OWNER', 'MEMBER'].includes(pr.author_association)) {
-              core.info('Author is a collaborator; skipping glossary reminder.');
+            if (!touchesLocalization) {
+              core.info('No localization changes detected; skipping glossary reminder.');
              return;
            }

@@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v7

      - name: Setup Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: '3.12'

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-06 15:16-0300\n"
+"POT-Creation-Date: 2026-10-05 10:49-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3168,7 +3168,7 @@ msgstr ""
 msgid "Remove parameter"
 msgstr ""

-msgid "Range"
+msgid "to"
 msgstr ""

 msgid "Add height range"
@@ -5064,6 +5064,9 @@ msgstr ""
 msgid "layers"
 msgstr ""

+msgid "Range"
+msgstr ""
+
 msgid "Empty string"
 msgstr ""

@@ -9461,6 +9464,14 @@ msgstr ""
 msgid "Show incompatible/unsupported presets in the printer and filament dropdown lists. These presets cannot be selected."
 msgstr ""

+msgid "(Experimental) Use printer agents instead of print hosts"
+msgstr ""
+
+msgid ""
+"Route print jobs for non-Bambu printers through printer plug-in agents instead of the classic print-host upload flow.\n"
+"When disabled, OrcaSlicer uses the legacy print-host behavior."
+msgstr ""
+
 msgid "Experimental Features"
 msgstr ""

@@ -9472,14 +9483,6 @@ msgid ""
 "Highly experimental! Slow and may create artifact."
 msgstr ""

-msgid "Use printer agents instead of print hosts"
-msgstr ""
-
-msgid ""
-"Route print jobs for non-Bambu printers through printer plug-in agents instead of the classic print-host upload flow.\n"
-"When disabled, OrcaSlicer uses the legacy print-host behavior."
-msgstr ""
-
 msgid "Allow Abnormal Storage"
 msgstr ""

@@ -9642,9 +9645,6 @@ msgstr ""
 msgid "Please input layer value (>= 2)."
 msgstr ""

-msgid "to"
-msgstr ""
-
 msgid "Plate name"
 msgstr ""

@@ -14779,12 +14779,6 @@ msgstr ""
 msgid "If the model has two parts that are symmetric about the Y axis, and you want these parts to have symmetric textures, please click this option on one of the parts."
 msgstr ""

-msgid "Fill pattern tops"
-msgstr ""
-
-msgid "Choose this option if you want to completely fill in the tops of the infill pattern"
-msgstr ""
-
 msgid "Infill combination - Max layer height"
 msgstr ""

@@ -20427,21 +20421,6 @@ msgstr ""
 msgid "The filament model is unknown. A random filament preset will be used."
 msgstr ""

-msgid "Hide reference planes and axes"
-msgstr ""
-
-msgid "Show reference planes and axes"
-msgstr ""
-
-msgid "Hide the printer bed and its plate grid"
-msgstr ""
-
-msgid "Show the printer bed and its plate grid"
-msgstr ""
-
-msgid "Click a reference plane or a flat face to sketch on it — Esc cancels"
-msgstr ""
-
 msgid "Construction"
 msgstr ""

@@ -20527,10 +20506,26 @@ msgstr ""
 msgid "Bed hidden"
 msgstr ""

-msgid "Reference planes shown"
+msgid "FEATURES"
 msgstr ""

-msgid "Reference planes hidden"
+msgid "Sketch"
+msgstr ""
+
+#, possible-c-format, possible-boost-format
+msgid "Sketch plane: %s — pick a tool"
+msgstr ""
+
+msgid "Click a face or a reference plane in the viewport, then a sketch tool"
+msgstr ""
+
+#, possible-c-format, possible-boost-format
+msgid ""
+"Sketch plane: %s.\n"
+"Pick a tool, or press Menu for the list."
+msgstr ""
+
+msgid "Click a face or a reference plane, then a sketch tool."
 msgstr ""

 msgid "Add material (extrude / revolve / sweep / loft / thicken / rib)"
@@ -20798,6 +20793,12 @@ msgstr ""
 msgid "Pick a cylindrical surface (bore / outer) or a circular edge for a thread"
 msgstr ""

+msgid "Import STEP (editable B-rep solid)"
+msgstr ""
+
+msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
+msgstr ""
+
 msgid "Constrain selected sketch"
 msgstr ""

@@ -21110,16 +21111,10 @@ msgstr ""
 msgid "New Design — clear the feature tree"
 msgstr ""

-msgid "Import STEP (editable B-rep solid)"
-msgstr ""
-
-msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
-msgstr ""
-
 msgid "Export STEP…"
 msgstr ""

-msgid "Create a new sketch"
+msgid "Show the printer bed and its plate grid"
 msgstr ""

 msgid "Place on Face (F) — lay the picked face on the bed"
@@ -21152,9 +21147,6 @@ msgstr ""
 msgid "Height / Y"
 msgstr ""

-msgid "Sketch"
-msgstr ""
-
 msgid "Distance X"
 msgstr ""

@@ -21633,9 +21625,6 @@ msgstr ""
 msgid "Value"
 msgstr ""

-msgid "Pick a tool, or press Menu for the list."
-msgstr ""
-
 msgid "Constraints"
 msgstr ""

@@ -21665,9 +21654,6 @@ msgstr ""
 msgid "Show / hide"
 msgstr ""

-msgid "Zoom to selection"
-msgstr ""
-
 msgid "Check interference — find overlapping bodies"
 msgstr ""

@@ -21725,9 +21711,6 @@ msgstr ""
 msgid "Sketch selected — right-click to Extrude, or double-click to edit"
 msgstr ""

-msgid "That face is not flat — click a flat face or a reference plane"
-msgstr ""
-
 #, possible-c-format, possible-boost-format
 msgid "Body %d: vertex selected — click again for the whole body"
 msgstr ""
@@ -21770,6 +21753,10 @@ msgstr ""
 msgid "Edge %d selected — Shift+click to add edges, or click again for the whole body"
 msgstr ""

+#, possible-c-format, possible-boost-format
+msgid "%s plane selected — right-click for the drawing tools"
+msgstr ""
+
 #, possible-c-format, possible-boost-format
 msgid "%s plane selected — right-click to sketch on it, or click an object to select it"
 msgstr ""
@@ -21824,7 +21811,7 @@ msgstr ""
 msgid "Text unchanged"
 msgstr ""

-msgid "Text canceled"
+msgid "Text cancelled"
 msgstr ""

 msgid "Import SVG"
@@ -22444,7 +22431,7 @@ msgstr ""

 msgid ""
 "Nothing yet — import a STEP or a mesh from the toolbar,\n"
-"or press Sketch and click a reference plane to start a sketch."
+"or click a reference plane and right-click it to start a sketch."
 msgstr ""

 msgid "No solid yet — select a sketch and right-click it to Extrude."
@@ -22476,25 +22463,12 @@ msgstr ""
 msgid "Finding the feature's faces…"
 msgstr ""

-msgid "The model is being rebuilt — zoom again when it finishes"
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid "%s has nothing on show to zoom to"
+msgid "Select a body first — click it in the viewport or the Bodies list"
 msgstr ""

 msgid "That body has no display mesh yet — recompute first"
 msgstr ""

-msgid "Select something to zoom to"
-msgstr ""
-
-msgid "Finish or cancel what is open first"
-msgstr ""
-
-msgid "Select a body first — click it in the viewport or the Bodies list"
-msgstr ""
-
 msgid "Drag the arrows to move, the rings to rotate — then Confirm (Esc cancels)"
 msgstr ""

@@ -22514,6 +22488,9 @@ msgstr ""
 msgid "Placed on face — body laid flat on the bed"
 msgstr ""

+msgid "Finish or cancel what is open first"
+msgstr ""
+
 #, possible-c-format, possible-boost-format
 msgid "Edit rejected: %s"
 msgstr ""
@@ -22862,16 +22839,6 @@ msgstr ""
 msgid "Line E%d"
 msgstr ""

-#, possible-c-format, possible-boost-format
-msgid "Sketch plane: %s — pick a tool"
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid ""
-"Sketch plane: %s.\n"
-"Pick a tool, or press Menu for the list."
-msgstr ""
-
 msgid "Plane ready"
 msgstr ""

@@ -23088,10 +23055,7 @@ msgctxt "Design"
 msgid "Sketch"
 msgstr ""

-msgid "Select a flat face or a reference plane to sketch on"
-msgstr ""
-
-msgid "Sketch on the selected flat face or plane, or click one next"
+msgid "Click a face or a reference plane, then pick a drawing tool"
 msgstr ""

 msgctxt "Design"
@@ -23161,6 +23125,9 @@ msgctxt "Design"
 msgid "Hole"
 msgstr ""

+msgid "Drill a hole, centerd on a picked face or placed on a plane"
+msgstr ""
+
 msgctxt "Design"
 msgid "Thread"
 msgstr ""
@@ -23323,13 +23290,6 @@ msgstr ""
 msgid "Set the selected body's display color"
 msgstr ""

-msgctxt "Design"
-msgid "Zoom to selection"
-msgstr ""
-
-msgid "Frame the selection in the view, keeping the view direction"
-msgstr ""
-
 msgctxt "Design"
 msgid "Delete"
 msgstr ""
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-06 15:16-0300\n"
+"POT-Creation-Date: 2026-10-05 10:49-0300\n"
 "PO-Revision-Date: 2026-06-17 15:44-0300\n"
 "Last-Translator: Alexandre Folle de Menezes\n"
 "Language-Team: \n"
@@ -3164,7 +3164,7 @@ msgstr ""
 msgid "Remove parameter"
 msgstr ""

-msgid "Range"
+msgid "to"
 msgstr ""

 msgid "Add height range"
@@ -5060,6 +5060,9 @@ msgstr ""
 msgid "layers"
 msgstr ""

+msgid "Range"
+msgstr ""
+
 msgid "Empty string"
 msgstr ""

@@ -9457,6 +9460,14 @@ msgstr ""
 msgid "Show incompatible/unsupported presets in the printer and filament dropdown lists. These presets cannot be selected."
 msgstr ""

+msgid "(Experimental) Use printer agents instead of print hosts"
+msgstr ""
+
+msgid ""
+"Route print jobs for non-Bambu printers through printer plug-in agents instead of the classic print-host upload flow.\n"
+"When disabled, OrcaSlicer uses the legacy print-host behavior."
+msgstr ""
+
 msgid "Experimental Features"
 msgstr ""

@@ -9468,14 +9479,6 @@ msgid ""
 "Highly experimental! Slow and may create artifact."
 msgstr ""

-msgid "Use printer agents instead of print hosts"
-msgstr ""
-
-msgid ""
-"Route print jobs for non-Bambu printers through printer plug-in agents instead of the classic print-host upload flow.\n"
-"When disabled, OrcaSlicer uses the legacy print-host behavior."
-msgstr ""
-
 msgid "Allow Abnormal Storage"
 msgstr ""

@@ -9638,9 +9641,6 @@ msgstr ""
 msgid "Please input layer value (>= 2)."
 msgstr ""

-msgid "to"
-msgstr ""
-
 msgid "Plate name"
 msgstr ""

@@ -14775,12 +14775,6 @@ msgstr ""
 msgid "If the model has two parts that are symmetric about the Y axis, and you want these parts to have symmetric textures, please click this option on one of the parts."
 msgstr ""

-msgid "Fill pattern tops"
-msgstr ""
-
-msgid "Choose this option if you want to completely fill in the tops of the infill pattern"
-msgstr ""
-
 msgid "Infill combination - Max layer height"
 msgstr ""

@@ -20423,21 +20417,6 @@ msgstr ""
 msgid "The filament model is unknown. A random filament preset will be used."
 msgstr ""

-msgid "Hide reference planes and axes"
-msgstr ""
-
-msgid "Show reference planes and axes"
-msgstr ""
-
-msgid "Hide the printer bed and its plate grid"
-msgstr ""
-
-msgid "Show the printer bed and its plate grid"
-msgstr ""
-
-msgid "Click a reference plane or a flat face to sketch on it — Esc cancels"
-msgstr ""
-
 msgid "Construction"
 msgstr ""

@@ -20523,10 +20502,26 @@ msgstr ""
 msgid "Bed hidden"
 msgstr ""

-msgid "Reference planes shown"
+msgid "FEATURES"
 msgstr ""

-msgid "Reference planes hidden"
+msgid "Sketch"
+msgstr ""
+
+#, c-format, boost-format
+msgid "Sketch plane: %s — pick a tool"
+msgstr ""
+
+msgid "Click a face or a reference plane in the viewport, then a sketch tool"
+msgstr ""
+
+#, c-format, boost-format
+msgid ""
+"Sketch plane: %s.\n"
+"Pick a tool, or press Menu for the list."
+msgstr ""
+
+msgid "Click a face or a reference plane, then a sketch tool."
 msgstr ""

 msgid "Add material (extrude / revolve / sweep / loft / thicken / rib)"
@@ -20794,6 +20789,12 @@ msgstr ""
 msgid "Pick a cylindrical surface (bore / outer) or a circular edge for a thread"
 msgstr ""

+msgid "Import STEP (editable B-rep solid)"
+msgstr ""
+
+msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
+msgstr ""
+
 msgid "Constrain selected sketch"
 msgstr ""

@@ -21106,16 +21107,10 @@ msgstr ""
 msgid "New Design — clear the feature tree"
 msgstr ""

-msgid "Import STEP (editable B-rep solid)"
-msgstr ""
-
-msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
-msgstr ""
-
 msgid "Export STEP…"
 msgstr ""

-msgid "Create a new sketch"
+msgid "Show the printer bed and its plate grid"
 msgstr ""

 msgid "Place on Face (F) — lay the picked face on the bed"
@@ -21148,9 +21143,6 @@ msgstr ""
 msgid "Height / Y"
 msgstr ""

-msgid "Sketch"
-msgstr ""
-
 msgid "Distance X"
 msgstr ""

@@ -21629,9 +21621,6 @@ msgstr ""
 msgid "Value"
 msgstr ""

-msgid "Pick a tool, or press Menu for the list."
-msgstr ""
-
 msgid "Constraints"
 msgstr ""

@@ -21661,9 +21650,6 @@ msgstr ""
 msgid "Show / hide"
 msgstr ""

-msgid "Zoom to selection"
-msgstr ""
-
 msgid "Check interference — find overlapping bodies"
 msgstr ""

@@ -21721,9 +21707,6 @@ msgstr ""
 msgid "Sketch selected — right-click to Extrude, or double-click to edit"
 msgstr ""

-msgid "That face is not flat — click a flat face or a reference plane"
-msgstr ""
-
 #, c-format, boost-format
 msgid "Body %d: vertex selected — click again for the whole body"
 msgstr ""
@@ -21766,6 +21749,10 @@ msgstr ""
 msgid "Edge %d selected — Shift+click to add edges, or click again for the whole body"
 msgstr ""

+#, c-format, boost-format
+msgid "%s plane selected — right-click for the drawing tools"
+msgstr ""
+
 #, c-format, boost-format
 msgid "%s plane selected — right-click to sketch on it, or click an object to select it"
 msgstr ""
@@ -21820,7 +21807,7 @@ msgstr ""
 msgid "Text unchanged"
 msgstr ""

-msgid "Text canceled"
+msgid "Text cancelled"
 msgstr ""

 msgid "Import SVG"
@@ -22440,7 +22427,7 @@ msgstr ""

 msgid ""
 "Nothing yet — import a STEP or a mesh from the toolbar,\n"
-"or press Sketch and click a reference plane to start a sketch."
+"or click a reference plane and right-click it to start a sketch."
 msgstr ""

 msgid "No solid yet — select a sketch and right-click it to Extrude."
@@ -22472,25 +22459,12 @@ msgstr ""
 msgid "Finding the feature's faces…"
 msgstr ""

-msgid "The model is being rebuilt — zoom again when it finishes"
-msgstr ""
-
-#, c-format, boost-format
-msgid "%s has nothing on show to zoom to"
+msgid "Select a body first — click it in the viewport or the Bodies list"
 msgstr ""

 msgid "That body has no display mesh yet — recompute first"
 msgstr ""

-msgid "Select something to zoom to"
-msgstr ""
-
-msgid "Finish or cancel what is open first"
-msgstr ""
-
-msgid "Select a body first — click it in the viewport or the Bodies list"
-msgstr ""
-
 msgid "Drag the arrows to move, the rings to rotate — then Confirm (Esc cancels)"
 msgstr ""

@@ -22510,6 +22484,9 @@ msgstr ""
 msgid "Placed on face — body laid flat on the bed"
 msgstr ""

+msgid "Finish or cancel what is open first"
+msgstr ""
+
 #, c-format, boost-format
 msgid "Edit rejected: %s"
 msgstr ""
@@ -22858,16 +22835,6 @@ msgstr ""
 msgid "Line E%d"
 msgstr ""

-#, c-format, boost-format
-msgid "Sketch plane: %s — pick a tool"
-msgstr ""
-
-#, c-format, boost-format
-msgid ""
-"Sketch plane: %s.\n"
-"Pick a tool, or press Menu for the list."
-msgstr ""
-
 msgid "Plane ready"
 msgstr ""

@@ -23084,10 +23051,7 @@ msgctxt "Design"
 msgid "Sketch"
 msgstr ""

-msgid "Select a flat face or a reference plane to sketch on"
-msgstr ""
-
-msgid "Sketch on the selected flat face or plane, or click one next"
+msgid "Click a face or a reference plane, then pick a drawing tool"
 msgstr ""

 msgctxt "Design"
@@ -23157,6 +23121,9 @@ msgctxt "Design"
 msgid "Hole"
 msgstr ""

+msgid "Drill a hole, centerd on a picked face or placed on a plane"
+msgstr ""
+
 msgctxt "Design"
 msgid "Thread"
 msgstr ""
@@ -23319,13 +23286,6 @@ msgstr ""
 msgid "Set the selected body's display color"
 msgstr ""

-msgctxt "Design"
-msgid "Zoom to selection"
-msgstr ""
-
-msgid "Frame the selection in the view, keeping the view direction"
-msgstr ""
-
 msgctxt "Design"
 msgid "Delete"
 msgstr ""
@@ -513,7 +513,7 @@
      "gui": true,
      "action": "key:S+H",
      "icon": "design_hole",
-      "hint": "Drill a hole, centered on a picked face or placed on a plane"
+      "hint": "Drill a hole, centerd on a picked face or placed on a plane"
    },
    {
      "id": "thread",
@@ -466,8 +466,6 @@ void SkeletalTrapezoidation::constructFromPolygons(const Polygons& polys)
            edge.from->incident_edge = &edge;
 }

-using NodeSet = SkeletalTrapezoidation::NodeSet;
-
 void SkeletalTrapezoidation::separatePointyQuadEndNodes()
 {
    NodeSet visited_nodes;
@@ -93,7 +93,6 @@ using namespace libnest2d;
 using Item         = _Item<ExPolygon>;
 using Box          = _Box<Point>;
 using Circle       = _Circle<Point>;
-using Segment      = _Segment<Point>;
 using MultiPolygon = ExPolygons;

 // Summon the spatial indexing facilities from boost
@@ -2851,7 +2851,6 @@ bool is_patch_inside_of_model(const SurfacePatch &patch,
 /// <returns>shape point index</returns>
 uint32_t get_shape_point_index(const CutAOI &cut, const CutMesh &model);

-using PatchNumber = CutMesh::Property_map<FI, size_t>;
 /// <summary>
 /// Separate triangles singned with number n
 /// </summary>
@@ -32,8 +32,6 @@

 // #define DEBUG_FUZZY

-using namespace Slic3r;
-
 namespace Slic3r::Feature::FuzzySkin {

 // Produces a random value between 0 and 1. Thread-safe.
@@ -122,8 +122,6 @@ Polylines get_polylines(const ScalarField& sf, const double tolerance = SCALED_E

 namespace Slic3r {

-using namespace std;
-
 void FillTpmsFK::_fill_surface_single(const FillParams&              params,
                                      unsigned int                   thickness_layers,
                                      const std::pair<float, Point>& direction,
@@ -25,7 +25,6 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <vector>
 #include <utility>
-namespace pt = boost::property_tree;

 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string.hpp>
@@ -1135,7 +1135,6 @@ void SeamPlacer::gather_seam_candidates(const PrintObject *po, const SeamPlacerI

 void SeamPlacer::calculate_candidates_visibility(const PrintObject *po,
                                                 const SeamPlacerImpl::GlobalModelInfo &global_model_info) {
-  using namespace SeamPlacerImpl;

  std::vector<PrintObjectSeamData::LayerSeams> &layers = m_seam_per_object[po].layers;
  tbb::parallel_for(tbb::blocked_range<size_t>(0, layers.size()),
@@ -1482,7 +1482,6 @@ static FilamentGroupContext build_filament_group_context(
    FilamentMapMode                                  mode,
    const std::unordered_map<int, int>&              nozzle_status)
 {
-    using namespace MultiNozzleUtils;
    using namespace FilamentGroupUtils;

    FilamentGroupContext context;
@@ -1691,7 +1690,6 @@ static std::vector<int> apply_master_extruder_preference(const FilamentGroupCont
 // multi-nozzle (H2C/A2L) resolves to a nozzle-granular result.
 MultiNozzleUtils::LayeredNozzleGroupResult ToolOrdering::get_recommended_filament_maps(const std::vector<std::vector<unsigned int>>& layer_filaments, const Print* print, const FilamentMapMode mode, const std::vector<std::set<int>>& physical_unprintables, const std::vector<std::set<int>>& geometric_unprintables, const std::map<int, std::set<NozzleVolumeType>>& unprintable_volumes, const std::unordered_map<int, int>& nozzle_status)
 {
-    using namespace FilamentGroupUtils;
    using namespace MultiNozzleUtils;

    if (!print || layer_filaments.empty())
@@ -230,7 +230,6 @@ std::vector<Bridge> get_grouped_bridges(
    {
        result.reserve(bridge_expansions.size());
        uint32_t group_id = 0;
-        using std::move_iterator;
        for (ExPolygon& expolygon : bridge_expolygons)
            result.push_back({ std::move(expolygon), group_id ++, bridge_expansions.end() });
    }
@@ -432,7 +431,6 @@ Surfaces expand_bridges_detect_orientations(
    const float closing_radius
 )
 {
-    using namespace Slic3r::Algorithm;

    double thickness;
    ExPolygons bridge_expolygons = fill_surfaces_extract_expolygons(surfaces, {stBottomBridge}, thickness);
@@ -660,7 +660,6 @@ bool empty(const CGALMesh &mesh)

 bool repair(TriangleMesh& mesh, RepairedMeshErrors* repaired_errors, std::string* error)
 {
-    using namespace CGAL;
    namespace PMP = CGAL::Polygon_mesh_processing;

    if (mesh.empty())
@@ -263,7 +263,6 @@ size_t get_shapes_count(const NSVGimage &image)
 } // namespace Slic3r

 namespace {
-using namespace Slic3r; // Polygon + Vec2f

 Point::coord_type to_coor(float val, double scale) { return static_cast<Point::coord_type>(std::round(val * scale)); }

@@ -2175,7 +2175,6 @@ namespace client
    {
        macro_processor() : macro_processor::base_type(start)
        {
-            using namespace qi::labels;
            qi::alpha_type              alpha;
            qi::alnum_type              alnum;
            qi::eps_type                eps;
@@ -1527,7 +1527,6 @@ bool PresetBundle::apply_vendor_config(
    const std::string& preferred_printer_variant,
    const std::string& preferred_filament)
 {
-    namespace fs = boost::filesystem;

    // Get current configuration from AppConfig
    const auto old_vendors = app_config->vendors();
@@ -404,7 +404,6 @@ std::string debug_out_path(const char *name, ...)
 }

 namespace logging = boost::log;
-namespace src = boost::log::sources;
 namespace expr = boost::log::expressions;
 namespace keywords = boost::log::keywords;
 namespace attrs = boost::log::attributes;
@@ -892,7 +891,6 @@ int copy_file_linux_read_write(int infile, int outfile, uintmax_t file_size)
 // and only features supported by Linux 3.10 (on our build server with CentOS 7) are kept, namely sendfile with ranges and statx() are not supported.
 bool copy_file_linux(const boost::filesystem::path &from, const boost::filesystem::path &to, boost::system::error_code &ec)
 {
-	using namespace boost::filesystem;

 	struct fd_wrapper
 	{
@@ -22,8 +22,6 @@
 #include "CapsuleButton.hpp"

 namespace Slic3r::GUI { struct IntEvent; }
-using namespace Slic3r;
-using namespace Slic3r::GUI;

 namespace Slic3r { namespace GUI {
 #define ANIMATION_REFRESH_INTERVAL 20
@@ -45,8 +45,6 @@
    #include <gtk/gtk.h>
 #endif

-using Slic3r::GUI::format_wxstr;
-
 #define BORDER_W 10

 // ---------------------------------
@@ -117,7 +117,7 @@ static const OfferVerb kOfferVerbs[] = {
    {"surf_loft", L_CONTEXT("Surface Loft", "Design"), 1, nullptr, "fly:surface#2", L("Create at least two profile sketches to loft"), 0x00004000u, 0, 2, false, false, nullptr, "design_loft", L("Loft (skin) between 2+ profiles, open (no end caps)")},
    {"surf_fill", L_CONTEXT("Surface Fill", "Design"), 1, nullptr, "fly:surface#3", L("Create a closed sketch first"), 0x00004000u, 0, 0, false, false, nullptr, "design_surface", L("Fill a sketch boundary with a smooth face")},
    {"thicken_surf", L_CONTEXT("Thicken Surface", "Design"), 1, nullptr, "fly:surface#5", L("Thicken Surface needs a surface body — make one with a Surface tool first"), 0x00000100u, 0, 0, true, false, nullptr, "design_thicken", L("Thicken a sheet body into a solid")},
-    {"hole", L_CONTEXT("Hole", "Design"), 2, "Shift+H", "key:S+H", L("Pick a face or a plane to drill into"), 0x00000402u, 1, 0, false, false, nullptr, "design_hole", L("Drill a hole, centered on a picked face or placed on a plane")},
+    {"hole", L_CONTEXT("Hole", "Design"), 2, "Shift+H", "key:S+H", L("Pick a face or a plane to drill into"), 0x00000402u, 1, 0, false, false, nullptr, "design_hole", L("Drill a hole, centerd on a picked face or placed on a plane")},
    {"thread", L_CONTEXT("Thread", "Design"), 2, "Shift+T", "key:S+T", L("Pick a cylindrical surface (bore / outer) or a circular edge for a thread"), 0x00000024u, 1, 0, false, false, nullptr, "design_thread", L("Thread a cylindrical surface (inner bore / outer) or a circular edge")},
    {"shell", L_CONTEXT("Shell", "Design"), 2, "Shift+K", "key:S+K", L("Shell needs a solid body — add or import one first"), 0x00000082u, 1, 0, false, false, nullptr, "design_shell", L("Hollow the body to a wall thickness, opening a picked face")},
    {"cut", L_CONTEXT("Cut", "Design"), 2, "Shift+X", "key:S+X", L("Cut needs a solid body — add or import one first"), 0x000004feu, 1, 0, false, false, nullptr, "design_cut", L("Trim the body with a plane — drag the offset arrow; keep one half or both")},
@@ -4805,7 +4805,7 @@ void DesignPanel::text_dialog_done(bool accepted)
        if (have) m_doc.undo();   // a new text leaves, an edited one gets its old outline back
        refresh_tree();
        sync_sketch_display();
-        set_status(StatusKind::Info, editing ? _L("Text unchanged") : _L("Text canceled"));
+        set_status(StatusKind::Info, editing ? _L("Text unchanged") : _L("Text cancelled"));
        return;
    }
    if (!have) return;
@@ -95,7 +95,6 @@ namespace GUI {


 using Config::Snapshot;
-using Config::SnapshotDB;


 // Configuration data structures extensions needed for the wizard
@@ -5,8 +5,6 @@
 #include <map>
 #include <nlohmann/json.hpp>

-using namespace nlohmann;
-
 namespace Slic3r
 {

@@ -1,11 +1,8 @@
-#include <nlohmann/json.hpp>
 #include "DevExtruderSystem.h"

 #include "slic3r/GUI/DeviceManager.hpp"


-using namespace nlohmann;
-
 namespace Slic3r
 {
    int DevExtderSystem::CtrlRetrySwitching()
@@ -6,7 +6,6 @@
 #include <limits>

 #include <map>
-#include <nlohmann/json.hpp>
 #include <vector>
 #include <string>
 #include <utility>
@@ -21,8 +20,6 @@
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/GuiColor.hpp"

-using namespace nlohmann;
-
 namespace Slic3r
 {
    bool DevMappingUtil::is_valid_mapping_result(const MachineObject* obj, std::vector<FilamentInfo>& result, bool check_empty_slot)
@@ -115,8 +115,6 @@ namespace fs = boost::filesystem;

 #define ORCA_NETWORK_DEBUG

-namespace pt = boost::property_tree;
-
 float string_to_float(const std::string& str_value) {
    float value = 0.0;
    fast_float::from_chars(str_value.c_str(), str_value.c_str() + str_value.size(), value);
@@ -38,9 +38,6 @@
 #include "wx/private/markupparser.h"
 #endif // wxUSE_ACCESSIBILITY

-using Slic3r::GUI::from_u8;
-using Slic3r::GUI::into_u8;
-

 //-----------------------------------------------------------------------------
 // DataViewBitmapText
@@ -3112,11 +3112,8 @@ bool GUI_App::on_init_inner()
    // A quit request from the Dock, a logout or a restart ends with AppKit calling exit() right after this event, so
    // OnExit() and ~GUI_App() never run. Shut the plugins and Python down here as ~GUI_App() does. Left to
    // PluginManager's static destructor, the shutdown locks hook state that has already been destroyed and aborts.
-    // Unload the Bambu network plugin too. Its static destructors abort if its agent's threads are still running.
-    wxGetApp().Bind(wxEVT_END_SESSION, [this](wxCloseEvent &e) {
+    wxGetApp().Bind(wxEVT_END_SESSION, [](wxCloseEvent &e) {
        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "received wxEVT_END_SESSION";
-        stop_sync_user_preset();
-        Slic3r::NetworkAgent::unload_network_module();
        Slic3r::PluginManager::instance().shutdown();
        Slic3r::PythonInterpreter::instance().shutdown();
        e.Skip();
@@ -4098,8 +4098,6 @@ void GLGizmoCut3D::apply_cut_connectors(ModelObject* mo, const std::string& conn
    if (mo->cut_connectors.empty())
        return;

-    using namespace Geometry;
-
    size_t connector_id = mo->cut_id.connectors_cnt();
    for (const CutConnector& connector : mo->cut_connectors) {
        TriangleMesh mesh = TriangleMesh(get_connector_mesh(connector.attribs));
@@ -77,7 +77,6 @@
 #include <fstream>

 using namespace Slic3r;
-using namespace Slic3r::Emboss;
 using namespace Slic3r::GUI;
 using namespace Slic3r::GUI::Emboss;

@@ -19,9 +19,6 @@
 #include <wx/window.h>
 #include "wxExtensions.hpp"

-using namespace Slic3r;
-using namespace Slic3r::GUI;
-
 namespace Slic3r { namespace GUI {
 #define ANIMATION_REFRESH_INTERVAL 20
 ImageDPIFrame::ImageDPIFrame()
@@ -30,7 +30,6 @@
 #include "libslic3r/libslic3r.h"
 #include <exception>

-using namespace Slic3r;
 using namespace Slic3r::GUI;

 const std::string CreateFontImageJob::default_text = "AaBbCc 123";
@@ -23,9 +23,6 @@
 #include <exception>
 #include <cstdint>

-using namespace Slic3r;
-using namespace Slic3r::Emboss;
-using namespace Slic3r::GUI;
 using namespace Slic3r::GUI::Emboss;


@@ -293,7 +293,6 @@ VideoMonitoringBasePanel::~VideoMonitoringBasePanel()


 ///////////////////////////////////////////////////////////////////////////
-using namespace Slic3r::GUI;

 TaskListBasePanel::TaskListBasePanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxPanel(parent, id, pos, size, style, name)
 {
@@ -1,4 +1,3 @@
-#include <boost/optional/optional.hpp>
 #include <array>
 #include <cassert>
 #include <cmath>
@@ -60,7 +59,6 @@
 #include <future>
 #include <glad/gl.h>
 #include <boost/algorithm/string.hpp>
-#include <boost/optional.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
@@ -113,9 +111,6 @@
 #include "slic3r/GUI/GLModel.hpp"

 class wxFont;
-namespace boost { template <class T> class optional; }
-using boost::optional;
-namespace fs = boost::filesystem;

 static const float GROUND_Z = -0.03f;
 static const float GROUND_Z_GRIDLINE = -0.26f;
@@ -296,11 +296,7 @@
 #include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevDefs.h"

-using boost::optional;
 namespace fs = boost::filesystem;
-using Slic3r::_3DScene;
-using Slic3r::Preset;
-using Slic3r::GUI::format_wxstr;
 using namespace nlohmann;

 static const std::pair<unsigned int, unsigned int> THUMBNAIL_SIZE_3MF = { 512, 512 };
@@ -81,8 +81,6 @@
    #include <gtk/gtk.h>
 #endif

-using Slic3r::GUI::format_wxstr;
-
 namespace Slic3r {
 namespace GUI {

@@ -76,8 +76,6 @@

 namespace Slic3r::GUI { class Plater; }

-namespace fs = boost::filesystem;
-
 namespace Slic3r { namespace GUI {

 wxDEFINE_EVENT(EVT_SECONDARY_CHECK_CONFIRM, wxCommandEvent);
@@ -42,8 +42,6 @@

 #include "Widgets/DialogButtons.hpp"

-using Slic3r::GUI::format_wxstr;
-
 namespace Slic3r { namespace GUI {

 #define BORDER_W 10
@@ -1,6 +1,5 @@
 #include "Search.hpp"

-#include <boost/optional/optional.hpp>
 #include "slic3r/GUI/GUI.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/Config.hpp"
@@ -22,7 +21,6 @@
 #include <cstddef>
 #include <string>
 #include <boost/algorithm/string.hpp>
-#include <boost/optional.hpp>
 #include <boost/nowide/convert.hpp>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
@@ -56,8 +54,6 @@
 #include "LinuxDisplayBackend.hpp"
 #endif

-using boost::optional;
-
 namespace Slic3r {

 wxDEFINE_EVENT(wxCUSTOMEVT_JUMP_TO_OPTION, wxCommandEvent);
@@ -86,9 +86,6 @@

 namespace fs = boost::filesystem;

-using namespace Slic3r;
-using namespace Slic3r::GUI;
-
 #define OK_BUTTON_SIZE wxSize(FromDIP(90), FromDIP(24))
 #define CANCEL_BUTTON_SIZE wxSize(FromDIP(58), FromDIP(24))
 #define SyncAmsInfoDialogWidth  FromDIP(675)
@@ -1,6 +1,5 @@
 #include "UnsavedChangesDialog.hpp"

-#include <boost/optional/optional.hpp>
 #include <cmath>
 #include <boost/algorithm/string/replace.hpp>
 #include <cassert>
@@ -26,7 +25,6 @@
 #include <string>
 #include <vector>
 #include <boost/algorithm/string.hpp>
-#include <boost/optional.hpp>

 #include <wx/colour.h>
 #include <wx/dataview.h>
@@ -66,8 +64,6 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/HyperLink.hpp"

-using boost::optional;
-
 #ifdef __linux__
 #define wxLinux true
 #else
@@ -82,8 +82,6 @@

 class wxWindow;

-namespace fs = boost::filesystem;
-
 using namespace nlohmann;

 namespace Slic3r { namespace GUI {
@@ -53,7 +53,6 @@
 #include <sstream>
 #include <slic3r/GUI/Widgets/WebView.hpp>
 #include <slic3r/GUI/Widgets/HyperLink.hpp> // ORCA
-using namespace std;

 using namespace nlohmann;

@@ -43,9 +43,6 @@
 #include <wx/utils.h>


-using json = nlohmann::json;
-
-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;

 namespace {
@@ -21,7 +21,6 @@
 #include "Http.hpp"


-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;


@@ -18,8 +18,6 @@
 #include <vector>
 #include "libslic3r/AppConfig.hpp"

-using json = nlohmann::json;
-
 namespace Slic3r {


@@ -22,8 +22,6 @@
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -55,7 +53,6 @@
 #include <nlohmann/json.hpp>
 #include <wx/string.h>
 using json = nlohmann::json;
-using std::to_string;

 namespace beast = boost::beast;
 namespace http = beast::http;
@@ -63,9 +60,6 @@ namespace websocket = beast::websocket;
 namespace net = boost::asio;
 using tcp = boost::asio::ip::tcp;

-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-
 namespace Slic3r {

 CrealityPrint::CrealityPrint(DynamicPrintConfig* config) : 
@@ -214,7 +214,6 @@ bool CrealityPrintAgent::parse_cfs_response(const std::string&    response,
                                            int&                  box_count,
                                            std::string&          error)
 {
-    using nlohmann::json;

    slots.clear();
    box_count = 0;
@@ -3,11 +3,8 @@
 #include <algorithm>
 #include <cassert>
 #include <ctime>
-#include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>

 #include <utility>
 #include <wx/frame.h>
@@ -25,9 +22,6 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "Http.hpp"

-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-
 namespace Slic3r {

 Duet::Duet(DynamicPrintConfig *config) :
@@ -7,8 +7,6 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

@@ -28,9 +26,6 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "Http.hpp"

-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-
 namespace Slic3r {

 ESP3D::ESP3D(DynamicPrintConfig* config) : m_host(config->opt_string("print_host")), m_console_port("8888") {}
@@ -50,7 +50,6 @@
 #include "slic3r/GUI/BonjourDialog.hpp"
 #include <boost/asio/ip/address.hpp>

-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;
 #define MAX_UPLOAD_PACKAGE_LENGTH 1048576 //(1024*1024)

@@ -561,7 +561,6 @@ bool StyleManager::set_wx_font(const wxFont &wx_font, std::unique_ptr<FontFile>
 // StylesSerializable
 namespace {

-using namespace Slic3r;
 using namespace Slic3r::GUI;
 using Section = std::map<std::string,std::string>;

@@ -2,7 +2,6 @@

 #include <algorithm>
 #include <ctime>
-#include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -23,9 +22,6 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "Http.hpp"

-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-
 namespace Slic3r {

 FlashAir::FlashAir(DynamicPrintConfig *config) :
@@ -25,8 +25,6 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

@@ -55,7 +53,6 @@
 #include "SerialMessageType.hpp"

 namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
 using json = nlohmann::json;

 namespace Slic3r {
@@ -13,8 +13,6 @@
 #include <fontconfig/fontconfig.h>
 #include "libslic3r/Utils.hpp"

-using namespace Slic3r::GUI;
-

 // @Vojta suggest to make static variable global
 // Guard for finalize Font Config
@@ -4,11 +4,8 @@
 #include <ctime>
 #include <chrono>
 #include <thread>
-#include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

@@ -31,9 +28,6 @@
 #include "SerialMessage.hpp"
 #include "SerialMessageType.hpp"

-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-
 namespace Slic3r {

 MKS::MKS(DynamicPrintConfig* config) :
@@ -30,7 +30,6 @@
 #include "libslic3r/AppConfig.hpp"
 #include "slic3r/GUI/BonjourDialog.hpp"

-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;


@@ -37,7 +37,6 @@
 #include <boost/asio/ip/address.hpp>
 #include <cstddef>

-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;


@@ -64,8 +64,6 @@ namespace Slic3r::GUI::Config { class SnapshotDB; }
 namespace fs = boost::filesystem;
 using Slic3r::GUI::Config::Index;
 using Slic3r::GUI::Config::Version;
-using Slic3r::GUI::Config::Snapshot;
-using Slic3r::GUI::Config::SnapshotDB;


 // FIXME: Incompat bundle resolution doesn't deal with inherited user presets
@@ -1,6 +1,5 @@
 #include "PrintHost.hpp"

-#include <boost/optional/optional.hpp>
 #include "libslic3r/Config.hpp"
 #include <string>
 #include <boost/algorithm/string/predicate.hpp>
@@ -16,7 +15,6 @@
 #include <thread>
 #include <exception>
 #include <sstream>
-#include <boost/optional.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
 #include <nlohmann/json.hpp>
@@ -50,7 +48,6 @@
 #include "Moonraker.hpp"

 namespace fs = boost::filesystem;
-using boost::optional;
 using Slic3r::GUI::PrintHostQueueDialog;

 namespace Slic3r {
@@ -18,8 +18,6 @@
 #include <utility>
 #include <vector>

-using json = nlohmann::json;
-
 namespace Slic3r {

 namespace {
@@ -27,7 +27,6 @@
 #include "Http.hpp"


-namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;


@@ -288,7 +288,6 @@ std::vector<std::string> scan_serial_ports()
 // Class Serial

 namespace asio = boost::asio;
-using boost::system::error_code;

 Serial::Serial(asio::io_service& io_service) :
 	asio::serial_port(io_service)
@@ -13,8 +13,6 @@
 #include <cstddef>
 #include <utility>

-using json = nlohmann::json;
-
 namespace Slic3r {

 namespace {
@@ -3,9 +3,7 @@
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/read_until.hpp>
-#include <boost/asio/steady_timer.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/bind/placeholders.hpp>
@@ -24,9 +22,6 @@
 #include "SerialMessage.hpp"
 #include "SerialMessageType.hpp"

-using boost::asio::steady_timer;
-using boost::asio::ip::tcp;
-
 namespace Slic3r {
 namespace Utils {

@@ -6,7 +6,6 @@
 #include <cstdio>
 #include <cassert>
 #include <ctime>
-#include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -34,8 +33,6 @@
 #include <iostream>
 #include <stdio.h>
 #include <string>
-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;

 namespace Slic3r {

@@ -16,7 +16,6 @@
 #include <boost/nowide/iostream.hpp>
 #include <boost/nowide/fstream.hpp>

-using namespace std;
 using json = nlohmann::json;

 int json_diff::diff_objects(json const &in, json &out, json const &base)
@@ -12,7 +12,6 @@
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/libslic3r.h"

-using namespace Slic3r::Test;
 using namespace Slic3r;

 /// Test the expected behavior for auto-width,
@@ -27,8 +27,6 @@

 #include "test_utils.hpp"

-using namespace std;
-
 namespace Slic3r { namespace Test {

 const std::unordered_map<TestMesh, const char*, TestMeshHash> mesh_names {
@@ -19,7 +19,6 @@
 #include "libslic3r/Print.hpp"

 using namespace Slic3r;
-using namespace Slic3r::Test;

 SCENARIO("Model construction", "[Model]") {
    GIVEN("A Slic3r Model") {
@@ -21,7 +21,6 @@
 //#include "test_options.hpp"

 using namespace Slic3r;
-using namespace std;

 static inline TriangleMesh make_cube() { return make_cube(20., 20, 20); }

@@ -241,7 +241,6 @@ TEST_CASE("Arachne wall generation - 60% min_bead_width", "[Arachne]") {
 // getTransitionThickness(1) = (1 + 0.619) * 0.42 = 0.68mm. A 0.5mm-thick wall therefore sits
 // in the transition band: alpha produced 2 beads here, beta collapses it to 1 fat bead.
 TEST_CASE("Arachne widening keeps two beads in transition band (#14376)", "[Arachne]") {
-    using namespace Slic3r::Arachne;

    // Widths in mm; the scaled coord_t values and the thresholds below are both derived from
    // these so a width change cannot silently desync the transition-band math.
@@ -992,7 +992,6 @@ TEST_CASE("tessellate tracks per-triangle face id", "[CadDocument]")

 TEST_CASE("extrude two-sided + through-all + intersect", "[CadDocument]")
 {
-    using namespace Slic3r;
    SketchPlane xy = SketchPlane::XY();
    // a 10x10 square wire centred on origin
    SketchProfile sp;
@@ -1013,7 +1012,6 @@ TEST_CASE("extrude two-sided + through-all + intersect", "[CadDocument]")

 TEST_CASE("extrude taper + up-to-face distance", "[CadDocument]")
 {
-    using namespace Slic3r;
    SketchPlane xy = SketchPlane::XY();
    SketchProfile sp; sp.points = { Vec2d(-5,-5),Vec2d(5,-5),Vec2d(5,5),Vec2d(-5,5) }; sp.closed = true;
    TopoDS_Wire w = sp.to_occt_wire(xy);
@@ -1047,7 +1045,6 @@ TEST_CASE("extrude taper + up-to-face distance", "[CadDocument]")
 // asserting, because that is what "the thread actually cuts" means.
 TEST_CASE("internal thread cuts a visible groove into the bore wall", "[CadDocument][thread]")
 {
-    using namespace Slic3r;
    SketchPlane xy = SketchPlane::XY();

    // 40x40x20 box centred on the origin, extruded +Z.
@@ -1093,7 +1090,6 @@ TEST_CASE("internal thread cuts a visible groove into the bore wall", "[CadDocum

 TEST_CASE("revolve builds a solid of revolution about an in-plane axis", "[CadDocument]")
 {
-    using namespace Slic3r;
    SketchPlane xy = SketchPlane::XY();

    // Rectangle profile (10 wide x 10 tall, area 100) offset to +v so it lies entirely
@@ -1136,7 +1132,6 @@ TEST_CASE("revolve builds a solid of revolution about an in-plane axis", "[CadDo

 TEST_CASE("sweep builds a solid by sweeping a profile along a path", "[CadDocument]")
 {
-    using namespace Slic3r;
    CadDocument doc;

    // Profile: circle r=5 on the XY plane at the origin (area = 25*pi).
@@ -1172,7 +1167,6 @@ TEST_CASE("sweep builds a solid by sweeping a profile along a path", "[CadDocume

 TEST_CASE("pattern replicates a body linearly and circularly", "[CadDocument]")
 {
-    using namespace Slic3r;

    // Linear: a 10x10x10 box (V=1000) repeated 3x at 20mm spacing along plane X.
    // 20 > 10 so the copies are disjoint -> total V = 3*1000 = 3000.
@@ -1221,8 +1215,6 @@ TEST_CASE("pattern replicates a body linearly and circularly", "[CadDocument]")
 TEST_CASE("pattern-on-curve: copies land on a line and bbox spans the curve length", "[CadDocument][pattern]")
 {
    using Catch::Matchers::WithinAbs;
-    using Catch::Matchers::WithinRel;
-    using namespace Slic3r;

    CadDocument doc;

@@ -1250,7 +1242,6 @@ TEST_CASE("pattern-on-curve: copies land on a line and bbox spans the curve leng

 TEST_CASE("pattern-on-curve: bad refs are safe", "[CadDocument][pattern]")
 {
-    using namespace Slic3r;

    CadDocument doc;
    int s0 = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 4, 4, 0, "Seed");
@@ -1266,7 +1257,6 @@ TEST_CASE("pattern-on-curve: bad refs are safe", "[CadDocument][pattern]")
 TEST_CASE("pattern-on-curve: round-trip through serialize/deserialize", "[CadDocument][pattern]")
 {
    using Catch::Matchers::WithinRel;
-    using namespace Slic3r;

    CadDocument doc;
    int s0 = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 4, 4, 0, "Seed");
@@ -1312,7 +1302,6 @@ TEST_CASE("pattern-on-curve: round-trip through serialize/deserialize", "[CadDoc

 TEST_CASE("thread standards table carries correct ISO/UTS measures", "[CadDocument]")
 {
-    using namespace Slic3r;

    // Table is non-empty and every entry is self-consistent.
    const auto& table = thread_standards();
@@ -1459,7 +1448,6 @@ TEST_CASE("loft builds a solid skinning two profiles on parallel planes", "[CadD

 TEST_CASE("draft tapers a solid face about the body base", "[CadDocument]")
 {
-    using namespace Slic3r;

    // 10x10x10 box from z=0..10 (V=1000). Drafting a vertical side face by +10deg about
    // the bottom (neutral) plane tilts its top edge inward, removing material so V<1000.
@@ -1740,7 +1728,6 @@ TEST_CASE("split by face keep upper only", "[CadDocument][cut]")

 TEST_CASE("split by face round-trip serialization", "[CadDocument][cut]")
 {
-    using Catch::Matchers::WithinRel;
    using Catch::Matchers::WithinAbs;

    CadDocument doc;
@@ -1808,7 +1795,6 @@ TEST_CASE("split by face round-trip serialization", "[CadDocument][cut]")
 TEST_CASE("mirror reflects a body about a plane", "[CadDocument]")
 {
    using Catch::Matchers::WithinRel;
-    using Catch::Matchers::WithinAbs;

    auto make_box = [](CadDocument& doc, double w, double h, double d) {
        int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), w, h, 0, "Box");
@@ -1939,7 +1925,6 @@ TEST_CASE("mirror reflects a body about a plane", "[CadDocument]")

 TEST_CASE("mirror serialization round-trip", "[CadDocument]")
 {
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Box");
@@ -2453,7 +2438,6 @@ TEST_CASE("a v3 recipe is refused with a message naming the version", "[CadDocum

 TEST_CASE("re-edit: editing a mid-timeline feature rebuilds downstream", "[CadDocument]")
 {
-    using Catch::Matchers::WithinRel;
    CadDocument doc;

    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(),
@@ -2486,7 +2470,6 @@ TEST_CASE("re-edit: editing a mid-timeline feature rebuilds downstream", "[CadDo

 TEST_CASE("re-edit survives serialize -> deserialize", "[CadDocument]")
 {
-    using Catch::Matchers::WithinRel;
    CadDocument doc;

    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(),
@@ -2519,7 +2502,6 @@ TEST_CASE("re-edit survives serialize -> deserialize", "[CadDocument]")

 TEST_CASE("re-edit: multi-type timeline replays all downstream features", "[CadDocument]")
 {
-    using Catch::Matchers::WithinRel;
    CadDocument doc;

    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(),
@@ -2994,7 +2976,6 @@ TEST_CASE("datum coordinate system: point_world gives world axes", "[CadDocument
 TEST_CASE("helix curve: arc length, bounding box, left-handed, conical", "[CadDocument]")
 {
    using Catch::Matchers::WithinRel;
-    using Catch::Matchers::WithinAbs;

    // --- Cylindrical helix r=5, pitch=2, height=10 (5 turns) ---
    // One turn arc length = sqrt((2*pi*r)^2 + pitch^2) = sqrt((10*pi)^2 + 4).
@@ -3386,7 +3367,6 @@ TEST_CASE("transform degenerate axis errors", "[CadDocument]")

 TEST_CASE("transform moved body participates in later boolean at its new position", "[CadDocument]")
 {
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    // Two boxes that do NOT overlap
@@ -3516,7 +3496,6 @@ TEST_CASE("thicken a planar face to a plate", "[CadDocument]")

 TEST_CASE("thicken flip offsets against face normal", "[CadDocument]")
 {
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "BoxSketch");
@@ -3615,7 +3594,6 @@ TEST_CASE("thicken zero thickness returns error", "[CadDocument]")

 TEST_CASE("thickened plate fuses with source", "[CadDocument]")
 {
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Box");
@@ -3649,7 +3627,6 @@ TEST_CASE("thickened plate fuses with source", "[CadDocument]")
 TEST_CASE("thicken round-trip serialization", "[CadDocument]")
 {
    using Catch::Matchers::WithinAbs;
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Box");
@@ -3833,7 +3810,6 @@ TEST_CASE("project bad face id returns error", "[CadDocument][project]")
 TEST_CASE("project round-trip serialization", "[CadDocument][project]")
 {
    using Catch::Matchers::WithinAbs;
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 10, "Box");
@@ -4609,8 +4585,6 @@ TEST_CASE("golden recipe v1 still deserialises", "[CadDocument]")

 TEST_CASE("rib adds material to a box", "[CadDocument][rib]")
 {
-    using Catch::Matchers::WithinRel;
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;

@@ -4763,7 +4737,6 @@ TEST_CASE("bridge two collinear lines", "[CadDocument][bridge]")

 TEST_CASE("bridge closes a C profile and extrudes", "[CadDocument][bridge]")
 {
-    using Catch::Matchers::WithinAbs;
    using Catch::Matchers::WithinRel;

    CadDocument doc;
@@ -4861,8 +4834,6 @@ TEST_CASE("bridge round-trip serialization", "[CadDocument][bridge]")

 TEST_CASE("delete_face removes a fillet face and restores volume", "[CadDocument][deleteface]")
 {
-    using Catch::Matchers::WithinRel;
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 10, "Box");
@@ -4912,7 +4883,6 @@ TEST_CASE("delete_face with bad face index fails safely", "[CadDocument][deletef

 TEST_CASE("delete_face round-trip serialization", "[CadDocument][deleteface]")
 {
-    using Catch::Matchers::WithinRel;
    using Catch::Matchers::WithinAbs;

    CadDocument doc;
@@ -4970,7 +4940,6 @@ TEST_CASE("delete_face round-trip serialization", "[CadDocument][deleteface]")

 TEST_CASE("hole: counterbore removes more material than a simple bore", "[CadDocument][hole]")
 {
-    using Catch::Matchers::WithinAbs;
    auto make_box_hole = [](int style, double cbore_d, double cbore_depth,
                             double csink_d, double csink_angle, const std::string& desig) {
        CadDocument doc;
@@ -4998,7 +4967,6 @@ TEST_CASE("hole: counterbore removes more material than a simple bore", "[CadDoc

 TEST_CASE("hole: countersink removes more material than a simple bore", "[CadDocument][hole]")
 {
-    using Catch::Matchers::WithinAbs;
    auto make_box = []() {
        CadDocument doc;
        int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 30, 30, 0, "Box");
@@ -5301,7 +5269,6 @@ TEST_CASE("parametric recipe round-trips through serialize/deserialize", "[CadDo

 TEST_CASE("surface-extrude makes an open shell", "[CadDocument][surface]")
 {
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Rect");
@@ -5324,7 +5291,6 @@ TEST_CASE("surface-extrude makes an open shell", "[CadDocument][surface]")

 TEST_CASE("surface-revolve makes an open shell", "[CadDocument][surface]")
 {
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    // A small rectangle offset from the axis: u=10..15, v=0..5.
@@ -5395,7 +5361,6 @@ TEST_CASE("surface round-trip serialize/deserialize", "[CadDocument][surface]")

 TEST_CASE("thicken-surface makes a solid from a sheet", "[CadDocument][surface]")
 {
-    using Catch::Matchers::WithinRel;
    using Catch::Matchers::WithinAbs;

    CadDocument doc;
@@ -5519,7 +5484,6 @@ TEST_CASE("thicken surface fills the corners of a closed-loop wall", "[CadDocume

 TEST_CASE("surface-offset creates another sheet shifted outward", "[CadDocument][surface]")
 {
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Rect");
@@ -5568,7 +5532,6 @@ TEST_CASE("thicken-surface on non-sheet fails", "[CadDocument][surface]")
 TEST_CASE("thicken-surface round-trip serialize/deserialize", "[CadDocument][surface]")
 {
    using Catch::Matchers::WithinAbs;
-    using Catch::Matchers::WithinRel;

    CadDocument doc;
    int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Rect");
@@ -5608,7 +5571,6 @@ TEST_CASE("thicken-surface round-trip serialize/deserialize", "[CadDocument][sur

 TEST_CASE("surface-loft makes an open shell", "[CadDocument][surface]")
 {
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    SketchProfile bot;
@@ -6315,7 +6277,6 @@ TEST_CASE("mate conflicts: a broken mate is left to apply_mate", "[CadDocument][

 TEST_CASE("ordering: fillet after mate resolves face ids", "[CadDocument][mate]")
 {
-    using Catch::Matchers::WithinAbs;

    CadDocument doc;
    int sk_a = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 10, 10, 0, "BoxA");
@@ -7846,7 +7807,6 @@ TEST_CASE("plane_of_face gives a sketchable plane for a planar face only", "[Cad
 // that asserts a state the code cannot reach is exactly what the contract forbids.
 TEST_CASE("recompute on a healthy box + fillet leaves no body null and no error (positive contract)", "[CadDocument]")
 {
-    using namespace Slic3r;
    CadDocument doc;
    SketchProfile sp;
    sp.points.push_back(Vec2d(0,  0));
@@ -8758,7 +8718,6 @@ TEST_CASE("a body carries its own name, through recompute and the recipe", "[Cad
 TEST_CASE("deleting a feature remaps the references of every consumer, not just Extrude",
          "[CadDocument]")
 {
-    using namespace Slic3r;
    const SketchPlane xy = SketchPlane::XY();

    // A rectangle 10x10 centred at v = 15, revolved 360 deg about the plane X axis.
@@ -9098,7 +9057,6 @@ namespace {
 // centerline x = 0 from (0,0) to (0,20): the half-profile of a tube, drawn the usual way.
 Slic3r::CadFeature tube_half_profile()
 {
-    using namespace Slic3r;
    CadFeature sk;
    sk.type  = CadFeatureType::Sketch;
    sk.plane = SketchPlane::XY();
@@ -9113,7 +9071,6 @@ Slic3r::CadFeature tube_half_profile()

 TEST_CASE("revolve about a line of the sketch", "[CadDocument][revolve]")
 {
-    using namespace Slic3r;

    SECTION("a construction centerline: the profile sweeps into a tube around it") {
        CadDocument doc;
@@ -16,7 +16,6 @@
 #include <cereal/types/vector.hpp>
 #include <cereal/archives/binary.hpp>

-#include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 #include "libslic3r/Config.hpp"
 #include <cstddef>
@@ -32,8 +31,6 @@
 #include <utility>
 #include <catch2/matchers/catch_matchers_vector.hpp>

-namespace fs = boost::filesystem;
-
 using namespace Slic3r;

 SCENARIO("Generic config validation performs as expected.", "[Config]") {
--- a/Show More
+++ b/Show More