summaryrefslogtreecommitdiff
path: root/structures.cpp
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 /structures.cpp
parent4.0 (diff)
downloadFreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.gz
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.bz2
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.zip
4.1
Diffstat (limited to 'structures.cpp')
-rw-r--r--structures.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/structures.cpp b/structures.cpp
index 98255700..1612445c 100644
--- a/structures.cpp
+++ b/structures.cpp
@@ -5,10 +5,10 @@
// **************************************************************************
#include "structures.h"
-#include "shared/i18n.h"
#include <iterator>
#include <stdexcept>
#include <ctime>
+#include <zen/i18n.h>
using namespace zen;
@@ -387,9 +387,9 @@ FilterConfig mergeFilterConfig(const FilterConfig& global, const FilterConfig& l
if (out.includeFilter == FilterConfig().includeFilter)
out.includeFilter = global.includeFilter;
- out.excludeFilter.Trim(true, false);
+ trim(out.excludeFilter, true, false);
out.excludeFilter = global.excludeFilter + Zstr("\n") + out.excludeFilter;
- out.excludeFilter.Trim(true, false);
+ trim(out.excludeFilter, true, false);
//soft filter
Int64 loctimeFrom;
bgstack15