Automatic fixes of clang-tidy warnings: misc-unused-using-decls,modernize-use-auto,performance-inefficient-vector-operation,performance-move-const-arg,readability-container-size-empty,readability-redundant-member-init,bugprone-exception-escape,performance-noexcept-swap,readability-redundant-inline-specifier,readability-container-data-pointer

ottml · ottml · commit 0460b847f710 · 2025-06-09T23:44:02.000+02:00
diff --git a/external/libendian b/external/libendian
@@ -1 +1 @@
-Subproject commit db388230f996a75f7bf6f94771f79126028998d2
+Subproject commit f6485deebdd103b8205ff35d808512497ac711a3
diff --git a/external/libsiedler2 b/external/libsiedler2
@@ -1 +1 @@
-Subproject commit edc5719934c6e82d150dd46cfeffed280a698c97
+Subproject commit a3ba29d0b66549ef8ab647e89d5825265cc1167f
diff --git a/external/libutil b/external/libutil
@@ -1 +1 @@
-Subproject commit 365b058d419e11e2a142b228d9228d6ff8f0a910
+Subproject commit fdce19e3d0a12604e618abaaaad07eb7399f44a4
diff --git a/external/mygettext b/external/mygettext
@@ -1 +1 @@
-Subproject commit efe8aeb1d7df3ea342136dd8ca88230dc76d637f
+Subproject commit 1c9c9dc3743801c5cc90fb80142533cf1080dfe0
diff --git a/external/s25edit b/external/s25edit
@@ -1 +1 @@
-Subproject commit 0ec492ea5d4e4e7f763001deacd75aa629c90a85
+Subproject commit 66caed81e25df2268b4260931ac8d44c78066340
diff --git a/extras/audioDrivers/SDL/AudioSDL.cpp b/extras/audioDrivers/SDL/AudioSDL.cpp
@@ -142,7 +142,7 @@ driver::RawSoundHandle AudioSDL::LoadEffect(const std::string& filepath)
 
 driver::RawSoundHandle AudioSDL::LoadEffect(const std::vector<char>& data, const std::string& /*ext*/)
 {
-    SDL_RWops* rwOps = SDL_RWFromConstMem(&data[0], static_cast<int>(data.size()));
+    SDL_RWops* rwOps = SDL_RWFromConstMem(data.data(), static_cast<int>(data.size()));
     Mix_Chunk* sound = Mix_LoadWAV_RW(rwOps, true); //-V601
 
     if(sound == nullptr)
diff --git a/libs/s25main/Debug.cpp b/libs/s25main/Debug.cpp
@@ -135,7 +135,7 @@ bool captureBacktrace(DebugInfo::stacktrace_t& stacktrace, LPCONTEXT ctx) noexce
 bool captureBacktrace(DebugInfo::stacktrace_t& stacktrace, void*) noexcept
 {
 #    if RTTR_BACKTRACE_HAS_FUNCTION
-    const auto num_frames = backtrace(&stacktrace[0], stacktrace.size());
+    const auto num_frames = backtrace(stacktrace.data(), stacktrace.size());
     stacktrace.resize(num_frames);
     return true;
 #    else
@@ -267,7 +267,7 @@ bool DebugInfo::SendStackTrace(const stacktrace_t& stacktrace)
         endStacktrace.push_back(reinterpret_cast<littleVoid_t::value_type>(ptr));
 
     unsigned stacktraceLen = sizeof(littleVoid_t) * endStacktrace.size();
-    return SendString(reinterpret_cast<const char*>(&endStacktrace[0]), stacktraceLen);
+    return SendString(reinterpret_cast<const char*>(endStacktrace.data()), stacktraceLen);
 }
 
 bool DebugInfo::SendReplay()
diff --git a/libs/s25main/GameCommands.h b/libs/s25main/GameCommands.h
@@ -447,7 +447,7 @@ class SetInventorySetting : public Coords
 
 protected:
     SetInventorySetting(const MapPoint pt, boost_variant2<GoodType, Job> what, const InventorySetting state)
-        : Coords(GCType::SetInventorySetting, pt), what(std::move(what)), state(state)
+        : Coords(GCType::SetInventorySetting, pt), what(what), state(state)
     {}
     SetInventorySetting(Serializer& ser) : Coords(GCType::SetInventorySetting, ser)
 
@@ -806,7 +806,7 @@ class TradeOverLand : public Coords
 protected:
     /// Note: Can only trade wares or figures!
     TradeOverLand(const MapPoint pt, boost_variant2<GoodType, Job> what, const uint32_t count)
-        : Coords(GCType::Trade, pt), what(std::move(what)), count(count)
+        : Coords(GCType::Trade, pt), what(what), count(count)
     {}
     TradeOverLand(Serializer& ser) : Coords(GCType::Trade, ser)
     {
diff --git a/libs/s25main/GamePlayer.cpp b/libs/s25main/GamePlayer.cpp
@@ -614,14 +614,14 @@ bool GamePlayer::FindCarrierForRoad(RoadSegment* rs) const
     {
         // dann braucht man Träger UND Boot
         best[0] = FindWarehouse(*rs->GetF1(), FW::HasWareAndFigure(GoodType::Boat, Job::Helper, false), false, false,
-                                &length[0], rs);
+                                length.data(), rs);
         // 2. Flagge des Weges
         best[1] = FindWarehouse(*rs->GetF2(), FW::HasWareAndFigure(GoodType::Boat, Job::Helper, false), false, false,
                                 &length[1], rs);
     } else
     {
         // 1. Flagge des Weges
-        best[0] = FindWarehouse(*rs->GetF1(), FW::HasFigure(Job::Helper, false), false, false, &length[0], rs);
+        best[0] = FindWarehouse(*rs->GetF1(), FW::HasFigure(Job::Helper, false), false, false, length.data(), rs);
         // 2. Flagge des Weges
         best[1] = FindWarehouse(*rs->GetF2(), FW::HasFigure(Job::Helper, false), false, false, &length[1], rs);
     }
@@ -878,7 +878,7 @@ nofCarrier* GamePlayer::OrderDonkey(RoadSegment* road) const
     std::array<nobBaseWarehouse*, 2> best;
 
     // 1. Flagge des Weges
-    best[0] = FindWarehouse(*road->GetF1(), FW::HasFigure(Job::PackDonkey, false), false, false, &length[0], road);
+    best[0] = FindWarehouse(*road->GetF1(), FW::HasFigure(Job::PackDonkey, false), false, false, length.data(), road);
     // 2. Flagge des Weges
     best[1] = FindWarehouse(*road->GetF2(), FW::HasFigure(Job::PackDonkey, false), false, false, &length[1], road);
 
diff --git a/libs/s25main/Replay.cpp b/libs/s25main/Replay.cpp
@@ -155,11 +155,11 @@ bool Replay::StartRecording(const boost::filesystem::path& filepath, const MapIn
             RTTR_Assert(!mapInfo.savegame);
             file_.WriteUnsignedInt(mapInfo.mapData.uncompressedLength);
             file_.WriteUnsignedInt(mapInfo.mapData.data.size());
-            file_.WriteRawData(&mapInfo.mapData.data[0], mapInfo.mapData.data.size());
+            file_.WriteRawData(mapInfo.mapData.data.data(), mapInfo.mapData.data.size());
             file_.WriteUnsignedInt(mapInfo.luaData.uncompressedLength);
             file_.WriteUnsignedInt(mapInfo.luaData.data.size());
             if(!mapInfo.luaData.data.empty())
-                file_.WriteRawData(&mapInfo.luaData.data[0], mapInfo.luaData.data.size());
+                file_.WriteRawData(mapInfo.luaData.data.data(), mapInfo.luaData.data.size());
             break;
         case MapType::Savegame: mapInfo.savegame->Save(file_, GetMapName()); break;
     }
@@ -269,11 +269,11 @@ bool Replay::LoadGameData(MapInfo& mapInfo)
             case MapType::OldMap:
                 mapInfo.mapData.uncompressedLength = file_.ReadUnsignedInt();
                 mapInfo.mapData.data.resize(file_.ReadUnsignedInt());
-                file_.ReadRawData(&mapInfo.mapData.data[0], mapInfo.mapData.data.size());
+                file_.ReadRawData(mapInfo.mapData.data.data(), mapInfo.mapData.data.size());
                 mapInfo.luaData.uncompressedLength = file_.ReadUnsignedInt();
                 mapInfo.luaData.data.resize(file_.ReadUnsignedInt());
                 if(!mapInfo.luaData.data.empty())
-                    file_.ReadRawData(&mapInfo.luaData.data[0], mapInfo.luaData.data.size());
+                    file_.ReadRawData(mapInfo.luaData.data.data(), mapInfo.luaData.data.size());
                 break;
             case MapType::Savegame:
                 mapInfo.savegame = std::make_unique<Savegame>();
diff --git a/libs/s25main/SavedFile.cpp b/libs/s25main/SavedFile.cpp
@@ -38,7 +38,7 @@ void SavedFile::WriteExtHeader(BinaryFile& file, const std::string& mapName)
     mapName_ = mapName;
 
     // Program version
-    file.WriteRawData(&revision[0], revision.size());
+    file.WriteRawData(revision.data(), revision.size());
     s25util::time64_t tmpTime = libendian::ConvertEndianess<false>::fromNative(saveTime_);
     file.WriteRawData(&tmpTime, sizeof(tmpTime));
     file.WriteShortString(mapName);
@@ -57,7 +57,7 @@ bool SavedFile::ReadFileHeader(BinaryFile& file)
         throw std::range_error("Program signature is to long!");
     try
     {
-        file.ReadRawData(&read_signature[0], signature.size());
+        file.ReadRawData(read_signature.data(), signature.size());
 
         // Signatur überprüfen
         if(!std::equal(signature.begin(), signature.end(), read_signature.begin()))
@@ -88,7 +88,7 @@ bool SavedFile::ReadFileHeader(BinaryFile& file)
 
 bool SavedFile::ReadExtHeader(BinaryFile& file)
 {
-    file.ReadRawData(&revision[0], revision.size());
+    file.ReadRawData(revision.data(), revision.size());
     file.ReadRawData(&saveTime_, sizeof(saveTime_));
     saveTime_ = libendian::ConvertEndianess<false>::toNative(saveTime_);
     mapName_ = file.ReadShortString();
diff --git a/libs/s25main/ai/aijh/Jobs.h b/libs/s25main/ai/aijh/Jobs.h
@@ -57,7 +57,7 @@ class JobWithTarget
 {
 public:
     JobWithTarget() : target(MapPoint::Invalid()) {}
-    inline MapPoint GetTarget() const { return target; }
+    MapPoint GetTarget() const { return target; }
     void SetTarget(MapPoint newTarget) { target = newTarget; }
 
 protected:
@@ -72,8 +72,8 @@ class BuildJob : public AIJob, public JobWithTarget
     {}
 
     void ExecuteJob() override;
-    inline BuildingType GetType() const { return type; }
-    inline MapPoint GetAround() const { return around; }
+    BuildingType GetType() const { return type; }
+    MapPoint GetAround() const { return around; }
 
 private:
     BuildingType type;
diff --git a/libs/s25main/controls/ctrlChat.cpp b/libs/s25main/controls/ctrlChat.cpp
@@ -117,7 +117,7 @@ void ctrlChat::Draw_()
     for(unsigned i = 0; i < show_lines; ++i)
     {
         DrawPoint curTextPos = textPos;
-        if(PrimaryChatLine* line = get_if<PrimaryChatLine>(&chat_lines[i + pos]))
+        if(auto* line = get_if<PrimaryChatLine>(&chat_lines[i + pos]))
         {
             // Zeit, Spieler und danach Textnachricht
             if(!line->time_string.empty())
@@ -154,8 +154,8 @@ void ctrlChat::WrapLine(unsigned short i)
 
     // Breite von Zeitstring und Spielername berechnen (falls vorhanden)
     unsigned short prefix_width =
-      (line.time_string.length() ? font->getWidth(line.time_string) : 0)
-      + (line.player.length() ? (bracket1_size + bracket2_size + font->getWidth(line.player)) : 0);
+      (!line.time_string.empty() ? font->getWidth(line.time_string) : 0)
+      + (!line.player.empty() ? (bracket1_size + bracket2_size + font->getWidth(line.player)) : 0);
 
     // Reicht die Breite des Textfeldes noch nichtmal dafür aus?
     if(prefix_width > GetSize().x - 2 - SCROLLBAR_WIDTH)
diff --git a/libs/s25main/controls/ctrlEdit.cpp b/libs/s25main/controls/ctrlEdit.cpp
@@ -184,12 +184,12 @@ void ctrlEdit::AddChar(char32_t c)
  */
 void ctrlEdit::RemoveChar()
 {
-    if(cursorPos_ > 0 && text_.length() > 0)
+    if(cursorPos_ > 0 && !text_.empty())
     {
         text_.erase(cursorPos_ - 1, 1);
 
         // View verschieben
-        while(text_.length() > 0 && text_.length() <= viewStart_)
+        while(!text_.empty() && text_.length() <= viewStart_)
             --viewStart_;
 
         CursorLeft();
diff --git a/libs/s25main/controls/ctrlProgress.cpp b/libs/s25main/controls/ctrlProgress.cpp
@@ -32,9 +32,9 @@ ctrlProgress::ctrlProgress(Window* parent, const unsigned id, const DrawPoint& p
 
     Extent btSize = Extent::all(size.y);
     AddImageButton(0, DrawPoint(0, 0), btSize, tc, LOADER.GetImageN(btMinusRes, button_minus),
-                   (button_minus_tooltip.length() ? button_minus_tooltip : _("Less")));
+                   (!button_minus_tooltip.empty() ? button_minus_tooltip : _("Less")));
     AddImageButton(1, DrawPoint(size.x - btSize.x, 0), btSize, tc, LOADER.GetImageN(btPlusRes, button_plus),
-                   (button_plus_tooltip.length() ? button_plus_tooltip : _("More")));
+                   (!button_plus_tooltip.empty() ? button_plus_tooltip : _("More")));
 
     // Hide left and right 3D border by making the buttons overlap the bar
     padding_.x -= 2;
diff --git a/libs/s25main/desktops/dskCredits.cpp b/libs/s25main/desktops/dskCredits.cpp
@@ -28,7 +28,6 @@ using namespace std::chrono_literals;
 const auto PAGE_TIME = 12900ms;
 /// Duration for fading between pages
 const auto FADING_TIME = 2s;
-using std::chrono::duration_cast;
 
 namespace {
 enum
diff --git a/libs/s25main/gameData/ShieldConsts.h b/libs/s25main/gameData/ShieldConsts.h
@@ -16,14 +16,14 @@ const helpers::EnumArray<GoodType, Nation> SUPPRESS_UNUSED SHIELD_TYPES = {
 
 /// Macht ggf. aus den verschiedenen Schilden der Nationen jeweils immer das römische normale Schild für
 /// die Warensysteme usw
-inline constexpr GoodType ConvertShields(const GoodType& good)
+constexpr GoodType ConvertShields(const GoodType& good)
 {
     return (good == GoodType::ShieldVikings || good == GoodType::ShieldAfricans || good == GoodType::ShieldJapanese) ?
              GoodType::ShieldRomans :
              good;
 }
 
-inline constexpr GoodType convertShieldToNation(const GoodType good, const Nation nation)
+constexpr GoodType convertShieldToNation(const GoodType good, const Nation nation)
 {
     return (good == GoodType::ShieldRomans) ? SHIELD_TYPES[nation] : good;
 }
diff --git a/libs/s25main/gameTypes/BuildingTypes.h b/libs/s25main/gameTypes/BuildingTypes.h
@@ -46,7 +46,7 @@ struct BldWorkDescription
     /// Ware produced, if any
     helpers::OptionalEnum<GoodType> producedWare = boost::none;
     /// Wares the building needs, if any
-    WaresNeeded waresNeeded = {};
+    WaresNeeded waresNeeded;
     /// How many wares of each type can be stored
     uint8_t numSpacesPerWare = 6;
     /// True if one of each waresNeeded is used per production cycle
diff --git a/libs/s25main/mapGenerator/Textures.h b/libs/s25main/mapGenerator/Textures.h
@@ -35,12 +35,12 @@ class TextureOperator
           terrains_(worldDesc_.terrain.findAll([landscape](const TerrainDesc& t) { return t.landscape == landscape; }))
     {}
 
-    inline uint8_t GetTextureId(DescIdx<TerrainDesc> texture) const { return worldDesc_.get(texture).s2Id; }
+    uint8_t GetTextureId(DescIdx<TerrainDesc> texture) const { return worldDesc_.get(texture).s2Id; }
 
-    inline uint8_t GetLandscapeId() const { return worldDesc_.get(landscape_).s2Id; }
+    uint8_t GetLandscapeId() const { return worldDesc_.get(landscape_).s2Id; }
 
     template<class T_Predicate>
-    inline DescIdx<TerrainDesc> Find(T_Predicate predicate) const
+    DescIdx<TerrainDesc> Find(T_Predicate predicate) const
     {
         for(auto texture : terrains_)
         {
@@ -54,7 +54,7 @@ class TextureOperator
     }
 
     template<class T_Predicate>
-    inline std::vector<DescIdx<TerrainDesc>> FindAll(T_Predicate predicate) const
+    std::vector<DescIdx<TerrainDesc>> FindAll(T_Predicate predicate) const
     {
         auto condition = [&predicate, this](const auto& texture) { return predicate(worldDesc_.get(texture)); };
 
@@ -65,7 +65,7 @@ class TextureOperator
     }
 
     template<class T_SortBy>
-    inline void Sort(std::vector<DescIdx<TerrainDesc>>& textures, T_SortBy sortBy) const
+    void Sort(std::vector<DescIdx<TerrainDesc>>& textures, T_SortBy sortBy) const
     {
         auto lessThan = [this, &sortBy](const auto& t1, const auto& t2) {
             return sortBy(worldDesc_.get(t1)) < sortBy(worldDesc_.get(t2));
@@ -75,7 +75,7 @@ class TextureOperator
     }
 
     template<class T_Predicate>
-    inline bool Check(DescIdx<TerrainDesc> texture, T_Predicate predicate) const
+    bool Check(DescIdx<TerrainDesc> texture, T_Predicate predicate) const
     {
         return predicate(worldDesc_.get(texture));
     }
diff --git a/libs/s25main/network/GameServer.cpp b/libs/s25main/network/GameServer.cpp
@@ -217,7 +217,7 @@ bool GameServer::Start(const CreateServerInfo& csi, const MapDescription& map, c
         lanAnnouncer.Start();
     else if(config.servertype == ServerType::Lobby)
     {
-        LOBBYCLIENT.AddServer(config.gamename, mapinfo.title, (config.password.length() != 0), config.port);
+        LOBBYCLIENT.AddServer(config.gamename, mapinfo.title, (!config.password.empty()), config.port);
         LOBBYCLIENT.AddListener(this);
     }
     AnnounceStatusChange();
@@ -733,7 +733,8 @@ void GameServer::ExecuteNWF()
 
         // Notify players
         std::vector<unsigned> checksumHashes;
-        for(const GameServerPlayer& player : networkPlayers)
+        checksumHashes.reserve(networkPlayers.size());
+for(const GameServerPlayer& player : networkPlayers)
             checksumHashes.push_back(nwfInfo.getPlayerCmds(player.playerId).checksum.getHash());
         SendToAll(GameMessage_Server_Async(checksumHashes));
 
diff --git a/libs/s25main/network/GameServerPlayer.cpp b/libs/s25main/network/GameServerPlayer.cpp
@@ -42,7 +42,7 @@ void GameServerPlayer::setActive()
 
 void GameServerPlayer::doPing()
 {
-    ActiveState* state = get_if<ActiveState>(&state_);
+    auto* state = get_if<ActiveState>(&state_);
     if(state && !state->isPinging
        && (!state->pingTimer.isRunning() || state->pingTimer.getElapsed() >= seconds(PING_RATE)))
     {
diff --git a/libs/s25main/network/NetworkPlayer.cpp b/libs/s25main/network/NetworkPlayer.cpp
@@ -44,7 +44,7 @@ void NetworkPlayer::executeMsgs(MessageInterface& msgHandler)
 }
 
 void swap(NetworkPlayer& lhs, NetworkPlayer& rhs)
-{
+ noexcept {
     using std::swap;
     swap(lhs.playerId, rhs.playerId);
     swap(lhs.recvQueue, rhs.recvQueue);
diff --git a/libs/s25main/network/NetworkPlayer.h b/libs/s25main/network/NetworkPlayer.h
@@ -35,4 +35,4 @@ class NetworkPlayer
     Socket socket;
 };
 
-void swap(NetworkPlayer& lhs, NetworkPlayer& rhs);
+void swap(NetworkPlayer& lhs, NetworkPlayer& rhs) noexcept ;
diff --git a/libs/s25main/nodeObjs/noFlag.h b/libs/s25main/nodeObjs/noFlag.h
@@ -26,10 +26,10 @@ class noFlag : public noRoadNode
     void Destroy() override;
     void Serialize(SerializedGameData& sgd) const override;
 
-    inline GO_Type GetGOT() const final { return GO_Type::Flag; }
-    inline FlagType GetFlagType() const { return flagtype; }
+    GO_Type GetGOT() const final { return GO_Type::Flag; }
+    FlagType GetFlagType() const { return flagtype; }
     /// Gibt Auskunft darüber, ob noch Platz für eine Ware an der Flagge ist.
-    inline bool HasSpaceForWare() const { return wares.size() < wares.max_size(); }
+    bool HasSpaceForWare() const { return wares.size() < wares.max_size(); }
 
     void Draw(DrawPoint drawPt) override;
 
diff --git a/libs/s25main/ogl/glFont.cpp b/libs/s25main/ogl/glFont.cpp
@@ -248,8 +248,8 @@ void glFont::Draw(DrawPoint pos, const std::string& text, FontStyle format, unsi
     for(GlPoint& pt : texList.texCoords)
         pt /= texSize;
 
-    glVertexPointer(2, GL_FLOAT, 0, &texList.vertices[0]);
-    glTexCoordPointer(2, GL_FLOAT, 0, &texList.texCoords[0]);
+    glVertexPointer(2, GL_FLOAT, 0, texList.vertices.data());
+    glTexCoordPointer(2, GL_FLOAT, 0, texList.texCoords.data());
     VIDEODRIVER.BindTexture(texture);
     glColor4ub(GetRed(color), GetGreen(color), GetBlue(color), GetAlpha(color));
     glDrawArrays(GL_QUADS, 0, texList.vertices.size());
diff --git a/libs/s25main/pathfinding/NewNode.h b/libs/s25main/pathfinding/NewNode.h
@@ -24,11 +24,11 @@ struct NewNode
     unsigned prev = INVALID_PREV;
     unsigned prevEven = INVALID_PREV;
     /// Iterator auf Position in der Prioritätswarteschlange (std::set), freies Pathfinding
-    std::set<PathfindingPoint>::iterator it_p = {};
+    std::set<PathfindingPoint>::iterator it_p;
     /// Wurde Knoten schon besucht (für A*-Algorithmus), wenn lastVisited == currentVisit
     unsigned lastVisited = 0;
     unsigned lastVisitedEven = 0; // used for road pathfinding (for ai only for now)
-    MapPoint mapPt = {};
+    MapPoint mapPt;
 };
 
 struct FreePathNode : BinaryHeapPosMarker
diff --git a/libs/s25main/pathfinding/OpenListVector.h b/libs/s25main/pathfinding/OpenListVector.h
@@ -9,7 +9,7 @@
 struct GetEstimateFromPtr
 {
     template<typename T>
-    static inline unsigned GetValue(T* el)
+    static unsigned GetValue(T* el)
     {
         return el->estimate;
     }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ driver::RawSoundHandle AudioSDL::LoadEffect(const std::string& filepath)`
`142`	`142`
`143`	`143`	`driver::RawSoundHandle AudioSDL::LoadEffect(const std::vector<char>& data, const std::string& /ext/)`
`144`	`144`	`{`
`145`		`- SDL_RWops* rwOps = SDL_RWFromConstMem(&data[0], static_cast<int>(data.size()));`
	`145`	`+ SDL_RWops* rwOps = SDL_RWFromConstMem(data.data(), static_cast<int>(data.size()));`
`146`	`146`	`Mix_Chunk* sound = Mix_LoadWAV_RW(rwOps, true); //-V601`
`147`	`147`
`148`	`148`	`if(sound == nullptr)`