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

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

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp

@@ -24,6 +24,7 @@ DemandSituation::DemandSituation(LtsSession::LtsSession *session, QWidget *paren
   , m_model(nullptr)
   , m_proxyModel(nullptr)
   , m_ui(new Ui::DemandSituation)
+  , m_logger(getLogger("DemandSituationDialog"))
 {
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("OC-Demand_Situation"));
@@ -128,7 +129,7 @@ void DemandSituation::onSendDemandSituationReply(const Core::FunctionReplyObject
     m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("Party"), m_ui->cbParty->currentData().toInt());
     const auto selIndexes = m_ui->dvParticipants->selectedRows();
     if (!selIndexes.isEmpty())
-      m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), m_model->getParticipantData(selIndexes.first()).id());
+      m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), m_model->getParticipantData(selIndexes.first()).id);
     else
       m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), 0);
 
@@ -153,12 +154,12 @@ void DemandSituation::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     ParticipantManagement::ParticipantData part = m_model->getParticipantData(selIndexes.first());
-    if (part.equipmentNumber().is_set())
+    if (part.equipmentNumber.has_value())
     {
       
       onClearCoordinate();
 
-      m_selectedEqNr = part.equipmentNumber().get();
+      m_selectedEqNr = part.equipmentNumber.get();
     }
     else
       m_selectedEqNr = 0;
@@ -233,15 +234,15 @@ bool DemandSituation::apply()
   bool stopDemand = false;
   if (m_ui->dtePos->coordinate().isNull() && m_selectedEqNr == 0)
   {
-    req.radius() = 0;
+    req.radius = 0;
     const Core::GeoPosition2D pos(std::nan(""),std::nan(""));
-    req.position() = pos;
+    req.position = pos;
     stopDemand = true;
   }
   else if (m_ui->dtePos->coordinate().x() > 0)
   {
     const Core::GeoPosition2D pos(m_ui->dtePos->coordinate().x(), m_ui->dtePos->coordinate().y() );
-    req.position().set(pos);
+    req.position.set(pos);
   }
 
 
@@ -268,7 +269,7 @@ void DemandSituation::repaintSitmapCircle()
   const auto selIndexes = m_ui->dvParticipants->selectedRows();
   if (!selIndexes.isEmpty())
   {
-    m_sitMapGuiIfc->ocSituationRange_create(m_model->getParticipantData(selIndexes.first()).id(), range);
+    m_sitMapGuiIfc->ocSituationRange_create(m_model->getParticipantData(selIndexes.first()).id, range);
   }
   else if (!m_ui->dtePos->coordinate().isNull())
   {

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp

@@ -107,9 +107,9 @@ bool DemandSituationFilter::apply()
     const double posLat = m_opSettings->value(ocDemandGroup, QStringLiteral("PosLat"), -1).toDouble();
     const ParticipantManagement::Participant participant = m_ppmDtc->participant(ppId);
     int equipNumber = 0;
-    if(participant.equipmentNumber().is_set())
+    if(participant.equipmentNumber.has_value())
     {
-      equipNumber= participant.equipmentNumber().get();
+      equipNumber= participant.equipmentNumber.get();
     }
 
     std::vector<int> partyList;
@@ -131,7 +131,7 @@ bool DemandSituationFilter::apply()
     if (posLon > 0)
     {
       const Core::GeoPosition2D pos(posLon, posLat );
-      req.position().set(pos);
+      req.position.set(pos);
     }
 
     ret =  m_requestHelper->startSingleRequest([req, this]()
@@ -156,12 +156,12 @@ void DemandSituationFilter::buildPartyTable(const QMap<int, ParticipantManagemen
 
   for (const ParticipantManagement::Party &party : parties)
   {
-    if(party.id() == 0)
+    if(party.id == 0)
       continue;
 
-    QCheckBox *cbParty = new QCheckBox(ParticipantManagement::trPartyName(party.name()), this);
-    cbParty->setObjectName(QStringLiteral("party_%1").arg(party.id()));
-    cbParty->setChecked(m_partyList.contains(QString::number(party.id())));
+    QCheckBox *cbParty = new QCheckBox(ParticipantManagement::trPartyName(party.name), this);
+    cbParty->setObjectName(QStringLiteral("party_%1").arg(party.id));
+    cbParty->setChecked(m_partyList.contains(QString::number(party.id)));
     connect(cbParty, &QCheckBox::stateChanged, this, &DemandSituationFilter::onPartyBoxChecked);
     m_ui->glParty->addWidget(cbParty);
     
@@ -176,9 +176,9 @@ void DemandSituationFilter::buildTypeClassTable(const std::set<ParticipantManage
 {
   for (const ParticipantManagement::TypeClass &typeClass : typeClassList)
   {
-    QCheckBox *cb  = new QCheckBox(ParticipantManagement::toString(typeClass.underlying()), this);
-    cb->setObjectName(QStringLiteral("typeClass_%1").arg(typeClass.underlying()));
-    cb->setChecked(m_typeClassList.contains(QString::number(typeClass.underlying())));
+    QCheckBox *cb  = new QCheckBox(ParticipantManagement::toString(typeClass), this);
+    cb->setObjectName(QStringLiteral("typeClass_%1").arg(static_cast<int>(typeClass)));
+    cb->setChecked(m_typeClassList.contains(QString::number(static_cast<int>(typeClass))));
     connect(cb, &QCheckBox::stateChanged, this, &DemandSituationFilter::onTypeClassCBoxChecked);
     m_ui->glTypeClass->addWidget(cb);
   }

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp

@@ -23,6 +23,7 @@ FolderContentEditDialog::FolderContentEditDialog(QWidget *parent)
   , m_session(nullptr)
   , m_obdFtc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("OscFolderContentEditDialog"))
 {
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("OSC-Edit_Folder_Content"));

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.cpp

@@ -25,6 +25,7 @@ EquipPlayer::EquipPlayer(LtsSession::LtsSession *session, QWidget *parent)
   , m_ppmDtc(nullptr)
   , m_ppmCbxGui(nullptr)
   , m_ui(new Ui::EquipPlayer)
+  , m_logger(getLogger("EquipPlayerDialog"))
 {
   m_ui->setupUi(this);
 
@@ -104,12 +105,12 @@ void EquipPlayer::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     part = m_model->getParticipantData(selIndexes.first());
-    ParticipantManagement::Type tp =  m_ppmDtc->type(part.typeId());
-    ParticipantManagement::EquipmentType eq=  m_ppmDtc->equipmentType(tp.equipmentTypeId());
-    m_ui->lblMinEq->setText(QString::number(eq.minEquipNo()));
-    m_ui->lblMaxEq->setText(QString::number(eq.maxEquipNo()));
+    ParticipantManagement::Type tp =  m_ppmDtc->type(part.typeId);
+    ParticipantManagement::EquipmentType eq=  m_ppmDtc->equipmentType(tp.equipmentTypeId);
+    m_ui->lblMinEq->setText(QString::number(eq.minEquipNo));
+    m_ui->lblMaxEq->setText(QString::number(eq.maxEquipNo));
 
-    tc = tp.typeClass();
+    tc = tp.typeClass;
 
     if ( (tc == ParticipantManagement::TypeClass::Human)
          || (tc == ParticipantManagement::TypeClass::GroundVehicle)
@@ -121,8 +122,8 @@ void EquipPlayer::onSlotSelectionChanged()
     else
       m_isValid = false;
 
-    if (part.id())
-      m_selectedParticipantId = part.id();
+    if (part.id)
+      m_selectedParticipantId = part.id;
     else
       m_selectedParticipantId = -1;
   }
@@ -134,8 +135,8 @@ void EquipPlayer::onSlotSelectionChanged()
 
   slotChangesMade();
 
-  if (m_selectedParticipantId > 0 && part.equipmentNumber().is_set())
-    m_ui->leParticipant->setText(QString::number(part.equipmentNumber().get()));
+  if (m_selectedParticipantId > 0 && part.equipmentNumber.has_value())
+    m_ui->leParticipant->setText(QString::number(part.equipmentNumber.get()));
   else
     m_ui->leParticipant->setText(QString::number(0));
 
@@ -162,8 +163,8 @@ bool EquipPlayer::apply()
   if (m_ui->leParticipant->text().toInt() < 0)
     return false;
   SendEquipmentRegistrationRequest req;
-  req.equipmentNumber(m_ui->leParticipant->text().toInt());
-  req.participantId(m_selectedParticipantId);
+  req.equipmentNumber = m_ui->leParticipant->text().toInt();
+  req.participantId = m_selectedParticipantId;
 
   bool ret = m_requestHelper->startSingleRequest([req, this]()
   {
@@ -172,21 +173,21 @@ bool EquipPlayer::apply()
 
   
   {
-    if (m_ppmDtc->participant(m_selectedParticipantId).equipmentNumber().is_set())
+    if (m_ppmDtc->participant(m_selectedParticipantId).equipmentNumber.has_value())
     {
       ParticipantManagement::RegisterParticipantRequest req3;
-      req3.participantId(m_selectedParticipantId);
-      req3.equipmentNumber(0);
-      req3.assignState(ParticipantManagement::ParticipantAssignState::NotAssigned);
+      req3.participantId = m_selectedParticipantId;
+      req3.equipmentNumber = 0;
+      req3.assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
       m_requestHelper->startSingleRequest([req3, this]()
       {
         return m_ppmFtc->registerParticipantRequest(req3, this);
       });
     }
     ParticipantManagement::RegisterParticipantRequest req2;
-    req2.participantId(m_selectedParticipantId);
-    req2.equipmentNumber(req.equipmentNumber());
-    req2.assignState(ParticipantManagement::ParticipantAssignState::HandoutExcon);
+    req2.participantId = m_selectedParticipantId;
+    req2.equipmentNumber = req.equipmentNumber;
+    req2.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
     m_requestHelper->startSingleRequest([req2, this]()
     {
       return m_ppmFtc->registerParticipantRequest(req2, this);
@@ -220,9 +221,9 @@ bool EquipPlayer::checkEqNr()
 
   for (const auto &part : data)
   {
-    if (!part.equipmentNumber().is_set())
+    if (!part.equipmentNumber.has_value())
       continue;
-    if (part.equipmentNumber().is_set() && part.equipmentNumber().get() == equipNr)
+    if (part.equipmentNumber.has_value() && part.equipmentNumber.get() == equipNr)
     {
       m_ui->lblError->setText(tr("Equipment Number already exists!"));
       return false;;

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.cpp

@@ -22,6 +22,7 @@ FaultMessage::FaultMessage(LtsSession::LtsSession *session, QWidget *parent)
   , m_tabocDtc(nullptr)
   , m_ppmCbxGui(nullptr)
   , m_ui(new Ui::FaultMessage)
+  , m_logger(getLogger("FaultMessageDialog"))
 {
   m_ui->setupUi(this);
   m_ui->lblCountMax->setText(QString::number(m_maxChars));
@@ -100,8 +101,8 @@ void FaultMessage::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     ParticipantManagement::ParticipantData part = m_model->getParticipantData(selIndexes.first());
-    if (part.equipmentNumber().is_set())
-      m_selectedEqNr = part.equipmentNumber().get();
+    if (part.equipmentNumber.has_value())
+      m_selectedEqNr = part.equipmentNumber.get();
     else
       m_selectedEqNr = -1;
   }
@@ -185,10 +186,10 @@ bool FaultMessage::apply()
   if (m_ui->leParticipant->text().toInt() <= 0)
     return false;
   SendEquipmentErrorRegistrationRequest req;
-  req.device(m_ui->leDevice->text().toStdString());
-  req.faultEquipmentNumber(m_ui->leParticipant->text().toStdString());
-  req.text(m_ui->teComment->toPlainText().toStdString());
-  req.ocEquipmentNumber(m_ownEquipmentId);
+  req.device = m_ui->leDevice->text().toStdString();
+  req.faultEquipmentNumber = m_ui->leParticipant->text().toStdString();
+  req.text = m_ui->teComment->toPlainText().toStdString();
+  req.ocEquipmentNumber = m_ownEquipmentId;
 
   return m_requestHelper->startSingleRequest([req, this]()
   {
@@ -201,9 +202,9 @@ void FaultMessage::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specifi
   if (DataModification::eRemoved == modType)
     return;
 
-  m_ownEquipmentId = data.equipmentNumber();
+  m_ownEquipmentId = data.equipmentNumber;
   if (m_ownEquipmentId <= 0)
-    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
+    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber << " is not present ";
 
 }
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp

@@ -246,9 +246,9 @@ void InterfaceImpl::onTimerTick()
                                  partyIds,
                                  typesClass);
 
-  if (pos.lat() > 0)
+  if (pos.lat > 0)
   {
-    req.position().set(pos);
+    req.position.set(pos);
   }
 
   m_requestHelper->startSingleRequest([req, this]()
@@ -268,7 +268,7 @@ void InterfaceImpl::onNoDataTimerTick()
 
 void InterfaceImpl::onParticipantDynamic(const ParticipantManagement::DynamicParticipantData &data)
 {
-  if (m_dtcPpm->participant(data.participantId()).equipmentNumber() == m_dtcTab->specificsEquipment(1).equipmentNumber())
+  if (m_dtcPpm->participant(data.participantId).equipmentNumber == m_dtcTab->specificsEquipment(1).equipmentNumber)
     return;
   onParticipantData();
 }
@@ -276,7 +276,7 @@ void InterfaceImpl::onParticipantDynamic(const ParticipantManagement::DynamicPar
 
 void InterfaceImpl::onParticipantPosition(const ParticipantManagement::ParticipantPosition &data)
 {
-  if (m_dtcPpm->participant(data.participantId()).equipmentNumber() == m_dtcTab->specificsEquipment(1).equipmentNumber())
+  if (m_dtcPpm->participant(data.participantId).equipmentNumber == m_dtcTab->specificsEquipment(1).equipmentNumber)
     return;
   onParticipantData();
 }
@@ -285,7 +285,7 @@ void InterfaceImpl::onCentralAesOverloadChanged(const TrainingAreaBaseOC::Centra
 {
   Q_UNUSED(modType)
 
-  m_hasCentralAesOverload = data.hasOverload();
+  m_hasCentralAesOverload = data.hasOverload;
 
   setShortcutDemandSituationIconData();
 
@@ -296,7 +296,7 @@ void InterfaceImpl::onParticipantsOverloadChanged(const TrainingAreaBaseOC::Part
 {
   Q_UNUSED(modType)
 
-  m_hasParticipantOverload = data.hasOverload();
+  m_hasParticipantOverload = data.hasOverload;
 
   setShortcutDemandSituationIconData();