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

Session 026: Lts/Services Qt5:: to Qt6:: migration

Browse Source 
- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
1244 files changed
+4266 -4633
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp
+1 -2
View File
@@ -7,7 +7,6 @@
*/
#include "expand_polygon.h"
#include <utility>
#include <CentralEffectSimulation/logger.h>
@@ -29,7 +28,7 @@ QPolygonF bufferUtmPolygon(const QPolygonF &polygonUtmIn, const int zone, const
Esri::ArcGISRuntime::PolygonBuilder polygonBuilder(Esri::ArcGISRuntime::SpatialReference(32600 + zone));
DEBUG_LOG(logger) << "ExpandPolygon::bufferUtmPolygon";
for (const QPointF &pointUtm : std::as_const(polygonUtmIn))
for (const QPointF &pointUtm : qAsConst(polygonUtmIn))
polygonBuilder.addPoint(Esri::ArcGISRuntime::Point(pointUtm.x(), pointUtm.y(), 0));
const Esri::ArcGISRuntime::Geometry &esriGeometry = polygonBuilder.toGeometry();
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QPolygonF>
#include <QtCore/QString>
#include <QString>
namespace CesExplosions
{
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h
+2 -2
View File
@@ -17,8 +17,8 @@
//#include <CentralEffectSimulation/proxy_building.h>
#include <QtCore/QHash>
#include <QtCore/QVector>
#include <QHash>
#include <QVector>
#include <QPolygonF>
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
+23 -24
View File
@@ -7,11 +7,10 @@
*/
#include "handler_explosions.h"
#include <utility>
#include "expand_polygon.h"
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsElevation/lts_elevation_manager.h>
@@ -19,11 +18,11 @@
#include <LtsCoordinate/lts_coordinate.h>
#include <QtCore/QPointF>
#include <QtCore/QVector>
#include <QtCore/QSet>
#include <QtCore/QDateTime>
#include <QtCore/QTimer>
#include <QPointF>
#include <QVector>
#include <QSet>
#include <QDateTime>
#include <QTimer>
#include <QElapsedTimer>
using namespace CentralEffectSimulation;
@@ -224,7 +223,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
const int remaining = 1; // ICD GUEZSB60_ICD-0052_Zentrale_Tne.doc Wirkfeldtyp Gefahrenbereich Steilfeuer
const auto &participantPositions = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions))
{
if (!allParticipantIdsInArea.contains(pPos.participantId()))
continue;
@@ -353,7 +352,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId(),data.igniterTypeId(), data.igniterFunctionId());
const double impactRadius = m_ddsHandler->chargeTypeRadius(chargeStruct);
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions))
{
if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
continue;
@@ -543,7 +542,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
return;
}
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions))
{
if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
continue;
@@ -634,7 +633,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
triggeredEffectsLtsCoord.reserve(singleEffectsRef.size());
int curSeIndex = -1;
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef))
{
++curSeIndex;
if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
@@ -658,7 +657,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
// Now call calculateImpacts() (createEvent if in circle...)
const auto &participantPositions = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions))
{
if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
continue;
@@ -894,9 +893,9 @@ void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects
bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId(), aesItem);
if ( itemAvailable)
{
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(effects.singleEffects()))
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(effects.singleEffects()))
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ---> singleEffect=" << se
DEBUG_LOG(m_logger) << LOGFUNCTION << " ---> singleEffect=" << se
<< ", aesItem= " << aesItem;
calculateSmartExplosion(effects.aesItemId(),
aesItem.chargeStruct(),
@@ -935,7 +934,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
bool bHumanFound = false;
const auto &participantPositions = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : qAsConst(participantPositions))
{
if (m_handlerParticipant->isOutdated(participantPosition)) // Participant Position is not valid Todo Magic Number
continue;
@@ -1078,7 +1077,7 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
return;
const auto &participantPositions = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions))
{
if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
continue;
@@ -1108,7 +1107,7 @@ void HandlerExplosions::calculateImpacts(const CentralEffectSimulation::AesItemV
DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts2a impactsToCheck.size " << impactsToCheck.size();
for (int bitFieldIdx : std::as_const(impactsToCheck))
for (int bitFieldIdx : qAsConst(impactsToCheck))
{
if (itemView.form.size() <= bitFieldIdx)
continue;
@@ -1166,7 +1165,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
DEBUG_LOG(m_logger) << "shiftedParticipantLtsCoord = " << shiftedParticipantLtsCoord.toString(true);
for (const LtsCoordinate &newTriggeredImpactLtsCoord : std::as_const(triggeredEffectsLtsCoord))
for (const LtsCoordinate &newTriggeredImpactLtsCoord : qAsConst(triggeredEffectsLtsCoord))
{
// const int zoneToUse = itemView.zone;
// 2D or 3D??
@@ -1293,7 +1292,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
{
const LtsCoordTrans::LtsCoordinate &partLtsCoordinate = participantPosition.ltsCoordinate(); // WITH zValue
INFO_LOG(m_logger) << Q_FUNC_INFO << " START"
INFO_LOG(m_logger) << LOGFUNCTION << " START"
<< " participantId = " << participantPosition.participantId()
<< " participantPosition.ltsCoordinate = '" << participantPosition.ltsCoordinate().toString() << "'"
<< ", triggeredEffectsGeoPos.size() = " << triggeredEffectsGeoPos.size()
@@ -1302,7 +1301,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
<< ", -> partLtsCoordinate " << partLtsCoordinate
<< ", lineOfSightOptions " << lineOfSightOptions;
INFO_LOG(m_logger) << Q_FUNC_INFO << participantPosition;
INFO_LOG(m_logger) << LOGFUNCTION << participantPosition;
if (triggeredEffectsGeoPos.empty())
return;
@@ -1331,7 +1330,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
DEBUG_LOG(m_logger) << "calculateImpactsEffect 1 triggeredEffectsUtmPos.size " << triggeredEffectsUtmPos.size();
int idx = -1;
for (const QPointF &newTriggeredImpactUtm : std::as_const(triggeredEffectsUtmPos))
for (const QPointF &newTriggeredImpactUtm : qAsConst(triggeredEffectsUtmPos))
{
++idx;
@@ -1353,7 +1352,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
const int exerciseId = m_ddsHandler->getExerciseId();
QElapsedTimer timer;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " vor lineOfSightOptions start";
DEBUG_LOG(m_logger) << LOGFUNCTION << " vor lineOfSightOptions start";
if (m_logger.isInfoEnabled())
timer.start();
@@ -1368,7 +1367,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
<< " success=" << success;
// check LOS / LineOfSight
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " check LOS / LineOfSight bLOS=" << bLOS
DEBUG_LOG(m_logger) << LOGFUNCTION << " check LOS / LineOfSight bLOS=" << bLOS
<< " participantId=" << participantPosition.participantId();
if (bLOS)
{
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <QtCore/QVector>
#include <QPolygonF>
#include <QQueue>
#include <QtCore/QTimer>
#include <QTimer>
// AES-Handling for Explosions
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
+10 -11
View File
@@ -7,24 +7,23 @@
*/
#include "handler_vulcano.h"
#include <utility>
#include "expand_polygon.h"
#include "isInCone.h"
#include "settings.h"
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <CentralEffectSimulation/handler_participant.h>
#include <QPainterPath>
#include <QtCore/QPointF>
#include <QPointF>
#include <QPolygonF>
#include <QtCore/QVector>
#include <QtCore/QTimer>
#include <QVector>
#include <QTimer>
#include <QTransform>
#include <QtCore/QDateTime>
#include <QtCore/QVariant>
#include <QDateTime>
#include <QVariant>
namespace CesExplosions
@@ -245,7 +244,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
const auto &designationsVec = dpd.designations();
DEBUG_LOG(m_logger) << "onTimerTimeout participantId=" << participantId;
for (const auto &designation : std::as_const(designationsVec))
for (const auto &designation : qAsConst(designationsVec))
{
if (designation.code() == prf && designation.outputPower() > 0)
{
@@ -369,7 +368,7 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
Core::GeoPosition result;
int i = 0;
for (const auto &point : std::as_const(trajectoryTimeAwareValue.geometry()))
for (const auto &point : qAsConst(trajectoryTimeAwareValue.geometry()))
{
DEBUG_LOG(m_logger) << "time=" << point.relativeTime();
if ( (point.relativeTime() > relTime) && (i > 0))
@@ -405,7 +404,7 @@ void HandlerVulcano::onDynamicParticipantChanged(const ParticipantManagement::Dy
<< data.designations().size();
if (data.designations().size() > 0)
{
for (const ParticipantManagement::LaserDesignation &designation : std::as_const(data.designations()))
for (const ParticipantManagement::LaserDesignation &designation : qAsConst(data.designations()))
{
DEBUG_LOG(m_logger) << "gearId=" << designation.gearId()
<< " code=" << designation.code()
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h
+2 -2
View File
@@ -23,8 +23,8 @@
#include <QtCore/QVector>
#include <QPolygonF>
#include <QQueue>
#include <QtCore/QHash>
#include <QtCore/QTimer>
#include <QHash>
#include <QTimer>
namespace LtsUtils
{
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/line_of_sight.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include <LtsCoordinate/lts_coordinate.h>
#include <CentralEffectSimulation/proxy_building.h>
#include <QtCore/QFlags>
#include <QFlags>
#pragma once
namespace CesExplosions
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <CentralEffectSimulation/dds_handler.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <QtCore/QObject>
#include <QObject>
namespace CesExplosions
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QtCore/QString>
#include <QString>
namespace NGL
{