From d4af25c52a28b93484ffb55e0a8027bc4ce7856f Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:21:59 +0200
Subject: 5.9

---
 RealtimeSync/watcher.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'RealtimeSync/watcher.h')

diff --git a/RealtimeSync/watcher.h b/RealtimeSync/watcher.h
index 014101da..2fd32119 100644
--- a/RealtimeSync/watcher.h
+++ b/RealtimeSync/watcher.h
@@ -7,8 +7,7 @@
 #ifndef WATCHER_H_INCLUDED
 #define WATCHER_H_INCLUDED
 
-#include <zen/zstring.h>
-#include <vector>
+#include <zen/dir_watcher.h>
 #include <zen/file_error.h>
 
 
@@ -35,10 +34,12 @@ enum ChangeType
 
 struct WaitResult
 {
-    WaitResult(ChangeType tp, const Zstring& chgFile) : type(tp), filename(chgFile) {}
+    WaitResult(const zen::DirWatcher::Entry& changedItem) : type(CHANGE_DETECTED), changedItem_(changedItem) {}
+    WaitResult(const Zstring& dirname) : type(CHANGE_DIR_MISSING), dirname_(dirname) {}
 
     ChangeType type;
-    Zstring filename; //file or directory name
+    zen::DirWatcher::Entry changedItem_; //for type == CHANGE_DETECTED: file or directory
+    Zstring dirname_;                    //for type == CHANGE_DIR_MISSING
 };
 
 WaitResult waitForChanges(const std::vector<Zstring>& dirNamesNonFmt,
-- 
cgit