Use helpers::sort consistently

Author: Flamefire

libs/common/include/helpers/containerUtils.h

@@ -132,6 +132,8 @@ size_t count_if(const T& container, T_Predicate&& predicate)
 template<class T, class T_Predicate = std::less<>>
 void sort(T& container, T_Predicate&& predicate = T_Predicate{})
 {
+    using std::begin;
+    using std::end;
     std::sort(begin(container), end(container), std::forward<T_Predicate>(predicate));
 }
 

libs/libGamedata/lua/CheckedLuaTable.cpp

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "CheckedLuaTable.h"
+#include "helpers/containerUtils.h"
 #include "s25util/Log.h"
 #include <boost/algorithm/string/join.hpp>
 #include <algorithm>
@@ -22,7 +23,7 @@ void CheckedLuaTable::checkUnused()
     checkEnabled = false;
 
     std::vector<std::string> tableKeys = table.keys<std::string>();
-    std::sort(tableKeys.begin(), tableKeys.end());
+    helpers::sort(tableKeys);
     std::vector<std::string> unusedKeys;
     std::set_difference(tableKeys.begin(), tableKeys.end(), accessedKeys_.begin(), accessedKeys_.end(),
                         std::back_inserter(unusedKeys));

libs/s25main/GamePlayer.cpp

@@ -1118,7 +1118,7 @@ noBaseBuilding* GamePlayer::FindClientForWare(const Ware& ware)
     }
 
     // sort our clients, highest score first
-    std::sort(possibleClients.begin(), possibleClients.end());
+    helpers::sort(possibleClients);
 
     noBaseBuilding* lastBld = nullptr;
     noBaseBuilding* bestBld = nullptr;
@@ -1934,7 +1934,7 @@ bool GamePlayer::OrderShip(nobHarborBuilding& hb)
         }
     }
 
-    std::sort(sfh.begin(), sfh.end());
+    helpers::sort(sfh);
 
     noShip* best_ship = nullptr;
     uint32_t best_distance = std::numeric_limits<uint32_t>::max();
@@ -2313,7 +2313,7 @@ void GamePlayer::Trade(nobBaseWarehouse* goalWh, const boost_variant2<GoodType,
     const MapPoint goalFlagPos = goalWh->GetFlagPos();
 
     std::vector<nobBaseWarehouse*> whs(buildings.GetStorehouses().begin(), buildings.GetStorehouses().end());
-    std::sort(whs.begin(), whs.end(), WarehouseDistanceComparator(*goalWh, world));
+    helpers::sort(whs, WarehouseDistanceComparator(*goalWh, world));
     TradePathCache& tradePathCache = world.GetTradePathCache();
     for(nobBaseWarehouse* wh : whs)
     {

libs/s25main/ListDir.cpp

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "ListDir.h"
+#include "helpers/containerUtils.h"
 #include "s25util/strAlgos.h"
 #include <boost/filesystem.hpp>
 #include <algorithm>
@@ -41,6 +42,6 @@ std::vector<bfs::path> ListDir(const bfs::path& path, std::string extension, boo
         result.emplace_back(std::move(curPath));
     }
 
-    std::sort(result.begin(), result.end());
+    helpers::sort(result);
     return result;
 }

libs/s25main/controls/ctrlTable.cpp

@@ -8,6 +8,7 @@
 #include "ctrlScrollBar.h"
 #include "driver/KeyEvent.h"
 #include "driver/MouseCoords.h"
+#include "helpers/containerUtils.h"
 #include "helpers/mathFuncs.h"
 #include "ogl/glFont.h"
 #include "s25util/StringConversion.h"
@@ -295,7 +296,7 @@ void ctrlTable::SortRows(unsigned column, const TableSortDir sortDir)
         const int cmpResult = Compare(a, b, sortType);
         return (sortDir == TableSortDir::Ascending) ? cmpResult < 0 : cmpResult > 0;
     };
-    std::sort(rows_.begin(), rows_.end(), compareFunc);
+    helpers::sort(rows_, compareFunc);
 }
 
 /**

libs/s25main/desktops/dskOptions.cpp

@@ -743,7 +743,7 @@ void dskOptions::loadVideoModes()
     // Remove everything below 800x600
     helpers::erase_if(video_modes, [](const auto& it) { return it.width < 800 && it.height < 600; });
     // Sort by aspect ratio
-    std::sort(video_modes.begin(), video_modes.end(), cmpVideoModes);
+    helpers::sort(video_modes, cmpVideoModes);
 }
 
 void dskOptions::Msg_ScreenResize(const ScreenResizeEvent& sr)

libs/s25main/languages.cpp

@@ -45,7 +45,7 @@ void Languages::loadLanguages()
     }
 
     // Sprachen sortieren
-    std::sort(languages.begin(), languages.end());
+    helpers::sort(languages);
 
     // Systemsprache hinzufügen
     Language l(gettext_noop("System language"), "");

libs/s25main/mapGenerator/HeadQuarters.h

@@ -66,7 +66,7 @@ std::vector<MapPoint> FindHqPositions(const Map& map, const T_Container& area, M
     const auto byDistanceToOtherHqs = [&distanceToOtherHqs](MapPoint p1, MapPoint p2) {
         return distanceToOtherHqs[p1] > distanceToOtherHqs[p2];
     };
-    std::sort(possiblePositions.begin(), possiblePositions.end(), byDistanceToOtherHqs);
+    helpers::sort(possiblePositions, byDistanceToOtherHqs);
 
     // 3. filter out points within minimum distance to existing HQs
     const unsigned minHqDistance = (map.size.x + map.size.y) / 16;

libs/s25main/mapGenerator/Textures.h

@@ -71,7 +71,7 @@ class TextureOperator
             return sortBy(worldDesc_.get(t1)) < sortBy(worldDesc_.get(t2));
         };
 
-        std::sort(textures.begin(), textures.end(), lessThan);
+        helpers::sort(textures, lessThan);
     }
 
     template<class T_Predicate>

libs/s25main/network/GameServer.cpp

@@ -476,7 +476,7 @@ bool GameServer::assignPlayersOfRandomTeams(std::vector<JoinPlayerInfo>& playerI
     }
 
     // To make the teams as even as possible we start to assign the most constrained players first
-    std::sort(playersToAssign.begin(), playersToAssign.end(), [](const AssignPlayer& lhs, const AssignPlayer& rhs) {
+    helpers::sort(playersToAssign, [](const AssignPlayer& lhs, const AssignPlayer& rhs) {
         return lhs.possibleTeams.size() < rhs.possibleTeams.size();
     });