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/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
+5 -5
View File
@@ -40,10 +40,10 @@ AttributeValueMap AvmChargeType::getAttributeValueMap(int eventType) const
case EventType::Hit:
case EventType::WeaponAssignment:
case EventType::FireEvent:
charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
break;
case EventType::HitBuilding:
charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
Q_FALLTHROUGH();
case EventType::HitEffectSimulation:
charges += m_dtc->chargesForGearClass(GearClass::Artillery);
@@ -107,7 +107,7 @@ AttributeValueMap AvmGearType::getAttributeValueMap(int eventType) const
AttributeValueMap ret;
for (const auto &data : gearTypes)
{
if (data.gearClassId() == GearClass::DuelSim &&
if (data.gearClassId() == GearClass::GearClass_DuelSim &&
data.tasCode() != 0)
ret.insert(data.id(), m_dtc->trGearTypeName(data.id()));
}
@@ -163,7 +163,7 @@ AttributeValueMap AvmEquipmentNumber::getAttributeValueMap(int eventType) const
AttributeValueMap ret;
auto cb = [&ret](const ParticipantManagement::Participant & p) -> void
{
if (!p.equipmentNumber().is_set())
if (!p.equipmentNumber().has_value())
return;
const auto equipNo = p.equipmentNumber().get();
ret.insert(equipNo, QString::number(equipNo));
@@ -177,7 +177,7 @@ QString AvmEquipmentNumber::getValueStringFromValueId(int attributeValueId) cons
if (!m_dtc)
return {};
auto ret = m_dtc->participant(attributeValueId).equipmentNumber();
return ret.is_set() ? QString::number(ret.get()) : QString();
return ret.has_value() ? QString::number(ret.get()) : QString();
}
//
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
+28 -28
View File
@@ -89,7 +89,7 @@ void DetailData::addEventType(int eventTypeId, const QString &eventTypeString) /
void DetailData::addEventType(const ProjectDataManagement::EventType &eventType) // with default attribute types [time, etc.]
{
addEventType(eventType.underlying(), ProjectDataManagement::toString(eventType));
addEventType(eventType, ProjectDataManagement::toString(eventType));
}
@@ -122,7 +122,7 @@ void DetailData::populate() // call on any retranslate
const auto possibleEventTypes = TimelineLegendDialog::possibleEvents();
for (const auto eventType : possibleEventTypes)
{
switch (eventType.underlying())
switch (eventType)
{
case EventType::Hit:
attributeEventLookup.addAttributesToEvent(eventType, {QStringLiteral("VulnerabilityState"),
@@ -292,19 +292,19 @@ void DetailData::populate() // call on any retranslate
// Vulnerability State:
addAttributeType(QStringLiteral("VulnerabilityState"), tr("Vulnerability State:"));
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::CombatReady);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::LightDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::MediumDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::HeavyDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::MobilityKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::CatastrophicKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::TemporarySeverance);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::NearMiss);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::HitWithNoEffect);
//addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::NotReady);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss);
addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect);
//addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady);
// Marker Types:
@@ -407,21 +407,21 @@ void DetailData::populate() // call on any retranslate
// Originator Types:
addAttributeType(QStringLiteral("OriginatorType"), tr("Originator Type:"));
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Unknown);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Participant);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ObserverController);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ExerciseControl);
//addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice);
//addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::MaintainanceDevice);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::FunctionalArea);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Initialization);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::DusMine);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
//addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice);
//addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine);
const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
QStringLiteral("HasPvSan"));
if (showPvSan)
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Sanitation);
addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation);
// (ISM) Structure Elements:
@@ -716,7 +716,7 @@ void DetailData::AttributeEventLookup::addAttributesToEvent(const int eventType,
void DetailData::AttributeEventLookup::addAttributesToEvent(const ProjectDataManagement::EventType &eventType, const AttributeList &attributeTypeList)
{
addAttributesToEvent(eventType.underlying(), attributeTypeList);
addAttributesToEvent(eventType, attributeTypeList);
}
bool DetailData::AttributeEventLookup::isAttributeInEvent(const int eventType, const QString &attributeType)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
+6 -6
View File
@@ -195,7 +195,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
// don't add if event type not in list of active event types
int eventType = static_cast<int>(event.eventTypeId().underlying());
int eventType = static_cast<int>(event.eventTypeId());
if (!m_activeEventTypeIds.contains(eventType))
{
DEBUG_LOG(m_logger) << "live event not added - event type ("<<eventType<<") inactive";
@@ -927,7 +927,7 @@ void DDSTimelineModel::setColorPaintFun(LtsTimelineClassic::Event::EventPaintFun
{
paintFunc = nullptr;
color = QColor();
switch (eventType.underlying())
switch (eventType)
{
case ProjectDataManagement::EventType::BiteMessage:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
@@ -1078,7 +1078,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
for (const MarkerManagement::MarkerDescription &md : data.descriptions())
{
switch (md.markerType().underlying())
switch (md.markerType())
{
case MarkerManagement::MarkerType::Situation:
{
@@ -1097,7 +1097,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
}
default:
{
WARNING_LOG(m_logger) << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
WARNING_LOG(m_logger) << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType();
break;
}
}
@@ -1252,7 +1252,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
QStringList path;
path.append(partyStr);
switch (data.eventTypeId().underlying())
switch (data.eventTypeId())
{
case ProjectDataManagement::EventType::HitBuilding: // 5 - Hit Building
path = getPathForBuildingEvents(tr("Buildings"), root);
@@ -1310,7 +1310,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
const LtsUtils::QPoint3D pos(data.position().lon(),
data.position().lat(),
data.position().z());
LtsTimelineClassic::Event *event = new LtsTimelineClassic::Event(data.id(), data.eventTypeId().underlying(), data.sampleTime(), endTime,
LtsTimelineClassic::Event *event = new LtsTimelineClassic::Event(data.id(), data.eventTypeId(), data.sampleTime(), endTime,
data.participantId(), data.partyId(), data.equipmentNumber(), path, paintFunc, color,
root, -1,
pos,
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
+4 -4
View File
@@ -188,7 +188,7 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
// helper for grouped sorting
static int categoryFromEventType(ProjectDataManagement::EventType et)
{
switch (et.underlying())
switch (et)
{
case ProjectDataManagement::EventType::Unknown:
return 0;
@@ -259,7 +259,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
helperCont.reserve(events.size());
for (const ProjectDataManagement::EventType eventType : events)
{
model->setColorPaintFun(paintFunc, c, eventType.underlying());
model->setColorPaintFun(paintFunc, c, eventType);
if (paintFunc == nullptr)
{
@@ -280,7 +280,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
wsh.et = eventType;
wsh.cbx = new QCheckBox(ProjectDataManagement::toString(eventType), this);
wsh.cbx->setObjectName(checkBoxName(eventType));
wsh.cbx->setChecked(activeEventTypeIds.contains(eventType.underlying()));
wsh.cbx->setChecked(activeEventTypeIds.contains(eventType));
wsh.cbx->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
helperCont.push_back(wsh);
@@ -316,7 +316,7 @@ bool TimelineLegendDialog::apply()
for (const ProjectDataManagement::EventType eventType : events)
{
if (checkBox(eventType)->isChecked())
activeEventTypeIds.insert(eventType.underlying());
activeEventTypeIds.insert(eventType);
}
emit signalEventTypesChanged(activeEventTypeIds);
return false; // because this has to happen async.. (reset changes after async ops are (successfully) done)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h
+2 -2
View File
@@ -45,9 +45,9 @@ private:
void retranslate() override;
static QString checkBoxName(int eventTypeId) { return QStringLiteral("CheckBoxEvent%1").arg(eventTypeId); }
static QString checkBoxName(ProjectDataManagement::EventType eventType) { return checkBoxName(eventType.underlying()); }
static QString checkBoxName(ProjectDataManagement::EventType eventType) { return checkBoxName(eventType); }
QCheckBox *checkBox(int eventTypeId) { return findChild<QCheckBox *>(checkBoxName(eventTypeId)); }
QCheckBox *checkBox(ProjectDataManagement::EventType eventType) { return checkBox(eventType.underlying()); }
QCheckBox *checkBox(ProjectDataManagement::EventType eventType) { return checkBox(eventType); }
private:
Ui::TimelineLegendDialog *m_ui;