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

- 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

No files matched your search

@@ -7,7 +7,6 @@
*/
#include "object_effect_cluster.h"
#include <utility>
#include "Utils/polygons.h"
#include "handler_charge_administration.h"
#include "handler_charge_effect.h"
@@ -24,14 +23,14 @@
#include <TrajectorySplitter/trajectory_splitter.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonValue>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
#include <QPolygonF>
#include <QtCore/QTimer>
#include <QTimer>
#include <QVector3D>
// ToDo: mark the end of aes enum and update following (check Endemarke)
@@ -462,9 +461,9 @@ Core::FunctionReplyObject ObjectEffectCluster::updateObject(const Database::AesE
int oldImpactCount = 0;
int newImpactCount = 0;
for (const auto &oldEffector : std::as_const(m_effectorData))
for (const auto &oldEffector : qAsConst(m_effectorData))
oldImpactCount += oldEffector.chargeAmount;
for (const auto &newEffector : std::as_const(effectorDatas))
for (const auto &newEffector : qAsConst(effectorDatas))
newImpactCount += newEffector.chargeAmount;
if (oldImpactCount != newImpactCount)
@@ -687,7 +686,7 @@ bool ObjectEffectCluster::initialCalculations(QString *reasonOut)
mtps_asUtm.resize(m_data.impactCount);
m_temporaryData.mhPoints.reserve(mtps_asUtm.size());
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
{
LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y()));
@@ -1436,7 +1435,7 @@ void ObjectEffectCluster::publishAiv()
const QVector<QPointF> &singleExplosions = Polygons::effectClusterSingleExplosionsGAUSS_Mtp(m_data, m_effectorData);
singleEffectsRef.reserve(singleExplosions.size());
for (const QPointF &singleExplosion : std::as_const(singleExplosions))
for (const QPointF &singleExplosion : qAsConst(singleExplosions))
{
SingleEffect se;
se.singleEffectState(AesSingleEffectState_def::SesScheduled);
@@ -1617,7 +1616,7 @@ void ObjectEffectCluster::markAsExpired(bool fireLoadedRound)
DEBUG_LOG(m_logger) << "TimerTimeout we will now send Confirmation for " << m_data.id;
// send confirmation for all Effectors then mark as expired (with false)
for (const auto effector : std::as_const(m_effectorData))
for (const auto effector : qAsConst(m_effectorData))
{
onSendConfirmationReportToTab(effector.participantId);
}
@@ -2037,7 +2036,7 @@ void ObjectEffectCluster::onEffectorFired(int participantId, int aesItemId, cons
if (chargeEffectIds.size() > 1) // we need to find the last and first one
{
for (const auto id : std::as_const(chargeEffectIds))
for (const auto id : qAsConst(chargeEffectIds))
{
const auto &chargeEffect = m_mainHandler->chargeEffectHandler()->getChargeEffectById(id);
if (chargeEffect->getEffectStart() > lastChargeEffect.second)
@@ -2548,7 +2547,7 @@ bool ObjectEffectCluster::generateTrajectoryVulcanoSpecific(int explosionNumber,
// "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry
tdRef.trajectoryGeometry.clear();
for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry()))
for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry()))
tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast
tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z();
@@ -2723,7 +2722,7 @@ void ObjectEffectCluster::sendCalculateTrajectoryAdlerRequest(const QVector<Data
QString reason;
for (const auto &data : std::as_const(effectorData))
for (const auto &data : qAsConst(effectorData))
{
DEBUG_LOG(m_logger) << "TRY to send Calcualte TrajecotryAdlerReuqest for participantId=" << data.participantId;
@@ -3049,7 +3048,7 @@ void ObjectEffectCluster::publishTrajectory(int explosionIndex)
#define REDUCED_DISTRIBUTION // [GUEZE-2462] Darstellung Flugparabel Steilfeuer
#ifdef REDUCED_DISTRIBUTION
const int trajSize = trajectoryGeometry.size();
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
{
// if (!m_isAirSupportSource)
{
@@ -3077,7 +3076,7 @@ void ObjectEffectCluster::publishTrajectory(int explosionIndex)
} // for
#else
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
{
geometryRef.emplace_back(Core::GeoPositionRelativeTime(pos3D.lon(), pos3D.lat(), pos3D.z(), idx * flightDurationMSecSeg));
++idx;