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

@@ -2,6 +2,7 @@
#include "evl_comments.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_evl_comments.h"
#include "evl_comment_model.h"
@@ -19,6 +20,7 @@ EvlCommentsView::EvlCommentsView(const std::shared_ptr<Interface::Dtc> &evlDtc,
m_ui(new Ui::EvlCommentsDialog),
m_evlDtc(evlDtc),
m_opmDtc(opmDtc)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -115,28 +117,28 @@ bool EvlCommentsView::insertComment(const Evaluations::EvaluationComment &c)
{
QString strSenderOperatorName, strReceiverOperatorName;
OperatorManagement::User sender = m_opmDtc->user(c.senderOperatorId());
strSenderOperatorName = QString::fromStdString(sender.name());
OperatorManagement::User sender = m_opmDtc->user(c.senderOperatorId);
strSenderOperatorName = QString::fromStdString(sender.name);
if (c.receiverOperatorId().is_set())
if (c.receiverOperatorId.has_value())
{
OperatorManagement::User loggedInOperator = m_opmDtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
if (c.receiverOperatorId().get() != loggedInOperator.id())
if (c.receiverOperatorId.get() != loggedInOperator.id)
return false;
OperatorManagement::User receiver = m_opmDtc->user(c.receiverOperatorId().get());
strReceiverOperatorName = QString::fromStdString(receiver.name());
OperatorManagement::User receiver = m_opmDtc->user(c.receiverOperatorId.get());
strReceiverOperatorName = QString::fromStdString(receiver.name);
}
CommentTuple t;
t.m_commentId = c.id();
t.m_timestamp = QDateTime::fromMSecsSinceEpoch(c.ts());
t.m_commentId = c.id;
t.m_timestamp = QDateTime::fromMSecsSinceEpoch(c.ts);
t.m_sender = strSenderOperatorName;
t.m_receiver = strReceiverOperatorName;
t.m_text = QString::fromStdString(c.text());
t.m_hierarchy = QString::fromStdString(c.hierarchy());
t.m_text = QString::fromStdString(c.text);
t.m_hierarchy = QString::fromStdString(c.hierarchy);
return m_model->insertRow(t);
}
@@ -1,6 +1,7 @@
#include "evl_edit_schema.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "evl_new_comment_dialog.h"
#include "ui_evl_edit_schema.h"
@@ -62,6 +63,7 @@ EditSchemaDialog::EditSchemaDialog(bool ocMode, bool runningOnTablet, LtsSession
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ocMode(ocMode),
m_runningOnTablet(runningOnTablet), m_session(session), m_requestHelper(new LtsUtils::RequestHelper(this)),
m_ui(new Ui::EditSchemaDialog)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -202,9 +204,9 @@ void EditSchemaDialog::loadLatestSchema()
{
--itE;
if ((*itE).sendToTa())
if ((*itE).sendToTa)
{
loadSchema((*itE).id());
loadSchema((*itE).id);
break;
}
}
@@ -213,22 +215,22 @@ void EditSchemaDialog::loadLatestSchema()
for (const Evaluations::EvaluationComment& c : mapComments)
{
if (c.schemaId() != m_loadedSchemaId)
if (c.schemaId != m_loadedSchemaId)
continue;
if (c.senderOperatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
if (c.senderOperatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
continue;
ItemComment comment(QString::fromStdString(c.text()), c.senderOperatorId(),
c.receiverOperatorId().is_set() ? c.receiverOperatorId().get() : 0, c.elementId(),
QDateTime::fromMSecsSinceEpoch(c.ts()));
ItemComment comment(QString::fromStdString(c.text), c.senderOperatorId,
c.receiverOperatorId.has_value() ? c.receiverOperatorId.get() : 0, c.elementId,
QDateTime::fromMSecsSinceEpoch(c.ts));
m_pModel->insertComment(comment);
}
updateCommentLabel();
}
else
loadSchema(m_mapSchemata.last().id());
loadSchema(m_mapSchemata.last().id);
}
void EditSchemaDialog::handleUnsentComments()
@@ -268,25 +270,25 @@ void EditSchemaDialog::onRequestSchema()
void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema& data, DataModification modType)
{
if (m_ocMode && !data.sendToTa())
if (m_ocMode && !data.sendToTa)
return;
QJsonParseError jError;
const QJsonDocument doc(QJsonDocument::fromJson(data.schemadata().c_str(), &jError));
const QJsonDocument doc(QJsonDocument::fromJson(data.schemadata.c_str(), &jError));
if (jError.error != QJsonParseError::NoError)
{
WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id;
return;
}
if (m_loadedSchemaId == data.id())
if (m_loadedSchemaId == data.id)
return;
if (doc == m_pModel->toJsonDocument())
{
m_loadedSchemaId = data.id();
m_loadedSchemaId = data.id;
retranslate();
return;
}
@@ -301,7 +303,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema&
{
handleUnsentComments();
m_loadedSchemaId = data.id();
m_loadedSchemaId = data.id;
m_pModel->fromQJsonDocument(doc);
expandNodeChildren(m_ui->m_treeViewSchema, QModelIndex(), true);
updateCommentLabel();
@@ -314,11 +316,11 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
if (m_mapSchemata.size())
{
QJsonParseError jError;
const QJsonDocument doc(QJsonDocument::fromJson(m_mapSchemata[schemaId].schemadata().c_str(), &jError));
const QJsonDocument doc(QJsonDocument::fromJson(m_mapSchemata[schemaId].schemadata.c_str(), &jError));
if (jError.error != QJsonParseError::NoError)
{
WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id();
WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id;
return;
}
@@ -338,8 +340,8 @@ void EditSchemaDialog::DebugonLoadSchema()
m_mapSchemata = m_evlDtc->evaluationSchemas();
qint32 id = QInputDialog::getInt(this, QStringLiteral("Insert database id of desired schema"),
QStringLiteral("Database id"), m_mapSchemata.last().id(),
m_mapSchemata.first().id(), m_mapSchemata.last().id());
QStringLiteral("Database id"), m_mapSchemata.last().id,
m_mapSchemata.first().id, m_mapSchemata.last().id);
loadSchema(id);
}
@@ -454,11 +456,11 @@ void EditSchemaDialog::saveSchema(bool sendToTa)
EvlSchemaModifyRequest req;
bool schemaChanged = hasUnsavedChanges();
req.id(schemaChanged ? 0 : m_loadedSchemaId);
req.sendToTa(sendToTa);
req.id = schemaChanged ? 0 : m_loadedSchemaId;
req.sendToTa = sendToTa;
QJsonDocument doc = m_pModel->toJsonDocument();
req.schemadata(doc.toJson().constData());
req.schemadata = doc.toJson().constData();
m_requestHelper->addRequest([this, req, schemaChanged]() {
bool success = m_evlFtc->evlSchemaModifyRequest(req, this);
@@ -535,34 +537,34 @@ void EditSchemaDialog::onSendComment()
EvlCommentModifyRequest EditSchemaDialog::createEvlCommentModifyRequest(const ItemComment& c) const
{
EvlCommentModifyRequest req;
req.id(0);
req.ts(c.getTimeStamp().toMSecsSinceEpoch());
req.senderOperatorId(c.senderId());
req.id = 0;
req.ts = c.getTimeStamp().toMSecsSinceEpoch();
req.senderOperatorId = c.senderId();
if (c.hasReceiverId())
req.receiverOperatorId(c.receiverId());
req.receiverOperatorId = c.receiverId();
req.text(c.getText().toStdString());
req.text = c.getText().toStdString();
req.hierarchy(c.getHierarchy().toStdString());
req.schemaId(m_loadedSchemaId);
req.elementId(c.elementId());
req.hierarchy = c.getHierarchy().toStdString();
req.schemaId = m_loadedSchemaId;
req.elementId = c.elementId();
return req;
}
OcSituationClient::SendEvaluationRequest EditSchemaDialog::createSendEvaluationRequest(const ItemComment& c) const
{
OcSituationClient::SendEvaluationRequest req;
req.timeStamp(c.getTimeStamp().toMSecsSinceEpoch());
req.senderOperatorId(c.senderId());
req.timeStamp = c.getTimeStamp().toMSecsSinceEpoch();
req.senderOperatorId = c.senderId();
if (c.hasReceiverId())
req.receiverOperatorId(c.receiverId());
req.receiverOperatorId = c.receiverId();
req.text(c.getText().toStdString());
req.text = c.getText().toStdString();
req.hierarchy(c.getHierarchy().toStdString());
req.schemaId(m_loadedSchemaId);
req.hierarchy = c.getHierarchy().toStdString();
req.schemaId = m_loadedSchemaId;
return req;
}
@@ -13,7 +13,7 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsWidgets/lts_dialog.h>
#include <OcSituationClient/osc_ftc.h>
#include <FileManagement/flm_data_plugin.h>
#include <Plugins/FileManagement/Data/flm_data_plugin.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
@@ -10,7 +10,7 @@ namespace Evaluations
{
TreeModelSchema::TreeModelSchema(QObject* parent, NGL::INGLLogger& logger) : TreeModelGeneral(parent, logger)
{
qRegisterMetaTypeStreamOperators<Evaluations::ElementData>();
qRegisterMetaType<Evaluations::ElementData>();
}
void TreeModelSchema::resetModel()
@@ -1,6 +1,7 @@
#include "evl_new_comment_dialog.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_evl_new_comment_dialog.h"
@@ -18,7 +19,7 @@ EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagemen
m_ui->m_ltsComboBox_ReceiverOperator->addItem(tr("All (Default)"), 0);
auto cbUser = [this](const OperatorManagement::User& user) {
m_ui->m_ltsComboBox_ReceiverOperator->addItem(QString::fromStdString(user.name()), user.id());
m_ui->m_ltsComboBox_ReceiverOperator->addItem(QString::fromStdString(user.name), user.id);
};
opmDtc->users(cbUser);