Stop Format/STEP.hpp Defining a Global fs Alias

Every file that included STEP.hpp, directly or not, got namespace fs = boost::filesystem at global scope, and 29 sources and three headers relied on it without saying so. Headers now spell out boost::filesystem, and each source that uses fs declares the alias itself.

src/OrcaSlicer.cpp

@@ -141,6 +141,8 @@ using namespace nlohmann;
 #include "slic3r/GUI/GuiColor.hpp"
 #include <GLFW/glfw3.h>
 
+namespace fs = boost::filesystem;
+
 #ifdef __WXGTK__
 #if __has_include(<X11/Xlib.h>)
 #include <X11/Xlib.h>

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -58,6 +58,8 @@
 #include <set>
 #include <string>
 
+namespace fs = boost::filesystem;
+
 using namespace Slic3r;
 namespace po = boost::program_options;
 

src/libslic3r/Format/STEP.cpp

@@ -60,6 +60,8 @@
 #include "BRepTools.hxx"
 #include <IMeshTools_Parameters.hxx>
 
+namespace fs = boost::filesystem;
+
 
 namespace Slic3r {
 

src/libslic3r/Format/STEP.hpp

@@ -17,7 +17,6 @@
 #include <ostream>
 #include <vector>
 
-namespace fs = boost::filesystem;
 
 namespace Slic3r {
 
@@ -104,7 +103,7 @@ public:
         MESH_SUCCESS,
         MESH_ERROR
     };
-    Step(fs::path path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
+    Step(boost::filesystem::path path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
     Step(std::string path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
     ~Step();
     Step_Status load();

src/libslic3r/GCode.cpp

@@ -133,6 +133,8 @@ using namespace std::literals::string_view_literals;
 
 #include <assert.h>
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r {
 
     //! macro used to mark string used at localization,

src/libslic3r/Preset.cpp

@@ -87,6 +87,8 @@
 #include "PlaceholderParser.hpp"
 #include "libslic3r/GCode/Thumbnails.hpp"
 
+namespace fs = boost::filesystem;
+
 using boost::property_tree::ptree;
 
 namespace Slic3r {

src/libslic3r/PresetBundle.hpp

@@ -470,8 +470,8 @@ public:
 
     // Orca: Bundle metadata and cached preset names
     // std::map<std::string, BundleMetadata>  m_bundles;
-    fs::path dir_user_presets_local;
-    fs::path dir_user_presets_subscribed;
+    boost::filesystem::path dir_user_presets_local;
+    boost::filesystem::path dir_user_presets_subscribed;
     PresetBundleMetadata bundles;
 
         struct ObsoletePresets

src/libslic3r/Print.cpp

@@ -102,6 +102,8 @@
 
 #include <codecvt>
 
+namespace fs = boost::filesystem;
+
 using namespace nlohmann;
 
 // Mark string for localization and translate.

src/slic3r/GUI/Auxiliary.cpp

@@ -65,6 +65,8 @@
 #include "MainFrame.hpp"
 #include "Widgets/Label.hpp"
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r { namespace GUI {
 
 wxDEFINE_EVENT(EVT_AUXILIARY_IMPORT, wxCommandEvent);

src/slic3r/GUI/Auxiliary.hpp

@@ -99,7 +99,7 @@ public:
     bool                m_cover{false};
     wxStaticText*       m_text_name {nullptr};
     ::TextInput*        m_input_name {nullptr};
-    fs::path m_file_path;
+    boost::filesystem::path m_file_path;
     wxString m_add_file;
     wxString m_file_name;
     wxString cover_text_left;
@@ -116,7 +116,7 @@ public:
     ScalableBitmap m_bitmap_txt;
 
 public:
-    AuFile(wxWindow *parent, fs::path file_path, wxString file_name, AuxiliaryFolderType type, wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxTAB_TRAVERSAL);
+    AuFile(wxWindow *parent, boost::filesystem::path file_path, wxString file_name, AuxiliaryFolderType type, wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxTAB_TRAVERSAL);
     void enter_rename_mode();
     void exit_rename_mode();
     void OnPaint(wxPaintEvent &evt);
@@ -164,7 +164,7 @@ public:
     
     void clear();
     void update_cover();
-    void update(std::vector<fs::path> paths);
+    void update(std::vector<boost::filesystem::path> paths);
     void msw_rescale();
 
 public:
@@ -240,7 +240,7 @@ public:
     bool Show(bool show);
 
     // core logic
-    std::map<std::string, std::vector<fs::path>>    m_paths_list;
+    std::map<std::string, std::vector<boost::filesystem::path>>    m_paths_list;
     wxString                                        m_root_dir;
     void                                            init_auxiliary();
     void                                            create_folder(wxString name = wxEmptyString);

src/slic3r/GUI/AuxiliaryDataViewModel.cpp

@@ -21,6 +21,8 @@
 #include <wx/variant.h>
 #include <wx/types.h>
 
+namespace fs = boost::filesystem;
+
 const static std::array<wxString, 4> s_default_folders = {
     _L("Model Pictures"),
     _L("Bill of Materials"),

src/slic3r/GUI/ConfigWizard.cpp

@@ -83,6 +83,8 @@
 #include "UnsavedChangesDialog.hpp"
 #include "MainFrame.hpp"
 
+namespace fs = boost::filesystem;
+
 #if defined(__linux__) && defined(__WXGTK3__)
 #define wxLinux_gtk3 true
 #else

src/slic3r/GUI/DeviceManager.cpp

@@ -108,6 +108,8 @@
 
 #include "IPrinterAgent.hpp"
 
+namespace fs = boost::filesystem;
+
 #define CALI_DEBUG
 #define MINUTE_30 1800000    //ms
 #define TIME_OUT  5000       //ms

src/slic3r/GUI/GUI.cpp

@@ -58,6 +58,8 @@
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Utils.hpp"
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r {
 
 class AppConfig;

src/slic3r/GUI/HMS.cpp

@@ -25,6 +25,8 @@
 #include <mutex>
 #include <ctime>
 
+namespace fs = boost::filesystem;
+
 static const char* HMS_PATH = "hms";
 static const char* HMS_LOCAL_IMG_PATH = "hms/local_image";
 

src/slic3r/GUI/Jobs/PrintJob.cpp

@@ -35,6 +35,9 @@
 #include <boost/chrono/duration.hpp>
 #include "slic3r/GUI/DeviceCore/DevStorage.h"
 #include <wx/event.h>
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/Jobs/SendJob.cpp

@@ -20,6 +20,9 @@
 #include <wx/event.h>
 #include <functional>
 #include <exception>
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp

@@ -11,6 +11,8 @@
 #include "libslic3r/Utils.hpp"
 #include <exception>
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r {
 namespace GUI {
 

src/slic3r/GUI/PartSkipDialog.cpp

@@ -62,6 +62,8 @@
 
 #include "DeviceCore/DevManager.h"
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r { namespace GUI {
 
 extern wxString hide_passwd(wxString url, std::vector<wxString> const &passwords);

src/slic3r/GUI/Plater.hpp

@@ -376,8 +376,8 @@ public:
     // BBS: check snapshot
     bool up_to_date(bool saved, bool backup);
 
-    bool open_3mf_file(const fs::path &file_path);
-    int  get_3mf_file_count(std::vector<fs::path> paths);
+    bool open_3mf_file(const boost::filesystem::path &file_path);
+    int  get_3mf_file_count(std::vector<boost::filesystem::path> paths);
     void add_file();
     // Returns false when no object was added (e.g. the user cancelled the load dialog).
     bool add_model(bool imperial_units = false, std::string fname = "");

src/slic3r/GUI/PrivacyUpdateDialog.cpp

@@ -21,6 +21,9 @@
 #include <wx/log.h>
 #include <wx/webview.h>
 #include <wx/utils.h>
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/Project.cpp

@@ -57,6 +57,8 @@
 #include "MainFrame.hpp"
 #include <slic3r/GUI/Widgets/WebView.hpp>
 
+namespace fs = boost::filesystem;
+
 namespace Slic3r { namespace GUI {
 
 wxDEFINE_EVENT(EVT_PROJECT_RELOAD, wxCommandEvent);

src/slic3r/GUI/ReleaseNote.cpp

@@ -70,6 +70,9 @@
 #include "DeviceCore/DevStorage.h"
 #include "../Utils/Http.hpp"
 #include "md4c/src/md4c-html.h"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/SelectMachine.cpp

@@ -120,6 +120,9 @@
 #include "Notebook.hpp"
 #include "BitmapCache.hpp"
 #include "BindDialog.hpp"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/SendMultiMachinePage.cpp

@@ -61,6 +61,9 @@
 
 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevStorage.h"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/SendToPrinter.cpp

@@ -77,6 +77,9 @@
 #include "DeviceCore/DevStorage.h"
 #include "libslic3r_version.h"
 #include "slic3r/Utils/FileTransferUtils.hpp"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 
 namespace Slic3r {

src/slic3r/GUI/SyncAmsInfoDialog.cpp

@@ -78,6 +78,8 @@
 #include "DeviceCore/DevStorage.h"
 #include "FilamentBitmapUtils.hpp"
 
+namespace fs = boost::filesystem;
+
 using namespace Slic3r;
 using namespace Slic3r::GUI;
 

src/slic3r/GUI/WebGuideDialog.cpp

@@ -79,6 +79,8 @@
 #include <libslic3r/Utils.hpp>
 #include "CreatePresetsDialog.hpp"
 
+namespace fs = boost::filesystem;
+
 using namespace nlohmann;
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/Widgets/MultiNozzleSync.cpp

@@ -52,6 +52,9 @@
 #include <wx/webview.h>
 #include <wx/string.h>
 #include <wx/timer.h>
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/Widgets/WebView.cpp

@@ -34,6 +34,9 @@
 #include <wx/uri.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 #if defined(__WIN32__) || defined(__WXMAC__)
 #include "wx/private/jsscriptwrapper.h"
 #endif

src/slic3r/GUI/WipeTowerDialog.cpp

@@ -40,6 +40,9 @@
 #include "libslic3r/Config.hpp"
 #include "Widgets/Label.hpp"
 #include "MainFrame.hpp"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 using namespace Slic3r;
 using namespace Slic3r::GUI;

src/slic3r/Utils/CalibUtils.cpp

@@ -58,6 +58,9 @@
 #include "slic3r/GUI/OpenGLManager.hpp"
 #include <utility>
 #include "slic3r/GUI/Jobs/PrintJob.hpp"
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace Slic3r {
 namespace GUI {

tests/libslic3r/test_config.cpp

@@ -29,6 +29,8 @@
 #include <vector>
 #include <utility>
 
+namespace fs = boost::filesystem;
+
 using namespace Slic3r;
 
 SCENARIO("Generic config validation performs as expected.", "[Config]") {