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/AreaEffectSimulation/aes_dtc_impl_custom.cpp
+8 -9
View File
@@ -6,7 +6,6 @@
* $Author$
*/
#include "aes_dtc_impl_custom.h"
#include <utility>
#include <DDS/DTC/generic_dtc.h>
#include <DDS/Generic/generic_data_reader.h>
#include <QElapsedTimer>
@@ -121,7 +120,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
QMap<qint32, AreaEffectSimulation::BCContamination> bcConts = bCContaminations();
aesItemId = 0;
for (const AreaEffectSimulation::BCContamination &bcCont : std::as_const(bcConts))
for (const AreaEffectSimulation::BCContamination &bcCont : qAsConst(bcConts))
{
if (bcCont.externalId() == externalId)
{
@@ -133,7 +132,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtBCContamination;
QMap<qint32, AreaEffectSimulation::NContamination> nConts = nContaminations();
for (const AreaEffectSimulation::NContamination &nCont: std::as_const(nConts))
for (const AreaEffectSimulation::NContamination &nCont: qAsConst(nConts))
{
if (nCont.externalId() == externalId)
{
@@ -145,7 +144,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtNContamination;
QMap<qint32, AreaEffectSimulation::ExplosionArea> explAreas = explosionAreas();
for (const AreaEffectSimulation::ExplosionArea &explArea : std::as_const(explAreas))
for (const AreaEffectSimulation::ExplosionArea &explArea : qAsConst(explAreas))
{
if (explArea.externalId() == externalId)
{
@@ -157,7 +156,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtExplosionArea;
QMap<qint32, AreaEffectSimulation::ExplosionSingle> explSingles = explosionSingles();
for (const AreaEffectSimulation::ExplosionSingle &explSingle : std::as_const(explSingles))
for (const AreaEffectSimulation::ExplosionSingle &explSingle : qAsConst(explSingles))
{
if (explSingle.externalId() == externalId)
{
@@ -169,7 +168,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtExplosionSingle;
QMap<qint32, AreaEffectSimulation::MineArea> mAreas = mineAreas();
for(const AreaEffectSimulation::MineArea &mArea : std::as_const(mAreas))
for(const AreaEffectSimulation::MineArea &mArea : qAsConst(mAreas))
{
if (mArea.externalId() == externalId)
{
@@ -181,7 +180,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtMineArea;
QMap<qint32, AreaEffectSimulation::MineCorridor> mCorridors = mineCorridors();
for (const AreaEffectSimulation::MineCorridor &mCorridor : std::as_const(mCorridors))
for (const AreaEffectSimulation::MineCorridor &mCorridor : qAsConst(mCorridors))
{
if (mCorridor.externalId() == externalId)
{
@@ -353,7 +352,7 @@ QVector<TrajectoryTimeAware> DtcImplCustom::trajectoriesTimeAwareFromOriginatorI
const QMap<qint32, AreaEffectSimulation::TrajectoryTimeAware> &trajectoryTimeAwareMap = trajectoryTimeAwares();
for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap))
for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap))
{
// be aware of: [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
if ((trajectoryTimeAware.originatorId() == originatorId) &&
@@ -402,7 +401,7 @@ void DtcImplCustom::initDAO()
// // We don´t realy know, how many to reserve:
// trajectoriesFromAesIdVec.reserve(120); // 2024-09 N.Thoden: 120 ist maximum per area
// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap))
// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap))
// {
// if (trajectoryTimeAware.aesItemId() == aesId)
// trajectoriesFromAesIdVec.push_back(trajectoryTimeAware);