From 4cfb31bf6abb2d42181e78e8d0758cf74a8a774a Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:30:04 +0200
Subject: 6.0

---
 zen/recycler.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'zen/recycler.h')

diff --git a/zen/recycler.h b/zen/recycler.h
index f55971ac..80b31160 100644
--- a/zen/recycler.h
+++ b/zen/recycler.h
@@ -7,6 +7,7 @@
 #ifndef RECYCLER_H_INCLUDED
 #define RECYCLER_H_INCLUDED
 
+#include <functional>
 #include <vector>
 #include <zen/file_error.h>
 #include <zen/zstring.h>
@@ -44,16 +45,9 @@ enum StatusRecycler
 StatusRecycler recycleBinStatus(const Zstring& pathName); //test existence of Recycle Bin API for certain path
 //Win: blocks heavily if recycle bin is really full and drive is slow!!!
 
-struct CallbackRecycling
-{
-    virtual ~CallbackRecycling() {}
-
-    //may throw: first exception is swallowed, updateStatus() is then called again where it should throw again and the exception will propagate as expected
-    virtual void updateStatus(const Zstring& currentItem) = 0; //currentItem may be empty
-};
-
 void recycleOrDelete(const std::vector<Zstring>& filenames, //throw FileError, return "true" if file/dir was actually deleted
-                     CallbackRecycling* callback); //optional
+    //may throw: first exception is swallowed, updateStatus() is then called again where it should throw again and the exception will propagate as expected
+	const std::function<void (const Zstring& currentItem)>& notifyDeletionStatus); //optional; currentItem may be empty
 #endif
 }
 
-- 
cgit