summaryrefslogtreecommitdiff
path: root/ui/sorting.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 /ui/sorting.h
parent4.0 (diff)
downloadFreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.gz
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.tar.bz2
FreeFileSync-bd6336c629841c6db3a6ca53a936d629d34db53b.zip
4.1
Diffstat (limited to 'ui/sorting.h')
-rw-r--r--ui/sorting.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/sorting.h b/ui/sorting.h
index 719934d8..596dfd53 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -9,7 +9,7 @@
#include "../file_hierarchy.h"
#include "../synchronization.h"
-#include "../shared/assert_static.h"
+#include <zen/assert_static.h>
namespace zen
@@ -87,12 +87,12 @@ bool lessRelativeName(const FileSystemObject& a, const FileSystemObject& b)
const bool isDirectoryA = isDirectoryMapping(a);
const Zstring& relDirNameA = isDirectoryA ?
a.getObjRelativeName() : //directory
- a.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
+ beforeLast(a.getObjRelativeName(), FILE_NAME_SEPARATOR); //returns empty string if ch not found
const bool isDirectoryB = isDirectoryMapping(b);
const Zstring& relDirNameB = isDirectoryB ?
b.getObjRelativeName() : //directory
- b.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
+ beforeLast(b.getObjRelativeName(), FILE_NAME_SEPARATOR); //returns empty string if ch not found
//compare relative names without filenames first
const int rv = cmpFileName(relDirNameA, relDirNameB);
bgstack15