diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
| commit | 54c2e44d7b37b2c3efc449e054eef21fa414dfde (patch) | |
| tree | 3894ba7e10c78750c195381a861da5e8166a6bfd /zen/resolve_path.h | |
| parent | Merge branch 'b11.20' into 'master' (diff) | |
| parent | add upstream 11.21 (diff) | |
| download | FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.gz FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.bz2 FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.zip | |
Merge branch 'b11.21' into 'master'11.21
add upstream 11.21
See merge request opensource-tracking/FreeFileSync!44
Diffstat (limited to 'zen/resolve_path.h')
| -rw-r--r-- | zen/resolve_path.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/resolve_path.h b/zen/resolve_path.h index 4a5fc8fe..bfef087b 100644 --- a/zen/resolve_path.h +++ b/zen/resolve_path.h @@ -7,8 +7,7 @@ #ifndef RESOLVE_PATH_H_817402834713454 #define RESOLVE_PATH_H_817402834713454 -#include <vector> -#include "zstring.h" +#include "file_error.h" namespace zen @@ -24,7 +23,8 @@ Zstring getResolvedFilePath(const Zstring& pathPhrase); //noexcept //macro substitution only Zstring expandMacros(const Zstring& text); -std::vector<Zstring> getFolderPathAliases(const Zstring& folderPathPhrase); //may block for slow USB sticks when resolving [<volume name>] +std::vector<Zstring> getPathPhraseAliases(const Zstring& itemPath); +Zstring makePathPhrase(const Zstring& itemPath); } |