From d798c62fa3b45f0cf572fe41db1ede1d434a67df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 22 Mar 2015 12:17:46 +0100 Subject: [PATCH] added natural sorting to ip sorting in server config dialog, the heuristic should be fine now --- YACReaderLibrary/server_config_dialog.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp index a44a5271..3e971668 100644 --- a/YACReaderLibrary/server_config_dialog.cpp +++ b/YACReaderLibrary/server_config_dialog.cpp @@ -13,12 +13,16 @@ #include "startup.h" #include "yacreader_global.h" +#include "qnaturalsorting.h" + #include +//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) { if(ip1.startsWith("192.168") && ip2.startsWith("192.168")) - return ip1 < ip2; + return naturalSortLessThanCI(ip1, ip2); if(ip1.startsWith("192.168")) return true; @@ -26,7 +30,7 @@ bool ipComparator(const QString & ip1, const QString & ip2) if(ip2.startsWith("192.168")) return false; - return ip1 < ip2; + return naturalSortLessThanCI(ip1, ip2); } #ifndef Q_OS_WIN32