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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
+3 -3
View File
@@ -67,7 +67,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
esmEffectShow.startTime = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_effectCluster.id;
@@ -142,7 +142,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
esmEffectShow.startTime = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
esmEffectShow.duration = m_effectCluster.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_effectCluster.id;
@@ -170,7 +170,7 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
DEBUG_LOG(m_logger) << "update EffectSHow for (" << data.id << ")";
data.nameAreaEfffectSimulation = QString::fromStdString(m_effectCluster.name);
data.startTime = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
data.startTime = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
DEBUG_LOG(m_logger) << "Recalc effectDuration ";
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp
+3 -3
View File
@@ -62,7 +62,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.startTime = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
@@ -106,7 +106,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.startTime = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
@@ -132,7 +132,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
void EffectShowExplosionArea::updateEffectShow(Database::EsmEffectShow &data)
{
data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name);
data.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
data.startTime = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
data.duration = m_explosionArea.effectDuration;
if (data.shotsPerVolley > 48)
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp
+3 -3
View File
@@ -62,7 +62,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
esmEffectShow.startTime = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
esmEffectShow.duration = m_explosionCluster.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionCluster.id;
@@ -106,7 +106,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
esmEffectShow.startTime = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
esmEffectShow.duration = m_explosionCluster.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionCluster.id;
@@ -134,7 +134,7 @@ void EffectShowExplosionCluster::updateEffectShow(Database::EsmEffectShow &data)
DEBUG_LOG(m_logger) << "update EffectSHow for (" << data.id << ")";
data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionCluster.name);
data.startTime = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
data.startTime = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
data.duration = m_explosionCluster.effectDuration;
if (data.shotsPerVolley > 48)
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
Database::EsmEffectShow esmEffectShow;
esmEffectShow.id = 0;
esmEffectShow.name = QLatin1String("MIN");
esmEffectShow.startTime = m_mineArea.effectStart.is_set() ? m_mineArea.effectStart.get() : 0;
esmEffectShow.startTime = m_mineArea.effectStart.has_value() ? m_mineArea.effectStart.get() : 0;
esmEffectShow.duration = m_mineArea.effectDuration;
esmEffectShow.centerPosition = m_centerPos.geographic();
esmEffectShow.idAreaEffectSimulation = m_mineArea.id;
@@ -59,7 +59,7 @@ void EffectShowMineArea::updateEffectShow(Database::EsmEffectShow &data)
data.duration = m_mineArea.effectDuration / 10;
if (data.duration > (3600 * 1000))
data.duration = 3600 * 1000;
if (m_mineArea.effectStart.is_set())
if (m_mineArea.effectStart.has_value())
data.startTime = m_mineArea.effectStart.get() + m_mineArea.effectDuration - data.duration;
else
data.startTime = 0;
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp
+2 -2
View File
@@ -80,7 +80,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
auto m_ppmDtc = m_mainHandler->dds()->dtcPpm();
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(data.typeId).typeClass;
DEBUG_LOG(m_logger) << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
<< " / " << data.equipmentNumber.is_set() << ", typeId: " << data.typeId
<< " / " << data.equipmentNumber.has_value() << ", typeId: " << data.typeId
<< ", cnt: " << m_ppmDtc->types().size();
if (typeClass != ParticipantManagement::TypeClass::SupportEntity)
@@ -91,7 +91,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
else
{
// does not exists or has no longer an equipment number -> remove
if (!data.equipmentNumber.is_set())
if (!data.equipmentNumber.has_value())
modType = DataModification::eRemoved;
}
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
Participant_t() = default;
explicit Participant_t(const ParticipantManagement::Participant &data)
: id(data.id)
, equipmentNumber(data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0)
, equipmentNumber(data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0)
, name(QString::fromStdString(data.name))
{}
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
+4 -4
View File
@@ -107,7 +107,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectStart = data.effectStart.has_value() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = data.cannonCount * data.cannonRounds;
@@ -123,7 +123,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectStart = data.effectStart.has_value() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = data.impactCount; //cannonCount() * data.cannonRounds();
@@ -140,7 +140,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Eff
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectStart = data.effectStart.has_value() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = 0;
@@ -167,7 +167,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Min
res.effectStateId = static_cast<qint32>(data.effectStateId);
res.position = QPointF(segment.positionStart.lon, segment.positionStart.lat);
res.depth = data.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectStart = data.effectStart.has_value() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = 18;
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
m_data.id = data.id;
m_data.name = QString::fromStdString(data.name);
m_data.startTime = data.startTime.is_set() ? data.startTime.get() : 0;
m_data.startTime = data.startTime.has_value() ? data.startTime.get() : 0;
m_data.duration = data.duration;
m_data.idAreaEffectSimulation = data.idAreaEffectSimulation;
m_data.nameAreaEfffectSimulation = QString::fromStdString(data.nameAreaEffectSimulation);