summaryrefslogtreecommitdiff
path: root/comparison.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
commitd6301fca6b78db52d0d98f8e0799aba175ad2e59 (patch)
tree0380aac034e0d70ee058db07900d80ff20cfc81e /comparison.cpp
parent5.7 (diff)
downloadFreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.gz
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.bz2
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.zip
5.8
Diffstat (limited to 'comparison.cpp')
-rw-r--r--comparison.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/comparison.cpp b/comparison.cpp
index 76aad384..bae14c41 100644
--- a/comparison.cpp
+++ b/comparison.cpp
@@ -1,7 +1,7 @@
// **************************************************************************
// * This file is part of the FreeFileSync project. It is distributed under *
// * GNU General Public License: http://www.gnu.org/licenses/gpl.html *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved *
// **************************************************************************
#include "comparison.h"
@@ -10,7 +10,7 @@
#include <zen/perf.h>
#include <zen/scope_guard.h>
#include <zen/process_priority.h>
-#include <wx+/format_unit.h>
+#include <zen/format_unit.h>
#include "algorithm.h"
#include "lib/parallel_scan.h"
#include "lib/resolve_path.h"
@@ -365,7 +365,7 @@ void zen::compare(size_t fileTimeTolerance,
callback.reportStatus(_("Preparing synchronization..."));
callback.forceUiRefresh();
zen::redetermineSyncDirection(fpCfg.directionCfg, *j,
- [&](const std::wstring& warning) { callback.reportWarning(warning, warnings.warningSyncDatabase); });
+ [&](const std::wstring& warning) { callback.reportWarning(warning, warnings.warningDatabaseError); });
}
//only if everything was processed correctly output is written to!
bgstack15