mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added natural sorting to ip sorting in server config dialog, the heuristic should be fine now

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-03-22 12:17:46 +01:00
parent 1fe860e401
commit d798c62fa3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
YACReaderLibrary/server_config_dialog.cpp
View File

@ -13,12 +13,16 @@
#include "startup.h" #include "startup.h"
#include "yacreader_global.h" #include "yacreader_global.h"
#include "qnaturalsorting.h"
#include <algorithm> #include <algorithm>
//192.168 (most comon local subnet for ips are always put first)
//IPs are sorted using natoral sorting
bool ipComparator(const QString & ip1, const QString & ip2) bool ipComparator(const QString & ip1, const QString & ip2)
{ {
if(ip1.startsWith("192.168") && ip2.startsWith("192.168")) if(ip1.startsWith("192.168") && ip2.startsWith("192.168"))
return ip1 < ip2; return naturalSortLessThanCI(ip1, ip2);
if(ip1.startsWith("192.168")) if(ip1.startsWith("192.168"))
return true; return true;
@ -26,7 +30,7 @@ bool ipComparator(const QString & ip1, const QString & ip2)
if(ip2.startsWith("192.168")) if(ip2.startsWith("192.168"))
return false; return false;
return ip1 < ip2; return naturalSortLessThanCI(ip1, ip2);
} }
#ifndef Q_OS_WIN32 #ifndef Q_OS_WIN32