lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results

Browse Source
This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+19 -18
View File
@@ -3,6 +3,7 @@
#include "adapter_dds.h"
#include <utility>
#include <Map/map.h>
#include <Map/layer_factory.h>
@@ -752,7 +753,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
const QList<Sim2SituationMapBase *> &sim2map = listOfSim2Map();
for (const auto &item : qAsConst(sim2map))
for (const auto &item : std::as_const(sim2map))
{
connect(item, &Sim2SituationMapBase::mapObjectChanged,
@@ -815,7 +816,7 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
if (isRunning())
{
const QList<Sim2SituationMapBase *> &aes2Map = listOfAes2Map();
for (const auto &item : qAsConst(aes2Map))
for (const auto &item : std::as_const(aes2Map))
if (item)
item->run();
}
@@ -861,7 +862,7 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
if (isRunning())
{
for (int aesTypeInt : qAsConst(aesTypesForReRunIfPartyColorChanges))
for (int aesTypeInt : std::as_const(aesTypesForReRunIfPartyColorChanges))
{
auto it = m_aes2MapCont.find(aesTypeInt);
if (it != m_aes2MapCont.end())
@@ -902,7 +903,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
colVec.reserve( (colorMap.size()*2) + 5);
colVec << Qt::black;
for (const PartyIdToColorFunctor::PartyData &partyData : qAsConst(colorMap))
for (const PartyIdToColorFunctor::PartyData &partyData : std::as_const(colorMap))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
colVec << partyData.m_color;
@@ -942,11 +943,11 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
{
QVector<LayerFactory::UniqueValueDataAesCentral> uvCont;
for (const LayerFactory::UniqueValueDataAesCentral::TYPE &type : qAsConst(typeVec))
for (const LayerFactory::UniqueValueDataAesCentral::TYPE &type : std::as_const(typeVec))
{
for (const QColor &col : qAsConst(colVec))
for (const QColor &col : std::as_const(colVec))
{
for (float radius : qAsConst(radiuss))
for (float radius : std::as_const(radiuss))
{
LayerFactory::UniqueValueDataAesCentral uvd;
QString singleVal;
@@ -1021,7 +1022,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &l
QVector<LayerFactory::UniqueValueDataAesCentral> uvCont;
uvCont.reserve(colVec.size());
for (const QColor &col : qAsConst(colVec))
for (const QColor &col : std::as_const(colVec))
{
LayerFactory::UniqueValueDataAesCentral uvd;
@@ -1042,7 +1043,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &l
Qt::darkCyan, Qt::darkMagenta, Qt::darkYellow};
uvCont.reserve(uvCont.size() + addColors.size());
for (const QColor &addColor : qAsConst(addColors))
for (const QColor &addColor : std::as_const(addColors))
{
LayerFactory::UniqueValueDataAesCentral uvd;
uvd.label = addColor.name();
@@ -1080,7 +1081,7 @@ bool AdapterDds::run()
bool success = true;
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (Sim2SituationMapBase *item : qAsConst(sim2Map))
for (Sim2SituationMapBase *item : std::as_const(sim2Map))
{
success = item->run() && success;
}
@@ -1154,7 +1155,7 @@ bool AdapterDds::stop()
}
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (Sim2SituationMapBase *item : qAsConst(sim2Map))
for (Sim2SituationMapBase *item : std::as_const(sim2Map))
{
item->stop();
}
@@ -1204,7 +1205,7 @@ void AdapterDds::clearObjects()
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (Sim2SituationMapBase *item : qAsConst(sim2Map))
for (Sim2SituationMapBase *item : std::as_const(sim2Map))
{
item->clearObjects();
}
@@ -1298,7 +1299,7 @@ bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
return false;
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (const auto &item : qAsConst(sim2Map))
for (const auto &item : std::as_const(sim2Map))
{
simIdOut = -1;
if (item->uniqueMapId2SimId(uniqueMapIdIn, simIdOut))
@@ -1316,7 +1317,7 @@ bool AdapterDds::unifiedMapObjectData(UniqueMapId uniqueMapIdIn, UnifiedMapObjec
return false;
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (const auto &item : qAsConst(sim2Map))
for (const auto &item : std::as_const(sim2Map))
{
if (item->unifiedMapObjectData(uniqueMapIdIn, umodOut))
return true;
@@ -1345,7 +1346,7 @@ RefPointer<Participant> AdapterDds::simId2Participant(int32_t simId)
UniqueMapId AdapterDds::simId2UniqueMapIdAes(int32_t simId) const
{
for (const auto &item : qAsConst(m_aes2MapCont))
for (const auto &item : std::as_const(m_aes2MapCont))
{
UniqueMapId uniqueMapId = item->simId2UniqueMapId(simId);
if (isUniqueMapIdValid(uniqueMapId))
@@ -1596,7 +1597,7 @@ QVector<UniqueMapId> AdapterDds::simIds2UniqueMapIds(MapObjectType mot, QVector<
break;
}
for (auto simId : qAsConst(simIds))
for (auto simId : std::as_const(simIds))
{
UniqueMapId uniqueMapId = simToMap(simId);
if (!isUniqueMapIdValid(uniqueMapId))
@@ -1787,7 +1788,7 @@ void AdapterDds::onSymbolDictionaryChanged()
const QList<Sim2SituationMapBase *> &aes2Map = listOfAes2Map();
for (const auto &item : qAsConst(aes2Map))
for (const auto &item : std::as_const(aes2Map))
item->reRenderObjects();
@@ -1821,7 +1822,7 @@ bool AdapterDds::onMapObjectsClicked(const QVector<UniqueMapId> &uniqueMapIds)
{
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (const auto &item : qAsConst(sim2Map))
for (const auto &item : std::as_const(sim2Map))
{
item->mapObjectsClicked(uniqueMapIds);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "building_contamination.h"
#include <utility>
#include <Map/map.h>
#include <Map/object_factory.h>
#include <MapObjects/cube.h>
@@ -539,7 +540,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
const QPointF center;
absPositionsGeo.reserve(relPositions.size());
for (const auto &relPosition : qAsConst(relPositions))
for (const auto &relPosition : std::as_const(relPositions))
{
const QPointF &relPositionRotate = MathUtils::rotate(relPosition, center, angleRad);
const QPointF &pGeo = referencePointUTM.geographic(relPositionRotate);
@@ -561,7 +562,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
Esri::ArcGISRuntime::PolygonBuilder polygonBuilder(Esri::ArcGISRuntime::SpatialReference::wgs84());
constexpr double rad2deg = LtsCoordTrans::rad2deg();
for (const Point3D &point : qAsConst(absPositionsGeo))
for (const Point3D &point : std::as_const(absPositionsGeo))
polygonBuilder.addPoint(Esri::ArcGISRuntime::Point(point.x() * rad2deg,
point.y() * rad2deg,
point.z()));
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "building_ownership.h"
#include <utility>
#include <Map/map.h>
#include <Map/object_factory.h>
#include <MapObjects/cube.h>
@@ -530,7 +531,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
const QPointF center;
absPositionsGeo.reserve(relPositions.size());
for (const auto &relPosition : qAsConst(relPositions))
for (const auto &relPosition : std::as_const(relPositions))
{
const QPointF &relPositionRotate = MathUtils::rotate(relPosition, center, angleRad);
const QPointF &pGeo = referencePointUTM.geographic(relPositionRotate);
@@ -552,7 +553,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
Esri::ArcGISRuntime::PolygonBuilder polygonBuilder(Esri::ArcGISRuntime::SpatialReference::wgs84());
constexpr double rad2deg = LtsCoordTrans::rad2deg();
for (const Point3D &point : qAsConst(absPositionsGeo))
for (const Point3D &point : std::as_const(absPositionsGeo))
polygonBuilder.addPoint(Esri::ArcGISRuntime::Point(point.x() * rad2deg,
point.y() * rad2deg,
point.z()));
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "buildinghitlineinfo_to_map.h"
#include <utility>
#include "pdm_handler.h"
#include <Map/object_factory.h>
@@ -315,7 +316,7 @@ bool BuildingHitlineInfo2SituationMap::symbolAppearanceSettingsChangesAreRelevan
void BuildingHitlineInfo2SituationMap::handleSymbolAppearanceSettings()
{
for (const Buildings::BuildingHitLineInfo &buildingHitline : qAsConst(m_ddsDataContainer))
for (const Buildings::BuildingHitLineInfo &buildingHitline : std::as_const(m_ddsDataContainer))
{
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(buildingHitline.id(), INVALID_MAP_ID);
if (uniqueMapId == INVALID_MAP_ID)
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "buildings_to_map.h"
#include <utility>
#include <Map/object_factory.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -301,7 +302,7 @@ bool Building2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
PositionCont absPositionsGeo;
absPositionsGeo.reserve(absUtmPositions2D.size());
for (const QPointF &absPosition : qAsConst(absUtmPositions2D))
for (const QPointF &absPosition : std::as_const(absUtmPositions2D))
{
const LtsCoordTrans::UtmCoordinate utmPos(zoneOut, absPosition.x(), absPosition.y());
const QPointF &pGeo = utmPos.geographic();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
+3 -2
View File
@@ -2,6 +2,7 @@
#include "charge_effect_to_map.h"
#include <utility>
#include "aes_to_situation_map_tmpl.h"
#include <AreaEffectSimulation/Utils/polygons.h>
#include <GuezIedManagement/gim_dtc.h>
@@ -486,7 +487,7 @@ bool ChargeEffectToMap::updateSingleTrajectory(const AreaEffectSimulation::Traje
PositionCont posCont;
posCont.reserve(geometry.size());
for (const Core::GeoPositionRelativeTime &posTime : qAsConst(geometry))
for (const Core::GeoPositionRelativeTime &posTime : std::as_const(geometry))
{
if (considerTime && ((traj.trajectoryStartTime() + posTime.relativeTime()) > partitionTimeMsec))
break;
@@ -742,7 +743,7 @@ void ChargeEffectToMap::updateAllNotifiedItems()
INFO_LOG(logger) << LOGFUNCTION << " m_uniqueMapIdsToUpdate.size() = " << m_uniqueMapIdsToUpdate.size();
for (int uniqueMapId : qAsConst(m_uniqueMapIdsToUpdate))
for (int uniqueMapId : std::as_const(m_uniqueMapIdsToUpdate))
{
if (!m_uniqueMapId2SimId.contains(uniqueMapId))
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
+5 -4
View File
@@ -2,6 +2,7 @@
#include "effect_cluster_to_map.h"
#include <utility>
#include "pdm_handler.h"
#include <LtsUtilsCore/dds_bitarray.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -174,7 +175,7 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
PositionCont gunToTargetPath;
gunToTargetPath.reserve(static_cast<int>(form.size()));
for (const Core::GeoPosition& item : qAsConst(form))
for (const Core::GeoPosition& item : std::as_const(form))
gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
@@ -192,7 +193,7 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
PositionCont mhps;
mhps.reserve(static_cast<int>(ddsData.effectors().size()));
for (const auto &effector : qAsConst(ddsData.effectors()))
for (const auto &effector : std::as_const(ddsData.effectors()))
{
const Core::GeoPosition &mhpPos = effector.mhpPosition();
mhps.append(Point3D(mhpPos.lon(), mhpPos.lat(), mhpPos.z()));
@@ -364,7 +365,7 @@ bool EffectCluster2SituationMap::updateGunToTargetLineAndTrajectory(const AreaEf
PositionCont gunToTargetPath;
gunToTargetPath.reserve(static_cast<int>(formRef.size()));
for (const Core::GeoPosition& item : qAsConst(formRef))
for (const Core::GeoPosition& item : std::as_const(formRef))
gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
@@ -467,7 +468,7 @@ void EffectCluster2SituationMap::updateAllNotifiedItems()
INFO_LOG(logger) << LOGFUNCTION << " m_uniqueMapIdsToUpdate.size() = " << m_uniqueMapIdsToUpdate.size();
for (int uniqueMapId : qAsConst(m_uniqueMapIdsToUpdate))
for (int uniqueMapId : std::as_const(m_uniqueMapIdsToUpdate))
{
if (!m_uniqueMapId2SimId.contains(uniqueMapId))
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
+7 -6
View File
@@ -2,6 +2,7 @@
#include "explosion_cluster_to_map.h"
#include <utility>
#include "pdm_handler.h"
#include <LtsUtilsCore/dds_bitarray.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -201,7 +202,7 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
PositionCont gunToTargetPath;
gunToTargetPath.reserve(form.size());
for (const Core::GeoPosition& item : qAsConst(form))
for (const Core::GeoPosition& item : std::as_const(form))
gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
@@ -417,7 +418,7 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
posContImpactsAbsolute.reserve(singleEffectsRef.size());
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef))
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
{
if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
continue;
@@ -483,7 +484,7 @@ bool ExplosionCluster2SituationMap::updateGunToTargetLineAndTrajectory(const Are
PositionCont gunToTargetPath;
gunToTargetPath.reserve(formRef.size());
for (const Core::GeoPosition& item : qAsConst(formRef))
for (const Core::GeoPosition& item : std::as_const(formRef))
gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
@@ -650,7 +651,7 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
PositionCont posCont;
posCont.reserve(geometry.size());
for (const Core::GeoPositionRelativeTime& posTime : qAsConst(geometry))
for (const Core::GeoPositionRelativeTime& posTime : std::as_const(geometry))
{
if (considerTime && ((traj.trajectoryStartTime() + posTime.relativeTime()) > partitionTimeMsec) )
break;
@@ -762,7 +763,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
posContImpactsAbsolute.reserve(singleEffectsRef.size());
int i = 0;
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef))
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
{
++i;
@@ -856,7 +857,7 @@ void ExplosionCluster2SituationMap::updateAllNotifiedItems()
INFO_LOG(logger) << LOGFUNCTION << " m_uniqueMapIdsToUpdate.size() = " << m_uniqueMapIdsToUpdate.size();
for (int uniqueMapId : qAsConst(m_uniqueMapIdsToUpdate))
for (int uniqueMapId : std::as_const(m_uniqueMapIdsToUpdate))
{
if (!m_uniqueMapId2SimId.contains(uniqueMapId))
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "guez_ied_to_map.h"
#include <utility>
#include <Map/object_factory.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -372,7 +373,7 @@ bool GuezIed2SituationMap::symbolAppearanceSettingsChangesAreRelevant(const Filt
void GuezIed2SituationMap::handleSymbolAppearanceSettings()
{
for (const GuezIedManagement::Ied &ied : qAsConst(m_ddsDataContainer))
for (const GuezIedManagement::Ied &ied : std::as_const(m_ddsDataContainer))
{
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(ied.id(), INVALID_MAP_ID);
if (uniqueMapId == INVALID_MAP_ID)
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "guez_nasat_9liner.h"
#include <utility>
#include <Map/object_factory.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -255,7 +256,7 @@ void GuezNasat9Liner2SituationMap::handleSymbolAppearanceSettings()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_ddsDataContainer.size()=" << m_ddsDataContainer.size();
for (const GuezNasat::Nasat9Liner &nineLiner : qAsConst(m_ddsDataContainer))
for (const GuezNasat::Nasat9Liner &nineLiner : std::as_const(m_ddsDataContainer))
{
RefPointer<MAP_T> mapObj = getMapObjectOfSimId(nineLiner.id());
if (!mapObj.valid())
@@ -330,7 +331,7 @@ void GuezNasat9Liner2SituationMap::onPartitionTimeChanged()
void GuezNasat9Liner2SituationMap::updateAllItems()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_ddsDataContainer.size()=" << m_ddsDataContainer.size();
for (const DDS_T &ddsData : qAsConst(m_ddsDataContainer))
for (const DDS_T &ddsData : std::as_const(m_ddsDataContainer))
{
RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id());
if (!mapObj.valid())
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "hitlineinfo_to_map.h"
#include <utility>
#include "pdm_handler.h"
#include <Map/object_factory.h>
#include <Map/map.h>
@@ -378,7 +379,7 @@ void HitlineInfo2SituationMap::handleSymbolAppearanceSettings()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_ddsDataContainer.size()=" << m_ddsDataContainer.size();
for (const ParticipantManagement::HitLineInfo &hitline : qAsConst(m_ddsDataContainer))
for (const ParticipantManagement::HitLineInfo &hitline : std::as_const(m_ddsDataContainer))
{
RefPointer<MAP_T> mapObj = getMapObjectOfSimId(hitline.id());
if (!mapObj.valid())
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "mine_area_to_map.h"
#include <utility>
#include <AreaEffectSimulation/Utils/polygons.h>
#include <AreaEffectSimulation/Utils/ddsdbconvert.h>
#include <ProjectDataManagement/pdm_dtc.h>
@@ -186,7 +187,7 @@ bool MineArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
keysInUse.removeAll(segmentIdx);
}
for (auto item : qAsConst(keysInUse))
for (auto item : std::as_const(keysInUse))
if (item >= 0)
mapObj->removeSegment(item);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "mounting_point_to_map.h"
#include <utility>
#include <Map/map.h>
#include <Map/object_factory.h>
#include <Map/layer_factory.h>
@@ -183,7 +184,7 @@ bool MountingPointToMap::initRendererInternal()
uvCont.reserve(imageCont.size() * 5);
for (const InfrastructureManagement::MountingPoint::MpNameImageData &mnid : qAsConst(imageCont) )
for (const InfrastructureManagement::MountingPoint::MpNameImageData &mnid : std::as_const(imageCont) )
{
{
const InfrastructureManagement::MountingPoint::NameImagePair &nipRef = mnid.nipBlue;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "mse_bridge_to_map.h"
#include <utility>
#include <Map/object_factory.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -253,7 +254,7 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
const QPointF center;
absPositionsGeo.reserve(relPositions2D.size());
for (const auto &relPosition : qAsConst(relPositions2D))
for (const auto &relPosition : std::as_const(relPositions2D))
{
const QPointF relPositionRotate = MathUtils::rotate(relPosition, center, angleRad);
const QPointF pGeo = referencePointUTM.geographic(relPositionRotate);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
+11 -10
View File
@@ -2,6 +2,7 @@
#include "participant_to_map.h"
#include <utility>
#include "pdm_handler.h"
#include <Map/map.h>
@@ -243,7 +244,7 @@ bool Participant2SituationMap::run()
}
{
const QVector<int> &simIds = m_movementTrackManager->deactiveTrackIds();
for (int simId : qAsConst(simIds))
for (int simId : std::as_const(simIds))
onMovementTrackActivityChanged(simId, false);
}
}
@@ -416,7 +417,7 @@ void Participant2SituationMap::onPartitionTimeChanged(qint64 newPartitionTime)
timer.start();
for (const InternalPosition &pos : qAsConst(m_participantPositions))
for (const InternalPosition &pos : std::as_const(m_participantPositions))
{
if (LtsUtils::isPositionTimeOutdated(newPartitionTime, pos.sampleTime()))
handleSymbolAppearanceSettingsParticipant(pos.participantId());
@@ -429,7 +430,7 @@ void Participant2SituationMap::onPartitionTimeChanged(qint64 newPartitionTime)
m_movementTrackManager->setCurrentTimeMsec(newPartitionTime);
simIds = m_movementTrackManager->activeTrackIds();
for (int32_t simId : qAsConst(simIds))
for (int32_t simId : std::as_const(simIds))
{
RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(simId);
if (!mapObj.valid())
@@ -501,7 +502,7 @@ void Participant2SituationMap::updateHierarchyLevels()
if (m_layerFactory)
{
std::set<qint32> hLevels;
for (const ParticipantManagement::Type &type : qAsConst(m_types))
for (const ParticipantManagement::Type &type : std::as_const(m_types))
hLevels.insert(type.hierarchyLevel());
@@ -892,7 +893,7 @@ void Participant2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::
void Participant2SituationMap::onDusMineStateChanged(const AreaEffectSimulation::DusMineState &, DataModification )
{
auto copy = m_participantDynamicData;
for (const ParticipantManagement::DynamicParticipantData &dynPartData : qAsConst(copy))
for (const ParticipantManagement::DynamicParticipantData &dynPartData : std::as_const(copy))
{
if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId()))
continue;
@@ -1306,7 +1307,7 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
QVector<int> gearRanges;
gearRanges.reserve(data.gear().size());
for (const QPair<int, int> &gearCharge : qAsConst(validGearCharges))
for (const QPair<int, int> &gearCharge : std::as_const(validGearCharges))
{
const int range = m_pdmHandler->maxRangeFromGearTypeIdAndChargeTypeId(gearCharge.first, gearCharge.second);
if (range > 0)
@@ -1323,7 +1324,7 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
QVector<Participant::DesignationData> designationDataVec;
designationDataVec.reserve(designations.size());
for (const ParticipantManagement::LaserDesignation &des : qAsConst(designations))
for (const ParticipantManagement::LaserDesignation &des : std::as_const(designations))
{
Participant::DesignationData designationData;
const Core::GeoPosition &spotLocation = des.spotLocation();
@@ -1461,7 +1462,7 @@ void Participant2SituationMap::updateGearEventInternal(bool doUpdateView,
if (particpantIdsWithGearEvents.isEmpty())
return;
for (auto partId : qAsConst(particpantIdsWithGearEvents))
for (auto partId : std::as_const(particpantIdsWithGearEvents))
{
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(partId, INVALID_MAP_ID);
if (uniqueMapId == INVALID_MAP_ID)
@@ -1692,7 +1693,7 @@ void Participant2SituationMap::onSymbolAppearanceSettingsChanged(FilterManagemen
}
for (const ParticipantManagement::Participant &participant : qAsConst(m_participants))
for (const ParticipantManagement::Participant &participant : std::as_const(m_participants))
{
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(participant.id(), INVALID_MAP_ID);
if (uniqueMapId == INVALID_MAP_ID)
@@ -1875,7 +1876,7 @@ void Participant2SituationMap::addToUpdateNotify(const RefPointer<MAP_T> &mapObj
void Participant2SituationMap::notifyMapAboutModifedObjects()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_objectsToUpdate.size() = " << m_objectsToUpdate.size() << ", this=" << this;
for (RefPointer<MAP_T> mapObj : qAsConst(m_objectsToUpdate))
for (RefPointer<MAP_T> mapObj : std::as_const(m_objectsToUpdate))
{
if (mapObj)
mapObj->updateView();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+3 -2
View File
@@ -2,6 +2,7 @@
#include "pdm_handler.h"
#include <utility>
#include <ProjectDataManagement/pdm_dtc.h>
#include <QJsonDocument>
#include <QJsonObject>
@@ -101,13 +102,13 @@ int PdmHandler::maxRangeFromGearTypeIdAndChargeTypeId(int gearTypeId, int charge
initializePdm();
for (const auto &entry : qAsConst(m_gearTypeChargeTypes))
for (const auto &entry : std::as_const(m_gearTypeChargeTypes))
if ((entry.gearTypeId() == gearTypeId) &&
(entry.chargeTypeId() == chargeTypeId))
return entry.maxRange();
for (const auto &entry : qAsConst(m_gearTypeChargeTypes))
for (const auto &entry : std::as_const(m_gearTypeChargeTypes))
if ((entry.gearTypeId() == 1000) &&
(entry.chargeTypeId() == chargeTypeId))
return entry.maxRange();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
+4 -3
View File
@@ -6,6 +6,7 @@
#include "unified_map_object_data.h"
#include <utility>
#include "plugin_provider.h"
#include <Map/object_factory.h>
#include <Common/situation_map_logging.h>
@@ -115,7 +116,7 @@ public:
simIds.reserve(uniqueMapIds.size());
int32_t simId_entityId = -1;
for(const UniqueMapId uniqueMapId : qAsConst(uniqueMapIds))
for(const UniqueMapId uniqueMapId : std::as_const(uniqueMapIds))
{
if (this->uniqueMapId2SimId(uniqueMapId, simId_entityId))
simIds.append(simId_entityId);
@@ -140,7 +141,7 @@ public:
template <typename MAP_T>
void iterateObjects(const std::function<void( RefPointer<MAP_T> &mapObj)> &f)
{
for (const UniqueMapId &uniqueMapId : qAsConst(m_simId2UniqueMapId))
for (const UniqueMapId &uniqueMapId : std::as_const(m_simId2UniqueMapId))
{
RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
if (!mapObj.valid())
@@ -151,7 +152,7 @@ public:
virtual void reRenderObjects()
{
for (const UniqueMapId &uniqueMapId : qAsConst(m_simId2UniqueMapId))
for (const UniqueMapId &uniqueMapId : std::as_const(m_simId2UniqueMapId))
{
RefPointer<AbstractMapObject> mapObj = m_objFac.get(uniqueMapId);
if (!mapObj.valid())
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "sound_area_to_map.h"
#include <utility>
#include <Map/object_factory.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -194,7 +195,7 @@ SituationMap::PositionCont soundGeometryToPositions(const QJsonDocument &jdoc)
SituationMap::PositionCont posCont;
posCont.reserve(jArray.size());
for (const auto &val : qAsConst(jArray))
for (const auto &val : std::as_const(jArray))
{
const QJsonObject &objTemp = val.toObject();
posCont.append(Point3D::fromQPointF({objTemp[QLatin1String("lon")].toDouble(),
@@ -331,7 +332,7 @@ bool SoundAreaToMap::onMainStructureElementChanged(const InfrastructureManagemen
const int32_t actualExerciseId = m_pluginProvider->exerciseId();
const QJsonArray &arr = doc.object().value(QLatin1String("available_in_exercise")).toArray();
for (const QJsonValue &value : qAsConst(arr))
for (const QJsonValue &value : std::as_const(arr))
{
if (!value.isDouble())
continue;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "special_areas_to_map.h"
#include <utility>
#include <LtsUtilsCore/dds_bitarray.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
@@ -96,7 +97,7 @@ bool SpecialAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
PositionCont posCont;
posCont.reserve(polygon.size());
for (const auto &p : qAsConst(polygon))
for (const auto &p : std::as_const(polygon))
posCont.push_back(Point3D(p.lon(), p.lat(), .0));
mapObj->setPositions(posCont);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/CMakeLists.txt
+2 -2
View File
@@ -133,7 +133,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(SitmapDds
)
NGL_TARGET_LINK_LIBRARIES(SitmapDds
PUBLIC
Qt5::Core
Qt6::Core
situationMap
LtsUtilsGuiDds # RequestHelper
PRIVATE
@@ -220,7 +220,7 @@ NGL_TARGET_LINK_LIBRARIES(SitmapGuiPlugin
LtsPrinting
LtsSession
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsCoordTrans
LtsAppDescriptor
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "sitmap_configure_url_model.h"
#include <utility>
#include <AssetManagement/asm_data_plugin_interface.h>
@@ -25,7 +26,7 @@ ConfigureMapUrlModel::~ConfigureMapUrlModel()
void ConfigureMapUrlModel::addData(const DATA_T &entry)
{
for (const auto &r : qAsConst(m_vecData))
for (const auto &r : std::as_const(m_vecData))
{
if (r == entry)
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "map_object_model.h"
#include <utility>
#include <Symbology/sidc_codec.h>
#include <SituationMap/Map/party_id_to_color_functor.h>
@@ -211,7 +212,7 @@ bool MapObjectModel::updateMapObjectData(const QSharedPointer<MapObjectData> &ma
void MapObjectModel::requestCivilIcons()
{
for (const DATA_T &moData : qAsConst(m_vecData))
for (const DATA_T &moData : std::as_const(m_vecData))
{
if (!moData)
continue;
@@ -469,7 +470,7 @@ void MapObjectModel::updateUsedPartyIds()
m_usedPartyIds.clear();
m_usedTypeName.clear();
m_usedVulnerabilities.clear();
for (const QSharedPointer<MapObjectData> &item : qAsConst(m_vecData))
for (const QSharedPointer<MapObjectData> &item : std::as_const(m_vecData))
{
if (!item)
continue;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "map_object_selection_widget.h"
#include <utility>
#include "map_object_custom_view.h"
#include "map_object_model.h"
#include "ui_map_object_selection_dialog.h"
@@ -668,7 +669,7 @@ void MapObjectSelectionWidget::onMapObjectEntered(const QModelIndex &index)
ObjectFactory &objFac = m_map->objectFactory();
{
for (auto uid : qAsConst(m_selectedMapObjects))
for (auto uid : std::as_const(m_selectedMapObjects))
{
RefPointer<AbstractMapObject> mapObj = objFac.get<AbstractMapObject>(uid);
if (mapObj)
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
+3 -2
View File
@@ -2,6 +2,7 @@
#include "layers_model.h"
#include <utility>
#include <SituationMap/Map/layer_parameter.h>
@@ -62,7 +63,7 @@ bool LayersModel::initModel(Map *situationMap)
}
INFO_LOG(m_logger) << "initModel - #layers: " << m_vecData.size();
for (const LayerInfo &item : qAsConst(m_vecData))
for (const LayerInfo &item : std::as_const(m_vecData))
INFO_LOG(m_logger) << "initModel - layers: " << item.layerName;
return true;
@@ -276,7 +277,7 @@ QStringList LayersModel::orderLayerNames() const
bool LayersModel::isDisplayNameInFilter(const QString &displayName)
{
for(const QString &name : qAsConst(m_layerDisplayNameFilterList))
for(const QString &name : std::as_const(m_layerDisplayNameFilterList))
{
if(displayName.compare(name) == 0)
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
+7 -6
View File
@@ -2,6 +2,7 @@
#include "sitmap_gui_plugin.h"
#include <utility>
#include "situation_map_init.h"
#include "sitmap_widget_control.h"
#include "ConfigureUrl/sitmap_configure_urls.h"
@@ -2622,7 +2623,7 @@ bool InterfaceImpl::displayPreviewObjects(QObject *parent, const QVector<Preview
bool success = true;
int drawOrder = 0;
for (const PreviewCircleData &previewCircle : qAsConst(previewCirclesAscending))
for (const PreviewCircleData &previewCircle : std::as_const(previewCirclesAscending))
{
RefPointer<ChemicalAgent> tempObject = m_situationMap->objectFactory().create<ChemicalAgent>(logicalLayerRubberband, QStringLiteral("TemporaryPreviewCircle"));
if (!tempObject)
@@ -2961,7 +2962,7 @@ static QPolygonF rectangle(const QPointF &cornerPosition, double width, double l
cord.y = cord.y - (width / 2);
cord.x = cord.x - (length / 2);
for (const QPointF &point : qAsConst(polyUtm))
for (const QPointF &point : std::as_const(polyUtm))
poly << cord.geographic(point);
return poly;
}
@@ -3007,7 +3008,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
PositionCont posContainer;
posContainer.reserve(polygon_rad.size());
for (const QPointF &p : qAsConst(polygon_rad))
for (const QPointF &p : std::as_const(polygon_rad))
posContainer.append(Point3D(p.x(), p.y(), 0));
escOrderAreaPositionObject->setPositions(posContainer);
@@ -3564,7 +3565,7 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
qCritical() << " m_situationMap->overlayHandler().overlays() = " << overlayIds;
}
for (const int unloadableOverlayId : qAsConst(unloadableOverlayIds))
for (const int unloadableOverlayId : std::as_const(unloadableOverlayIds))
{
NOTICE_LOG(m_logger) << " due to error on loading, following overlayId is removed: " << unloadableOverlayId;
if (!m_situationMap->overlayHandler().removeOverlay(unloadableOverlayId))
@@ -3957,7 +3958,7 @@ void InterfaceImpl::onSaveAsImageRequested()
bool InterfaceImpl::removePreviewObject()
{
for (const UniqueMapId id : qAsConst(m_uniqueMapIdOfPreviewObject))
for (const UniqueMapId id : std::as_const(m_uniqueMapIdOfPreviewObject))
{
if (m_situationMap->objectFactory().contains(id))
{
@@ -4301,7 +4302,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
(m_startTimeSec + m_durationSec) * 1000);
QJsonArray arr;
for (const SituationReplayTime &rt : qAsConst(m_sitReplayTimes))
for (const SituationReplayTime &rt : std::as_const(m_sitReplayTimes))
{
if (m_startTimeSec > rt.topicEnd_s)
continue;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
+5 -4
View File
@@ -2,6 +2,7 @@
#include "situation_map_init.h"
#include <utility>
#include "situation_map_init_p.h"
#include <QCoreApplication>
@@ -119,7 +120,7 @@ public:
~MapCache()
{
for (const auto &vec : qAsConst(m_mapWidgetCache))
for (const auto &vec : std::as_const(m_mapWidgetCache))
{
for (const auto &item : vec)
{
@@ -133,7 +134,7 @@ public:
{
std::cerr << " m_mapWidgetCache CacheSize = " << m_mapWidgetCache.size() << std::endl;
for (const auto &vec : qAsConst(m_mapWidgetCache))
for (const auto &vec : std::as_const(m_mapWidgetCache))
{
std::cerr << " m_mapWidgetCache VectorSize: " << vec.size() << std::endl;
for (const auto &item : vec)
@@ -606,7 +607,7 @@ bool SituationMapInit::zoomMapTo(const QVector<QPair<MapObjectType, int> > &enti
PositionCont posCont;
for (const QPair<MapObjectType, int> &entity : qAsConst(entities))
for (const QPair<MapObjectType, int> &entity : std::as_const(entities))
{
RefPointer<AbstractMapObject> mapObj = m_adapterDds->simId2MapObject(entity.first, entity.second);
if (!mapObj)
@@ -633,7 +634,7 @@ bool SituationMapInit::zoomMapTo(const QVector<QPair<MapObjectType, int> > &enti
{
QVector<QPointF> coords;
coords.reserve(posCont.size());
for (const Point3D p : qAsConst(posCont))
for (const Point3D p : std::as_const(posCont))
coords.push_back(p.toPointF());
m_situationMap->zoomToArea(coords, paddingInDIPS);
}