Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -27,7 +27,6 @@ MessagingView::MessagingView(const QString &menuGroup, LtsSession::LtsSession *s
, m_session(session)
, m_ui(new Ui::MessagingView)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("MessagingDialog"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -65,9 +65,6 @@ private:
LtsSession::LtsSession *m_session;
Ui::MessagingView *m_ui;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
};
}
@@ -28,7 +28,6 @@ parent)
, m_operatorId(0)
, m_ownParticipantId(-1)
, m_app(LtsAppDescriptor::App::Situation)
, m_logger(getLogger("MessagingModel"))
{}
bool MessagingModel::initModel(const std::shared_ptr<Messaging::Interface::Dtc> &dtc,
@@ -152,7 +151,7 @@ void MessagingModel::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Speci
int oldParticipantId = m_ownParticipantId;
m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
if (m_ownParticipantId <= 0)
WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
WARNING_LOG() << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
if (oldParticipantId != m_ownParticipantId)
reInitModel();
@@ -67,8 +67,6 @@ private:
LtsAppDescriptor::App m_app;
friend class MessagingProxyModel;
LOGGER_T m_logger;
};
class MessagingProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
@@ -92,9 +92,8 @@ NewMessageDialog::NewMessageDialog(LtsSession::LtsSession *session, QWidget *par
, m_recipientModel(new RecipientModel(this))
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_session(session)
, m_logger(getLogger("NewMessageDialog"))
{
INFO_LOG(m_logger) << "NewMessageDialog::Konstruktor";
INFO_LOG() << "NewMessageDialog::Konstruktor";
m_ui->setupUi(this);
m_ui->leSubject->clear();
@@ -167,7 +166,7 @@ bool NewMessageDialog::init(const std::shared_ptr<Messaging::Interface::Dtc> &dt
m_ftc = ftc;
m_opmCbxDtc = opmCbxDtc;
INFO_LOG(m_logger) << "NewMessageDialog::init";
INFO_LOG() << "NewMessageDialog::init";
fillAddressBox();
return true;
@@ -183,7 +182,7 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
if (msg.senderType() == Messaging::AddressType_def::ObserverController)
{
int idx = m_ui->cmbOperators->findData(0-msg.senderId());
INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId()
INFO_LOG() << "senderId=" << 0-msg.senderId()
<< " idx = " << idx;
m_ui->cmbOperators->setCurrentIndex(idx);
}
@@ -224,11 +223,11 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
bool NewMessageDialog::apply()
{
DEBUG_LOG(m_logger) << "--- onSendMessage() ";
DEBUG_LOG() << "--- onSendMessage() ";
QString subject = m_ui->leSubject->text();
QString message = m_ui->teMessage->toPlainText();
DEBUG_LOG(m_logger) << "subject = " << subject
DEBUG_LOG() << "subject = " << subject
<< ",message = " << message;
@@ -239,7 +238,7 @@ bool NewMessageDialog::apply()
{
CreateOperatorMessageRequest comr;
DEBUG_LOG(m_logger) << "request for Operators";
DEBUG_LOG() << "request for Operators";
comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
comr.subject(subject.toStdString());
comr.senderType(Messaging::AddressType_def::type::Operator);
@@ -251,21 +250,21 @@ bool NewMessageDialog::apply()
for (const RecipientModel::Recipient &r : recvOperators)
{
comr.recipientIds().push_back(r.recipientId);
DEBUG_LOG(m_logger) << "recipientId =" << r.recipientId;
DEBUG_LOG() << "recipientId =" << r.recipientId;
}
m_requestHelper->addRequest([comr, this]()
{
DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest ";
DEBUG_LOG() << "m_ftc->createOperatorMessageRequest ";
return m_ftc->createOperatorMessageRequest(comr, this);
});
}
DEBUG_LOG(m_logger) << " m_recipientModel->countOcMessages=" << recvOCs.size();
DEBUG_LOG() << " m_recipientModel->countOcMessages=" << recvOCs.size();
if (!recvOCs.isEmpty())
{
CreateOperatorMessageRequest comrOC;
DEBUG_LOG(m_logger) << "request for OCs";
DEBUG_LOG() << "request for OCs";
comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
comrOC.subject(subject.toStdString());
comrOC.senderType(Messaging::AddressType_def::type::Operator);
@@ -276,11 +275,11 @@ bool NewMessageDialog::apply()
for (const RecipientModel::Recipient &r : recvOCs)
{
comrOC.recipientIds().push_back(r.recipientId);
DEBUG_LOG(m_logger) << "recipientId OC =" << r.recipientId;
DEBUG_LOG() << "recipientId OC =" << r.recipientId;
}
m_requestHelper->addRequest([comrOC, this]()
{
DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest OC";
DEBUG_LOG() << "m_ftc->createOperatorMessageRequest OC";
return m_ftc->createOperatorMessageRequest(comrOC, this);
});
}
@@ -296,7 +295,7 @@ void NewMessageDialog::fillAddressBox()
void NewMessageDialog::addrTypeChanged()
{
DEBUG_LOG(m_logger) << "************** addrTypeChanged ";
DEBUG_LOG() << "************** addrTypeChanged ";
fillAddressBox();
if (m_session->app() != LtsAppDescriptor::App::OC)
m_ui->lblCharsLeft->setVisible(m_ui->cbxAddrType->isChecked() || m_recipientsContainsOc);
@@ -311,13 +310,13 @@ void NewMessageDialog::addAddr()
r.recipientId = abs(m_ui->cmbOperators->currentData().toInt());
m_recipientModel->addData(r);
DEBUG_LOG(m_logger) << "************** addAddr: " << m_ui->cmbOperators->currentText()
DEBUG_LOG() << "************** addAddr: " << m_ui->cmbOperators->currentText()
<< " isOperator:" << r.isOperator;
}
void NewMessageDialog::removeAddr()
{
DEBUG_LOG(m_logger) << "************** removeAddr ";
DEBUG_LOG() << "************** removeAddr ";
QModelIndex modelIndex = m_ui->addrListView->currentIndex();
m_recipientModel->removeData(modelIndex);
m_ui->addrRemoveButton->setEnabled(m_recipientModel->rowCount() > 0);
@@ -326,7 +325,7 @@ void NewMessageDialog::removeAddr()
void NewMessageDialog::onAddrSelectionChanged()
{
DEBUG_LOG(m_logger) << "************** onAddrSelectionChanged ";
DEBUG_LOG() << "************** onAddrSelectionChanged ";
m_ui->addrRemoveButton->setEnabled(true);
}
@@ -26,7 +26,6 @@ ShowMessageDialog::ShowMessageDialog(LtsSession::LtsSession *session, QWidget *p
, m_opmCbxDtc(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_session(session)
, m_logger(getLogger("MessagingDialog"))
{
m_ui->setupUi(this);
setUnchangeable();
@@ -72,7 +71,7 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
QDateTime qDateTime;
qDateTime.setMSecsSinceEpoch(operatorMessage.timeStamp());
QString time = qDateTime.toUTC().toString();
INFO_LOG(m_logger) << " time = " << time;
INFO_LOG() << " time = " << time;
m_ui->time->setText(time);
m_ui->msgContent->append(QString::fromStdString(operatorMessage.message()));
@@ -129,13 +128,13 @@ void ShowMessageDialog::onAnswerMessage()
NewMessageDialog *answerDialog = new NewMessageDialog(m_session, this);
if (!answerDialog->init(m_dtc, m_ftc, m_opmCbxDtc))
{
ERROR_LOG(m_logger) << "Can't initialize NewMessageDialog!";
ERROR_LOG() << "Can't initialize NewMessageDialog!";
return;
}
if (!answerDialog->initAnswerDialog(m_operatorMessage))
{
ERROR_LOG(m_logger) << "Can't set values from previous message!";
ERROR_LOG() << "Can't set values from previous message!";
return;
}