summaryrefslogtreecommitdiff
path: root/ui/sorting.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/sorting.h')
-rw-r--r--ui/sorting.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/sorting.h b/ui/sorting.h
index ce3e4648..52921f84 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -13,7 +13,7 @@
#include "../shared/assert_static.h"
-namespace ffs3
+namespace zen
{
namespace
{
@@ -68,7 +68,7 @@ bool sortByFileName(const FileSystemObject& a, const FileSystemObject& b)
if (isDirectoryMapping(a)) //sort directories by relative name
{
if (isDirectoryMapping(b))
- return cmpFileName(a.getRelativeName<side>(), b.getRelativeName<side>()) < 0;
+ return LessFilename()(a.getRelativeName<side>(), b.getRelativeName<side>());
else
return false;
}
@@ -113,7 +113,7 @@ bool sortByRelativeName(const FileSystemObject& a, const FileSystemObject& b)
else if (isDirectoryA)
return true;
- return cmpFileName(a.getShortName<side>(), b.getShortName<side>()) < 0;
+ return LessFilename()(a.getShortName<side>(), b.getShortName<side>());
}
}
@@ -172,8 +172,8 @@ bool sortByDate(const FileSystemObject& a, const FileSystemObject& b)
else if (!fileObjB && !linkObjB)
return true; //directories last
- const wxLongLong& dateA = fileObjA ? fileObjA->getLastWriteTime<side>() : linkObjA->getLastWriteTime<side>();
- const wxLongLong& dateB = fileObjB ? fileObjB->getLastWriteTime<side>() : linkObjB->getLastWriteTime<side>();
+ zen::Int64 dateA = fileObjA ? fileObjA->getLastWriteTime<side>() : linkObjA->getLastWriteTime<side>();
+ zen::Int64 dateB = fileObjB ? fileObjB->getLastWriteTime<side>() : linkObjB->getLastWriteTime<side>();
//return list beginning with newest files first
return Compare<ascending>().isSmallerThan(dateA, dateB);
bgstack15