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

@@ -23,7 +23,6 @@ OperatorPartyAssignment::OperatorPartyAssignment(const QString &menuGroup, QWidg
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_operatorId(-1)
, m_model(nullptr)
, m_logger(getLogger("OperatorPartyAssignment"))
, m_ui(new Ui::OperatorPartyAssignment)
{
m_ui->setupUi(this);
@@ -49,17 +48,17 @@ bool OperatorPartyAssignment::init(LtsSession::LtsSession *session)
m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setVisible(false);
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
{
ERROR_LOG(m_logger)<<" -- Couldn't init ppmDtc";
ERROR_LOG()<<" -- Couldn't init ppmDtc";
return false;
}
if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
{
ERROR_LOG(m_logger)<<" -- Couldn't init opmDtc";
ERROR_LOG()<<" -- Couldn't init opmDtc";
return false;
}
if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
{
ERROR_LOG(m_logger)<<" -- Couldn't init ppmFtc";
ERROR_LOG()<<" -- Couldn't init ppmFtc";
return false;
}
@@ -99,7 +98,7 @@ QMap<int, bool> OperatorPartyAssignment::getPartyStatesForOpertator() const
DEBUG_LOG(m_logger)<<" -- [getPartyStatesForOpertator] -> ";
DEBUG_LOG()<<" -- [getPartyStatesForOpertator] -> ";
const auto &partys = m_ppmDtc->partys();
QMap<int,bool> mapPartyCheckStates;
for (auto p : partys)
@@ -56,8 +56,6 @@ private:
QMap<int, QString> m_operatorMap;
OPeratorPartyAssignmentModel *m_model;
LOGGER_T m_logger;
Ui::OperatorPartyAssignment *m_ui;
};
@@ -17,7 +17,6 @@ OPeratorPartyAssignmentModel::OPeratorPartyAssignmentModel(QObject *parent)
tr("Role")},
parent)
, m_dtc(nullptr)
, m_logger(getLogger("OPeratorPartyAssignmentModel"))
{
}
bool OPeratorPartyAssignmentModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc)
@@ -47,8 +47,6 @@ protected:
}
private:
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
LOGGER_T m_logger;
QMap<int, bool> m_mapPartyCheckStates;
};
@@ -34,7 +34,6 @@ PartyEdit::PartyEdit(QWidget *parent)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_session(nullptr)
, m_ui(new Ui::PartyEdit)
, m_logger(getLogger("PartyEdit"))
{
m_ui->setupUi(this);
}
@@ -71,7 +70,7 @@ void PartyEdit::lock()
bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
{
DEBUG_LOG(m_logger) << "PartyEdit::init()";
DEBUG_LOG() << "PartyEdit::init()";
m_session = session;
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_dtc))
@@ -180,7 +179,7 @@ bool PartyEdit::apply()
reqOpm.rolePresetId(user.rolePresetId());
QString properties = QString::fromUtf8(QJsonDocument(opmProperties).toJson());
DEBUG_LOG(m_logger) << "properties: " << properties;
DEBUG_LOG() << "properties: " << properties;
reqOpm.properties(properties.toStdString());
m_requestHelper->addRequest([reqOpm, this]()
@@ -365,14 +364,14 @@ void PartyEdit::notificationCheck()
{
if (!m_dtcOpm->isAdlerAllowedParty(m_session->exerciseId(), m_partyId, LtsSessionData::LtsSessionData::getInstance()->getOperatorId()))
{
WARNING_LOG(m_logger) << "Party " << m_partyId << " not allowed for this user";
WARNING_LOG() << "Party " << m_partyId << " not allowed for this user";
m_ui->lblNotifications->hide();
m_ui->cbAdlerNotification->hide();
m_ui->cbCombatOrder->hide();
return;
}
DEBUG_LOG(m_logger) << "Party allowed for ADLER notifications";
DEBUG_LOG() << "Party allowed for ADLER notifications";
const std::string properties = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()).properties();
QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(properties)).object());
@@ -408,7 +407,7 @@ void PartyEdit::notificationCheck()
void PartyEdit::modifyPartyProperties()
{
DEBUG_LOG(m_logger) << LOGFUNCTION;
DEBUG_LOG() << Q_FUNC_INFO;
ParticipantManagement::Party requestParty;
requestParty = m_dtc->party(m_partyId);
@@ -423,11 +422,11 @@ void PartyEdit::modifyPartyProperties()
if (parserError.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
ERROR_LOG() << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
doc = QJsonDocument();
}
DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
DEBUG_LOG() << "json to parse: " << doc.toJson();
QJsonObject obj(doc.object());
obj[QStringLiteral("Adler")] = adlerPropertiesObj;
@@ -27,7 +27,6 @@ PartyModel::PartyModel(QObject *parent)
tr("Szenar Name")},
parent)
, m_ppmDtc(nullptr)
, m_logger(getLogger("PartyModel"))
{}
bool PartyModel::initModel(LtsSession::LtsSession *session)
@@ -35,12 +34,12 @@ bool PartyModel::initModel(LtsSession::LtsSession *session)
m_session = session;
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
{
ERROR_LOG(m_logger)<<" Couldn't load ppmDtc!!! ";
ERROR_LOG()<<" Couldn't load ppmDtc!!! ";
return false;
}
if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
{
ERROR_LOG(m_logger)<<" Couldn't load opmDtc!!! ";
ERROR_LOG()<<" Couldn't load opmDtc!!! ";
return false;
}
@@ -57,6 +57,5 @@ private:
int m_operatorId;
int m_exerciseId;
LtsSession::LtsSession *m_session;
LOGGER_T m_logger;
};
}
@@ -23,7 +23,6 @@ PartyView::PartyView(const QString &menuGroup, QWidget *parent)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_session(nullptr)
, m_ui(new Ui::PartyView)
, m_logger(getLogger("PartyView"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -197,7 +196,7 @@ void PartyView::onSyncParties()
SyncPartiesRequest req;
req.exerciseId(m_session->exerciseId());
DEBUG_LOG(m_logger) << "Sync parties for exercise " << req.exerciseId();
DEBUG_LOG() << "Sync parties for exercise " << req.exerciseId();
return m_ftc->syncPartiesRequest(req, this);
});
@@ -63,9 +63,6 @@ private:
LtsSession::LtsSession *m_session;
Ui::PartyView *m_ui;
LOGGER_T m_logger;
};
}