Merge branch 'develop' into develop-atys

nel/src/gui/dbgroup_combo_box.cpp

@@ -46,7 +46,7 @@ namespace NLGUI
 	static inline bool lt_text(const std::pair<int,std::string> &s1, const std::pair<int,std::string> &s2)
 	{
 		// return toLower(s1.second) < toLower(s2.second);
-		return -NLMISC::compareCaseInsensitive(s1.second, s2.second);
+		return NLMISC::compareCaseInsensitive(s1.second, s2.second) < 0;
 	}
 
 	std::string CDBGroupComboBox::measureMenu;

ryzom/client/src/interface_v3/people_list.cpp

@@ -200,11 +200,11 @@ bool CPeopleList::sortExByContactId(const CPeople& a, const CPeople& b)
 bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 {
 	if (a.Group == b.Group) {
-		return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
+		return NLMISC::compareCaseInsensitive(a.getName(), b.getName()) < 0; // FIXME: Locale-dependent sort
 	}
 	else
 	{
-		return -NLMISC::compareCaseInsensitive(a.Group, b.Group); // FIXME: Locale-dependent sort
+		return NLMISC::compareCaseInsensitive(a.Group, b.Group) < 0; // FIXME: Locale-dependent sort
 	}
 }
 
@@ -215,7 +215,7 @@ bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 		// We want order: online/alpha, offworld/alpha, offline/alpha
 		if (a.Online == b.Online)
 		{
-			return -NLMISC::compareCaseInsensitive(a.getName(), b.getName()); // FIXME: Locale-dependent sort
+			return NLMISC::compareCaseInsensitive(a.getName(), b.getName()) < 0; // FIXME: Locale-dependent sort
 		}
 		else
 		{