diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:43 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:43 +0200 |
| commit | 4226e548662339ea1ca37b45385a7cf9b237ff1e (patch) | |
| tree | 9a3fa54b85d97f05164e41bdb96b82f748a37342 /RealtimeSync/watcher.cpp | |
| parent | 3.7 (diff) | |
| download | FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.tar.gz FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.tar.bz2 FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.zip | |
3.8
Diffstat (limited to 'RealtimeSync/watcher.cpp')
| -rw-r--r-- | RealtimeSync/watcher.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp index ad9e6508..9af48783 100644 --- a/RealtimeSync/watcher.cpp +++ b/RealtimeSync/watcher.cpp @@ -264,20 +264,14 @@ class DirsOnlyTraverser : public FreeFileSync::TraverseCallback public: DirsOnlyTraverser(std::vector<std::string>& dirs) : m_dirs(dirs) {} - virtual ReturnValue onFile(const DefaultChar* shortName, const Zstring& fullName, bool isSymlink, const FileInfo& details) - { - return TRAVERSING_CONTINUE; - } - virtual ReturnValDir onDir(const DefaultChar* shortName, const Zstring& fullName, bool isSymlink) + virtual void onFile(const DefaultChar* shortName, const Zstring& fullName, const FileInfo& details) {} + virtual void onSymlink(const DefaultChar* shortName, const Zstring& fullName, const SymlinkInfo& details) {} + virtual ReturnValDir onDir(const DefaultChar* shortName, const Zstring& fullName) { m_dirs.push_back(fullName.c_str()); - - if (isSymlink) //don't traverse into symlinks (analog to windows build) - return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_IGNORE>()); - else return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_CONTINUE>(), this); } - virtual ReturnValue onError(const wxString& errorText) + virtual void onError(const wxString& errorText) { throw FreeFileSync::FileError(errorText); } @@ -409,7 +403,7 @@ RealtimeSync::WaitResult RealtimeSync::waitForChanges(const std::vector<Zstring> try //get all subdirectories { DirsOnlyTraverser traverser(fullDirList); - FreeFileSync::traverseFolder(formattedDir, &traverser); //don't traverse into symlinks (analog to windows build) + FreeFileSync::traverseFolder(formattedDir, false, &traverser); //don't traverse into symlinks (analog to windows build) } catch (const FreeFileSync::FileError&) { |