fix Warning

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "ces_building_model.h"
+#include <utility>
 
 #include <Buildings/BuildingControlUnit/VWM/vwm_xml_reader.h>
 #include <Buildings/BuildingControlUnit/VWM/vwm_math.h>
@@ -103,7 +104,7 @@ bool BuildingModel::init(
                       << ", m_refPos=" << m_refPos;
 
 
-  for (const InfrastructureManagement::FootprintElement &footprintElement : qAsConst(mfp.elements()))
+  for (const InfrastructureManagement::FootprintElement &footprintElement : std::as_const(mfp.elements()))
     m_footprint << QPointF(footprintElement.relPosition().offsetX(), footprintElement.relPosition().offsetY());
   if (m_footprint.isEmpty())
   {
@@ -122,10 +123,10 @@ bool BuildingModel::init(
 
   m_height = DBL_MIN;
   const QMap<int, BuildingControlUnit::VWM::Room> &roomMap = rooms();
-  for (const BuildingControlUnit::VWM::Room &room : qAsConst(roomMap))
-    for (const BuildingControlUnit::VWM::OuterWall &outerWall : qAsConst(room.outerWalls()))
-      for (const BuildingControlUnit::VWM::WallElement &wallElement : qAsConst(outerWall.elements()))
-        for (const LtsUtils::QPoint3D &point : qAsConst(wallElement))
+  for (const BuildingControlUnit::VWM::Room &room : std::as_const(roomMap))
+    for (const BuildingControlUnit::VWM::OuterWall &outerWall : std::as_const(room.outerWalls()))
+      for (const BuildingControlUnit::VWM::WallElement &wallElement : std::as_const(outerWall.elements()))
+        for (const LtsUtils::QPoint3D &point : std::as_const(wallElement))
           if (point.z() > m_height)
             m_height = point.z();
 
@@ -311,7 +312,7 @@ QVector<LtsUtils::QPoint3D> BuildingModel::fromGeographic(const std::vector<Core
 {
   QVector<LtsUtils::QPoint3D> ret;
   ret.reserve(points.size());
-  for (const Core::GeoPosition &point : qAsConst(points))
+  for (const Core::GeoPosition &point : std::as_const(points))
     ret.append(fromGeographic(point));
   return ret;
 }
@@ -326,7 +327,7 @@ std::vector<Core::GeoPosition> BuildingModel::toGeographic(const QVector<LtsUtil
 {
   std::vector<Core::GeoPosition> ret;
   ret.reserve(points.size());
-  for (const LtsUtils::QPoint3D &point : qAsConst(points))
+  for (const LtsUtils::QPoint3D &point : std::as_const(points))
     ret.push_back(toGeographic(point));
   return ret;
 }
@@ -341,7 +342,7 @@ QVector<LtsUtils::QPoint3D> BuildingModel::fromReference(const QVector<LtsUtils:
 {
   QVector<LtsUtils::QPoint3D> ret;
   ret.reserve(points.size());
-  for (const LtsUtils::QPoint3D &point : qAsConst(points))
+  for (const LtsUtils::QPoint3D &point : std::as_const(points))
     ret.append(fromReference(point));
   return ret;
 }
@@ -355,7 +356,7 @@ QVector<LtsUtils::QPoint3D> BuildingModel::toReference(const QVector<LtsUtils::Q
 {
   QVector<LtsUtils::QPoint3D> ret;
   ret.reserve(points.size());
-  for (const LtsUtils::QPoint3D &point : qAsConst(points))
+  for (const LtsUtils::QPoint3D &point : std::as_const(points))
     ret.append(toReference(point));
   return ret;
 }

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_aes_data.h"
+#include <utility>
 
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
@@ -234,7 +235,7 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char
 
   // Bounding-Box-Check
   // QMap<int, Footprint> m_handlerBuildingData.getFootprints();
-  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints))
+  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints))
   {
 
     const Core::GeoPosition2D impactPosition2D(impactPosition.lon(), impactPosition.lat());
@@ -406,7 +407,7 @@ void HandlerAesData::onEffectsChanged(const AreaEffectSimulation::Effects &effec
 
   // calculate for every building of our exercise:
   const QHash<int, CentralEffectSimulation::HandlerBuildingData::Footprint> &footprints = m_handlerBuildingData->getFootprints();
-  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints))
+  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints))
   {
     calculateImpacts(effects, footprint);
   }
@@ -493,7 +494,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
   // Vulnerability should be calculated
 
   const QHash<int, CentralEffectSimulation::HandlerBuildingData::Footprint> &footprints = m_handlerBuildingData->getFootprints();
-  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints))
+  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints))
   {
     calculateImpacts(data, aesItemView, footprint);
   } // for
@@ -585,7 +586,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
 
   CentralEffectSimulation::BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
   QSet<int> &bitfieldState = bitfieldStates[aesItemId];
-  for (int i : qAsConst(bitfieldState))
+  for (int i : std::as_const(bitfieldState))
     DEBUG_LOG(m_logger) << "bitfieldState for " << aesItemId << ": " << i;
 
   for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
@@ -710,7 +711,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
 
   const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects();
   int indexBitFieldIdx = -1;
-  for (const AreaEffectSimulation::SingleEffect &singleEffect : qAsConst(singleEffectsRef))
+  for (const AreaEffectSimulation::SingleEffect &singleEffect : std::as_const(singleEffectsRef))
   {
     ++indexBitFieldIdx;
 
@@ -855,7 +856,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
   DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary data.form().size()=" << data.form().size();
   // BoobyTrap
   polyGeo.reserve(data.form().size());
-  for (const auto &pointGeo : qAsConst(data.form()))
+  for (const auto &pointGeo : std::as_const(data.form()))
   {
     QPointF point;
     point.setX(pointGeo.lon());
@@ -872,7 +873,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
                       << " exerciseId=" << exerciseId;
   // only include buildings within the radius
 
-  for (const int buildingId : qAsConst(buildingIdsInside))
+  for (const int buildingId : std::as_const(buildingIdsInside))
   {
     DEBUG_LOG(m_logger) << " BuildingId=" << buildingId;
     Buildings::Building tmpBldg;
@@ -958,7 +959,7 @@ QVector<int> HandlerAesData::findBuildingsBetween(const LtsCoordTrans::LtsCoordi
   // check all exercise specific footprints except our:
   const QHash<int, CentralEffectSimulation::HandlerBuildingData::Footprint> &allFootprintsOfEx = m_handlerBuildingData->getFootprints();
   buildingIdsInBetween.reserve(allFootprintsOfEx.size());
-  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprintToCheck : qAsConst(allFootprintsOfEx))
+  for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprintToCheck : std::as_const(allFootprintsOfEx))
   {
     // do not check ourself
     if (footprintToCheck.mseId == targetFootprint.mseId)

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_building_model.h"
+#include <utility>
 
 #include <CentralEffectSimulation/logger.h>
 
@@ -321,7 +322,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
   QPolygonF polygon2D;
   polygon2D.reserve(polylineRef.size());
-  for (const Core::GeoPosition &geoPos : qAsConst(polylineRef))
+  for (const Core::GeoPosition &geoPos : std::as_const(polylineRef))
     polygon2D << QPointF(geoPos.lon(), geoPos.lat());
 
   // Only the buildings where the line/trajectory flies over the building footprint are taken into account.
@@ -332,7 +333,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
   if (m_logger.isDebugEnabled())
   {
     DEBUG_LOG(m_logger) << "relevantBuildings.size=" << relevantBuildings.size();
-    for (const int bldgId :  qAsConst(relevantBuildings))
+    for (const int bldgId :  std::as_const(relevantBuildings))
       DEBUG_LOG(m_logger) << "relevantBuilding: bldgId = " << bldgId;
   }
 
@@ -368,8 +369,8 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
                         << " , end=" << segEnd;
 
     int buildingId = -1; // for debugging purposes
-    //for (BuildingModel *buildingModel : qAsConst(m_buildingModels))
-    for (const int bldgId :  qAsConst(relevantBuildings))
+    //for (BuildingModel *buildingModel : std::as_const(m_buildingModels))
+    for (const int bldgId :  std::as_const(relevantBuildings))
     {
       BuildingModel *buildingModel = m_buildingModels.value(bldgId, nullptr);
       if (!buildingModel)
@@ -487,7 +488,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
       } // if
 
-    } // for (const int bldgId :  qAsConst(relevantBuildings))
+    } // for (const int bldgId :  std::as_const(relevantBuildings))
   } // for(lineIt = polylineRef.begin(); lineIt != polylineRef.end()-1; ++lineIt)
 
   DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, request '" << request.requestId() << "'"

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_contamination.h"
+#include <utility>
 
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
@@ -156,7 +157,7 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
     bool isGroundLevel = false;
     const QVector<int> &buildingIds = dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel);
     DEBUG_LOG(m_logger) << "buildingIds.size=" << buildingIds.size();
-    for (int buildingId : qAsConst(buildingIds))
+    for (int buildingId : std::as_const(buildingIds))
     {
       calculateBuilding(buildingId, data,  chargeHeight, chargeDepression);
     }
@@ -192,7 +193,7 @@ void HandlerContamination::calculateBuilding(int buildingId,
   DEBUG_LOG(m_logger) << "buildingId=" << buildingId;
   effectedRooms.clear();
   effectedFloors = getEffectedFloors(buildingId, chargeHeight, chargeDepression);
-  for (int effectedFloor : qAsConst(effectedFloors))
+  for (int effectedFloor : std::as_const(effectedFloors))
     effectedRooms += dtcIsm.get()->getRoomIdsFromFloorId(buildingId, effectedFloor);
   if (!effectedRooms.empty())
   {
@@ -255,7 +256,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
   // Buildings that have been reset or decontaminated will be recontaminated as long as the nuclear weapon is still present
 
   const auto  aesItemViews  = m_ddsHandler->dtcAes()->aesItemViews();
-  for (const auto &aesItemView : qAsConst(aesItemViews))
+  for (const auto &aesItemView : std::as_const(aesItemViews))
   {
     if (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
     {
@@ -370,7 +371,7 @@ QVector<int> HandlerContamination::getEffectedFloors(const int buildingId, const
   const QVector<int> &floorIds = dtcIsm->getFloorIdsFromBuilding(buildingId);
   QVector<int> effectedFloorIds;
   effectedFloorIds.reserve(floorIds.size());
-  for (int floorId : qAsConst(floorIds))
+  for (int floorId : std::as_const(floorIds))
   {
     double halfFloorHeight = dtcIsm->getHalfFloorHeight(buildingId, floorId);
     DEBUG_LOG(m_logger) << " floorId=" << floorId
@@ -451,6 +452,8 @@ bool HandlerContamination::isInsideInnerCircle(int buildingId, int aesId)
     DEBUG_LOG(m_logger) << "isInsideInnerCircle return false";
     return false;
   }
+  // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow)
+  return false;
 }
 
 // Returns true if the building is in the inner circle at the time of impact and should fail as a result.
@@ -482,6 +485,8 @@ bool HandlerContamination::isInsideBCContamination(int buildingId, int aesId)
     DEBUG_LOG(m_logger) << "isInsideInnerCircle return false";
     return false;
   }
+  // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow)
+  return false;
 }
 
 // Returns true if the building is located in range 1 at the time of impact and is to be contaminated as a result.
@@ -514,6 +519,8 @@ bool HandlerContamination::isInsideRange1(int buildingId, int aesId)
     DEBUG_LOG(m_logger) << "isInsideRange1 return false";
     return false;
   }
+  // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow)
+  return false;
 }
 
 } // namespace CesBuildings