diff options
Diffstat (limited to 'src/resources/macos')
-rw-r--r-- | src/resources/macos/MacResources.cpp | 2 | ||||
-rw-r--r-- | src/resources/macos/MacResources.h | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/resources/macos/MacResources.cpp b/src/resources/macos/MacResources.cpp index 90f43c8..2b41daa 100644 --- a/src/resources/macos/MacResources.cpp +++ b/src/resources/macos/MacResources.cpp @@ -26,7 +26,7 @@ //======================================================================== #include "MacResources.h" -namespace std::filesystem = std::experimental::filesystem; +namespace fs = std::experimental::filesystem; MacResources::MacResources() : Resources() { this->workingDir = std::filesystem::current_path(); diff --git a/src/resources/macos/MacResources.h b/src/resources/macos/MacResources.h index 7af24b6..1d19575 100644 --- a/src/resources/macos/MacResources.h +++ b/src/resources/macos/MacResources.h @@ -28,20 +28,22 @@ #ifndef DNG_MACRESOURCES_H #define DNG_MACRESOURCES_H #include "../Resources.h" -namespace std::filesystem = std::experimental::filesystem; + +namespace fs = std::experimental::filesystem; + class MacResources : public Resources { public: MacResources(); protected: public: - const char *convert_to_str(std::filesystem::path &path) override; + const char *convert_to_str(fs::path &path) override; protected: - std::filesystem::path exeDir; - std::filesystem::path workingDir; - std::vector<std::filesystem::path> levelSearchDirs() override; - std::vector<std::filesystem::path> defaultsSearchDirs() override; - std::vector<std::filesystem::path> fontSearchDirs() override; + fs::path exeDir; + fs::path workingDir; + std::vector<fs::path> levelSearchDirs() override; + std::vector<fs::path> defaultsSearchDirs() override; + std::vector<fs::path> fontSearchDirs() override; }; #endif // DNG_MACRESOURCES_H |