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 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495

No files matched your search

@@ -38,6 +38,7 @@ ParticipantTemplateChooser::ParticipantTemplateChooser(const QString &menuGroup,
, m_session(session)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::ParticipantTemplateChooser)
, m_logger(getLogger("ParticipantTemplateChooser"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -125,7 +126,7 @@ void ParticipantTemplateChooser::onAddTemplate()
QObject::connect(namer, &TemplateUnitNamer::newUnitTemplateRoot, this, [this](const ParticipantManagement::TemplateData &tempData)
{
ModifyTemplateDataRequest req;
req.data({tempData});
req.data = {tempData};
m_requestHelper->addRequest([this,req]()
{
@@ -145,13 +146,13 @@ void ParticipantTemplateChooser::onEditTemplate()
return;
TemplateParticipant data = m_model->getRowData(m_ui->widget->currentIndex().row());
ParticipantTemplateEdit *edit = new ParticipantTemplateEdit(m_session, data.templateId(), m_asSupportService, this);
ParticipantTemplateEdit *edit = new ParticipantTemplateEdit(m_session, data.templateId, m_asSupportService, this);
if (!edit->init(m_dtc, m_ftc, m_ppmGuiCbxIfc, m_asbIfc))
{
delete edit;
return;
}
addDialog(edit, m_menuGroup, QLatin1String("editTemplate") + QString::number(data.templateId()), LtsWidgets::LayoutArea::eDialogTab);
addDialog(edit, m_menuGroup, QLatin1String("editTemplate") + QString::number(data.templateId), LtsWidgets::LayoutArea::eDialogTab);
}
void ParticipantTemplateChooser::onEditTemplateOrgChart()
@@ -192,7 +193,7 @@ void ParticipantTemplateChooser::onEditTemplateOrgChart()
return;
}
m_ppmGuiOrgChartIfc->loadTemplate(data.templateId(), m_asSupportService);
m_ppmGuiOrgChartIfc->loadTemplate(data.templateId, m_asSupportService);
});
@@ -206,10 +207,10 @@ void ParticipantTemplateChooser::onRemoveTemplate()
const TemplateParticipant tmplParticipant = m_model->getRowData(idx.row());
auto tmplData = m_dtc->convertFromParticipantTemplateToTemplateData(tmplParticipant);
tmplData.isDeleted(true);
tmplData.isDeleted = true;
ModifyTemplateDataRequest req;
req.data({tmplData});
req.data = {tmplData};
m_requestHelper->startSingleRequest([this, req]()
{
@@ -16,6 +16,7 @@ ParticipantTemplateChooserFrameless::ParticipantTemplateChooserFrameless(LtsSess
, m_dtc(nullptr)
, m_session(session)
, m_ui(new Ui::ParticipantTemplateChooserFrameless)
, m_logger(getLogger("ParticipantTemplateChooser"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -53,7 +54,7 @@ void ParticipantTemplateChooserFrameless::onAddTemplate()
if (!idx.isValid())
return;
TemplateParticipant data = m_model->getRowData(m_ui->widget->currentIndex().row());
emit selectedTemplate(data.templateId());
emit selectedTemplate(data.templateId);
close();
}
@@ -22,6 +22,7 @@ ParticipantTemplateChooserModel::ParticipantTemplateChooserModel(bool asSupportS
, AdvancedSymbology::TableModelSymbolRenderer<ParticipantTemplateChooserModel>(ColDesignatorIdentifier)
, m_asSupportService(asSupportService)
, m_dtc(nullptr)
, m_logger(getLogger("ParticipantTemplateChooserModel"))
{}
ParticipantTemplateChooserModel::~ParticipantTemplateChooserModel()
@@ -47,7 +48,7 @@ bool ParticipantTemplateChooserModel::initModel(LtsSession::LtsSessionDataDds *s
auto cb = [this](const ParticipantManagement::TemplateParticipant &templateData)
{
if (insertRow(templateData))
tryRenderSymbol(QString::fromStdString(templateData.symbol()), templateData.templateId());
tryRenderSymbol(QString::fromStdString(templateData.symbol), templateData.templateId);
};
m_dtc->templateParticipants(cb);
@@ -63,21 +64,21 @@ QVariant ParticipantTemplateChooserModel::data(const QModelIndex &index, int rol
const ParticipantManagement::TemplateParticipant &templateData = m_vecData.at(index.row());
if (role == Qt::DecorationRole)
return decorationData(index, templateData.templateId());
return decorationData(index, templateData.templateId);
switch (index.column())
{
case ColDesignatorIdentifier:
{
if (templateData.designator().size() == 0)
return QString::fromStdString(templateData.tacticalIdentifier());
return QString(QString::fromStdString(templateData.designator()) + QLatin1Char('/') +
QString::fromStdString(templateData.tacticalIdentifier()));
if (templateData.designator.size() == 0)
return QString::fromStdString(templateData.tacticalIdentifier);
return QString(QString::fromStdString(templateData.designator) + QLatin1Char('/') +
QString::fromStdString(templateData.tacticalIdentifier));
}
case ColTypeClass:
return ParticipantManagement::toString(m_dtc->type(templateData.typeId()).typeClass());
return ParticipantManagement::toString(m_dtc->type(templateData.typeId).typeClass);
case ColType:
return ParticipantManagement::trTypeName(m_dtc->type(templateData.typeId()).name());
return ParticipantManagement::trTypeName(m_dtc->type(templateData.typeId).name);
}
return QVariant();
}
@@ -98,7 +99,7 @@ QMimeData *ParticipantTemplateChooserModel::mimeData(const QModelIndexList &inde
{
if (index.isValid())
{
QByteArray encodedData = QByteArray::number(getRowData(index.row()).templateId());
QByteArray encodedData = QByteArray::number(getRowData(index.row()).templateId);
mimeData->setData(ParticipantManagement::ParticipantTemplateRoot, encodedData);
return mimeData;
}
@@ -118,7 +119,7 @@ void ParticipantTemplateChooserModel::onTemplateChanged(const ParticipantManagem
DataModification modType)
{
if (onDataChanged(data, modType) && modType != DataModification::eRemoved)
tryRenderSymbol(QString::fromStdString(data.symbol()), data.templateId());
tryRenderSymbol(QString::fromStdString(data.symbol), data.templateId);
}
@@ -126,9 +127,9 @@ bool ParticipantTemplateChooserModel::isFiltered(const TemplateParticipant &data
{
Q_UNUSED(modType);
if (data.superiorTemplateId() != 0)
if (data.superiorTemplateId != 0)
return true;
const TypeClass &tc = m_dtc->type(data.typeId()).typeClass();
const TypeClass &tc = m_dtc->type(data.typeId).typeClass;
if (m_asSupportService)
return (tc != TypeClass::SupportEntity && tc != TypeClass::SupportUnit);
@@ -4,6 +4,7 @@
#pragma once
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -50,7 +51,7 @@ protected:
NGL::INGLLogger &m_logger;
int getId(const TemplateParticipant &data) const override
{
return data.templateId();
return data.templateId;
}
private slots:
@@ -36,6 +36,7 @@ ParticipantTemplateEdit::ParticipantTemplateEdit(LtsSession::LtsSession *session
, m_ppmGuiCbxIfc(nullptr)
, m_session(session)
, m_ui(new Ui::ParticipantTemplateEdit)
, m_logger(getLogger("ParticipantTemplateEdit"))
{
m_ui->setupUi(this);
@@ -164,14 +165,14 @@ bool ParticipantTemplateEdit::isContainer(const QModelIndex &index)
Q_UNUSED(index);
if (!selectedIndexView().isValid())
return false;
int typeId = m_model->privateData(selectedIndexView())->data().value<ParticipantManagement::TemplateData>().typeId();
int typeId = m_model->privateData(selectedIndexView())->data().value<ParticipantManagement::TemplateData>().typeId;
if (typeId <= 0)
return false;
if (m_asSupportService)
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::SupportUnit;
else
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::Unit;
}
@@ -216,7 +217,7 @@ void ParticipantTemplateEdit::removeCurrentRow()
NGLTreeItem *item = m_model->privateData(selIndex);
ParticipantManagement::TemplateData tmpl = item->data().value<ParticipantManagement::TemplateData>();
const bool isRootTemplate = (tmpl.templateId() == m_rootId);
const bool isRootTemplate = (tmpl.templateId == m_rootId);
if (!selIndex.isValid() || isRootTemplate)
return;
@@ -238,8 +239,8 @@ void ParticipantTemplateEdit::onAddItem()
if (selIndex.isValid())
{
ParticipantManagement::TemplateData dataAll = m_model->privateData(selIndex)->data().value<ParticipantManagement::TemplateData>();
data.designator(dataAll.designator());
data.tacticalIdentifier(dataAll.tacticalIdentifier());
data.designator = dataAll.designator;
data.tacticalIdentifier = dataAll.tacticalIdentifier;
}
if (!newItemDlg->init(selIndex, m_dtc, m_ppmGuiCbxIfc, m_asbIfc, data, addItem))
@@ -257,7 +258,7 @@ void ParticipantTemplateEdit::onAddItem()
if (m_firingUnitValidator)
{
newItemDlg->setIsAdler(m_firingUnitValidator->isAdler(m_model, selIndex));
const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, selIndex);
const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, selIndex));
newItemDlg->setFiringUnitRestrictions(m_model, false, m_firingUnitValidator->getRestrictions(m_model, selIndex), m_firingUnitValidator, unitGearClassType);
@@ -298,7 +299,7 @@ void ParticipantTemplateEdit::onEditItem()
if (m_firingUnitValidator)
{
const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, selIndex);
const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, selIndex));
newItemDlg->setFiringUnitRestrictions(m_model, true, m_firingUnitValidator->getRestrictions(m_model, selIndex), m_firingUnitValidator, unitGearClassType);
}
newItemDlg->show();
@@ -317,8 +318,8 @@ void ParticipantTemplateEdit::onPrint()
bool ParticipantTemplateEdit::apply()
{
ModifyTemplateDataRequest req;
req.data(m_model->templateData());
if (req.data().size() == 0)
req.data = m_model->templateData();
if (req.data.size() == 0)
return true;
m_bNeedCommitModifedData = true;
@@ -359,8 +360,8 @@ void ParticipantTemplateEdit::onSaveAsNewTemplate()
return;
ModifyTemplateDataRequest req;
req.data(m_model->templateDataAsCopy(selIndex));
if (req.data().size() == 0)
req.data = m_model->templateDataAsCopy(selIndex);
if (req.data.size() == 0)
return;
m_bNeedCommitModifedData = false;
@@ -373,12 +374,12 @@ void ParticipantTemplateEdit::onSaveAsNewTemplate()
void ParticipantTemplateEdit::onAddItemToModel(const QModelIndex &parent, const TemplateData &templateData)
{
bool ret = m_model->onInsertRow(parent, templateData);
int typeId = m_model->privateData(parent)->data().value<ParticipantManagement::TemplateData>().typeId();
int typeId = m_model->privateData(parent)->data().value<ParticipantManagement::TemplateData>().typeId;
if (!ret && typeId <= 0)
return;
Type type = m_dtc->type(typeId);
if (type.typeClass() == TypeClass::Unit ||
type.typeClass() == TypeClass::SupportUnit)
if (type.typeClass == TypeClass::Unit ||
type.typeClass == TypeClass::SupportUnit)
{
m_ui->treeViewEdit->setExpanded(m_ui->treeViewEdit->selectionModel()->selectedIndexes().at(0), true);
}
@@ -19,6 +19,7 @@ TemplateUnitNamer::TemplateUnitNamer(bool asSupportService, const std::shared_pt
, m_ppmGuiCbxIfc(ppmGuiCbxIfc)
, m_ui(new Ui::TemplateUnitNamer)
, m_validator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[^,;\"'´`]*")), this))
, m_logger(getLogger("TemplateTemplateChooser"))
{
m_ui->setupUi(this);
if (!m_ppmGuiCbxIfc || !m_dtc)
@@ -62,12 +63,12 @@ TemplateUnitNamer::~TemplateUnitNamer()
void ParticipantManagement::TemplateUnitNamer::onSetUnitName()
{
ParticipantManagement::TemplateData templateData;
templateData.modId(1);
templateData.hierarchyNumber(1);
templateData.designator(m_ui->leDesignator->text().toStdString());
templateData.tacticalIdentifier(m_ui->leTactIdentifier->text().toStdString());
templateData.typeId(m_ui->cbxType->currentData().toInt());
templateData.symbol(m_dtc->type(templateData.typeId()).symbol());
templateData.modId = 1;
templateData.hierarchyNumber = 1;
templateData.designator = m_ui->leDesignator->text().toStdString();
templateData.tacticalIdentifier = m_ui->leTactIdentifier->text().toStdString();
templateData.typeId = m_ui->cbxType->currentData().toInt();
templateData.symbol = m_dtc->type(templateData.typeId).symbol;
emit newUnitTemplateRoot(templateData);
close();
@@ -5,6 +5,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <LtsWidgets/lts_frameless_dialog.h>