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
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

No files matched your search

@@ -30,6 +30,7 @@ PairingEditDialog::PairingEditDialog(LtsSession::LtsSession *session, QWidget *p
, m_ppmGuiCbxIfc(nullptr)
, m_participantModel(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("GuezIedManangementPairingEditDialog"))
{
m_ui->setupUi(this);
m_uiRequirements->addRequirement({m_ui->lblPairingState, [this]() { return applyPairingStateCheck(); }});
@@ -102,13 +103,13 @@ void PairingEditDialog::onIedSelected(int idx)
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
setUnchangeable(true);
m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(ied.pairingState().underlying())));
m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(static_cast<int>(ied.pairingState))));
m_ui->treeViewParticipants->clearSelection();
if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
if (ied.pairingState == IedPairingState::PairedToParticipant)
{
m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId().get()).partyId()));
m_participantModel->selectItemByParticipantId(ied.pairedParticipantId().get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId.get()).partyId));
m_participantModel->selectItemByParticipantId(ied.pairedParticipantId.get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
}
setUnchangeable(false);
enDisableUiElements();
@@ -135,10 +136,10 @@ void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
if (checkSelectedParticipantType())
{
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
if (ied.pairingState() == IedPairingState::PairedToParticipant)
if (ied.pairingState == IedPairingState::PairedToParticipant)
{
if (m_participantModel->getParticipantData(idx).id() != ied.pairedParticipantId().get())
if (m_participantModel->getParticipantData(idx).id != ied.pairedParticipantId.get())
slotChangesMade();
}
else
@@ -159,10 +160,10 @@ bool PairingEditDialog::apply()
{
PairIedRequest request;
request.id(m_ui->cbxIed->currentData().toInt());
request.pairingState(static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()));
if (request.pairingState().underlying() == IedPairingState::PairedToParticipant)
request.pairedParticipantId(dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id()));
request.id = m_ui->cbxIed->currentData().toInt();
request.pairingState = static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt());
if (request.pairingState == IedPairingState::PairedToParticipant)
request.pairedParticipantId = dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id);
return m_requestHelper->startSingleRequest([=]()
{
@@ -177,7 +178,7 @@ bool PairingEditDialog::applyPairingStateCheck()
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
if (ied.pairingState() == IedPairingState::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying())
if (ied.pairingState == IedPairingState::NotPaired && static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == ied.pairingState)
return false;
return true;
@@ -186,15 +187,15 @@ bool PairingEditDialog::applyPairingStateCheck()
bool PairingEditDialog::applyParticipantSelectionCheck()
{
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::PairedToParticipant)
if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::PairedToParticipant)
{
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
if (ied.pairingState == IedPairingState::PairedToParticipant)
{
if (checkSelectedParticipantType())
{
if (ied.pairedParticipantId() == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id())
if (ied.pairedParticipantId == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id)
return false;
return true;
@@ -208,9 +209,9 @@ bool PairingEditDialog::applyParticipantSelectionCheck()
bool PairingEditDialog::checkSelectedParticipantType()
{
ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId());
return ((type.typeClass().underlying() != ParticipantManagement::TypeClass::SupportUnit) &&
(type.typeClass().underlying() != ParticipantManagement::TypeClass::Unit));
ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId);
return ((type.typeClass != ParticipantManagement::TypeClass::SupportUnit) &&
(type.typeClass != ParticipantManagement::TypeClass::Unit));
}
void PairingEditDialog::fillIedCbx()
@@ -220,7 +221,7 @@ void PairingEditDialog::fillIedCbx()
m_ui->cbxIed->clear();
const QMap <qint32, GuezIedManagement::Ied> mapIed = m_dtc->ieds();
for (auto it = mapIed.begin(); it != mapIed.end(); ++it)
m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber()), QVariant(it.value().id()));
m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber), QVariant(it.value().id));
if (curIdxIed >= 0)
m_ui->cbxIed->setCurrentIndex(curIdxIed);
@@ -231,8 +232,8 @@ void PairingEditDialog::fillIedCbx()
void PairingEditDialog::fillPairingState()
{
m_ui->cbxPairingState->clear();
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired).underlying()), IedPairingState::NotPaired);
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant).underlying()), IedPairingState::PairedToParticipant);
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired)), static_cast<int>(IedPairingState::NotPaired));
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant)), static_cast<int>(IedPairingState::PairedToParticipant));
}
void PairingEditDialog::fillPartyCbx()
@@ -254,7 +255,7 @@ void PairingEditDialog::enDisableUiElements()
m_ui->cbxIed->setEnabled(m_ui->cbxIed->count() > 1);
m_ui->cbxPairingState->setEnabled(m_ui->cbxIed->count() > 0 && m_participantModel->rowCount() > 0);
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::NotPaired)
if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::NotPaired)
{
m_ui->cbxParty->setEnabled(false);
m_ui->treeViewParticipants->setEnabled(false);
@@ -7,6 +7,7 @@
#include <GuezIedManagement/gim_ftc.h>
#include <GuezIedManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_dialog.h>