summaryrefslogtreecommitdiff
path: root/comparison.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:15:16 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:15:16 +0200
commitbd6336c629841c6db3a6ca53a936d629d34db53b (patch)
tree3721ef997864108df175ce677a8a7d4342a6f1d2 /comparison.h
parent4.0 (diff)
downloadFreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.gz
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.bz2
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.zip
4.1
Diffstat (limited to 'comparison.h')
-rw-r--r--comparison.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/comparison.h b/comparison.h
index 225a82e8..e628e86d 100644
--- a/comparison.h
+++ b/comparison.h
@@ -8,12 +8,12 @@
#define COMPARISON_H_INCLUDED
#include "file_hierarchy.h"
-#include "library/process_xml.h"
-#include "library/status_handler.h"
+#include "lib/process_xml.h"
+#include "lib/status_handler.h"
#include "structures.h"
-#include "shared/disable_standby.h"
-#include "library/norm_filter.h"
-#include "library/parallel_scan.h"
+#include <zen/disable_standby.h>
+#include "lib/norm_filter.h"
+#include "lib/parallel_scan.h"
namespace zen
@@ -53,6 +53,7 @@ class CompareProcess
public:
CompareProcess(size_t fileTimeTol,
xmlAccess::OptionalDialogs& warnings,
+ bool allowUserInteraction,
ProcessCallback& handler);
void startCompareProcess(const std::vector<FolderPairCfg>& cfgList, FolderComparison& output);
@@ -79,6 +80,7 @@ private:
xmlAccess::OptionalDialogs& m_warnings;
+ const bool allowUserInteraction_;
ProcessCallback& procCallback;
const Zstring txtComparingContentOfFiles;
};
bgstack15