fix Warning

This commit is contained in:
berrux-dev committed 2026-10-03 09:20:13 +02:00
1 parent 593c221d23
commit 8345470273
316 files changed
+1246 -929

No files matched your search

@@ -6,6 +6,7 @@
*/
#include "object_mine_area.h"
#include <utility>
#include "handler_mine_area.h"
#include "qtransform.h"
#include "special_area_provider.h"
@@ -116,7 +117,7 @@ int ObjectMineArea::getMineIdByIndex(int index) const
DEBUG_LOG(m_logger) << "getMineIdByIndex index: " << index;
int count = 0;
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
DEBUG_LOG(m_logger) << "tm: mineId: " << tm.mineId;
if (count == index)
@@ -150,7 +151,7 @@ void ObjectMineArea::clearCorridor(const AesItemView &aiv)
QVector<int> minesToTrigger;
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zone);
if (aivUtmPoly.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -170,14 +171,14 @@ void ObjectMineArea::clearBuildings()
DEBUG_LOG(m_logger) << "mseIds size: " << mseIds.size();
QVector<int> minesToTrigger;
for (int mseId : qAsConst(mseIds))
for (int mseId : std::as_const(mseIds))
{
DEBUG_LOG(m_logger) << "mseId: " << mseId;
const QPolygonF &footprint = m_mainHandler->dds()->ismDtc()->getUtmFootprintById(mseId, zoneOut, isGroundLevel);
minesToTrigger.clear();
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
const LtsCoordTrans::UtmCoordinate &utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zoneOut);
if (footprint.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -349,7 +350,7 @@ bool ObjectMineArea::publishTriggeredImpacts()
tis.bitfield.resize((m_triggeredMines.size() + 7) / 8);
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
// Triggered Impact == 0, if mine is disarmed/exploded
LtsUtils::BitArray::setBit(tis.bitfield, i++, !mine.isTriggered);
@@ -373,7 +374,7 @@ bool ObjectMineArea::publishDusMineStatus()
dms.mines.resize(m_triggeredMines.size());
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()});
dms.mines[i++] = entry;
@@ -399,7 +400,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> polyUtm;
polyUtm.reserve(m_mineAreaPolygon.size());
for (const QPointF &point : qAsConst(m_mineAreaPolygon))
for (const QPointF &point : std::as_const(m_mineAreaPolygon))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.x(), point.y());
DEBUG_LOG(m_logger) << "mineArea Polygon: " << posUtm.mgrs();
@@ -408,14 +409,14 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> minesUtm;
minesUtm.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position.x(), tm.position.y());
DEBUG_LOG(m_logger) << "triggeredMines: " << posUtm.mgrs();
minesUtm.append(posUtm);
}
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
Core::GeoPosition2D geoPos = Core::GeoPosition2D(tm.position.x(), tm.position.y());
vec.append(geoPos);
@@ -434,7 +435,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
// In case of MineLayerPoisition (Not Sorting) with DUS Mines and more than 2 Mines (1 Segment) we
// ignore the mines and just use the segments positions (Start is the startingPos of the the first segment
// then add all end Positions of all segments
for (const auto &segment : qAsConst(m_segments))
for (const auto &segment : std::as_const(m_segments))
{
if (vecSorted.empty())
vecSorted.push_back(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()));
@@ -472,7 +473,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
DEBUG_LOG(m_logger) << "Distance between startPos and pos: " << length;
Core::GeoPosition2D newPos = pos;
for (const Core::GeoPosition2D &pos2 : qAsConst(vec))
for (const Core::GeoPosition2D &pos2 : std::as_const(vec))
{
if (pos2 == pos || pos2 == startPos)
continue;
@@ -1034,7 +1035,7 @@ bool ObjectMineArea::containsPointInExpandedMinefield(const QPointF &positionGeo
const double distance = 0.5;
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
{
double x = pointUtm.x - mineAreaPointUTM.x();
@@ -1138,7 +1139,7 @@ void ObjectMineArea::updateMineByOldMineId(Database::AesMineAreaTriggeredMines &
int ObjectMineArea::mineCount()
{
double totalLength = 0.0;
for (const Database::AesMineAreaSegment &segment : qAsConst(m_segments))
for (const Database::AesMineAreaSegment &segment : std::as_const(m_segments))
{
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.startPosition);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.endPosition, startPositionUtm.zone);
@@ -1351,7 +1352,7 @@ void ObjectMineArea::onPublishData()
std::vector<MineSegment> segVec;
segVec.reserve(m_segments.size());
for (const auto &segment : qAsConst(m_segments))
for (const auto &segment : std::as_const(m_segments))
segVec.emplace_back(
MineSegment(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()), Core::GeoPosition2D(segment.endPosition.x(), segment.endPosition.y())));
@@ -1442,7 +1443,7 @@ void ObjectMineArea::publishAiv()
aiv2.effectStart = toMSec(m_data.effectStart);
aiv2.form.clear();
aiv2.form.reserve(m_triggeredMines.size());
for (const auto &tm : qAsConst(m_triggeredMines))
for (const auto &tm : std::as_const(m_triggeredMines))
aiv2.form.resize(aiv2.form.size() + 1, Core::GeoPosition(tm.position.x(), tm.position.y(), 0.0));
aiv2.boundingBoxBottomLeft = aiv.boundingBoxBottomLeft;
aiv2.boundingBoxTopRight = aiv.boundingBoxTopRight;
@@ -1493,7 +1494,7 @@ Core::FunctionReplyObject ObjectMineArea::createGeoSegmentsFromMineData(double &
std::vector<Core::GeoPosition2D> tempMinePos;
tempMinePos.reserve(m_triggeredMines.size() + mineData.size());
for (const auto &t : qAsConst(m_triggeredMines))
for (const auto &t : std::as_const(m_triggeredMines))
tempMinePos.emplace_back(Core::GeoPosition2D(t.position.x(), t.position.y()));
for (const auto &md : mineData)