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:
2785 files changed
+18754
-18316
No files matched your search
@@ -36,7 +36,6 @@ MainHandler::MainHandler(QObject *parent)
|
||||
, m_tabFtc(nullptr)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_tabocDts(nullptr)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
@@ -67,89 +66,89 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
if (!m_dbHandler->init(exerciseId, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
|
||||
DEBUG_LOG() << "Initialisation dbHandler succesful.";
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
|
||||
|
||||
// create AES Dtc
|
||||
m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created AES Dtc";
|
||||
DEBUG_LOG() << "Created AES Dtc";
|
||||
|
||||
// create AES Ftc
|
||||
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created AES Ftc";
|
||||
DEBUG_LOG() << "Created AES Ftc";
|
||||
|
||||
// create EVL Ftc
|
||||
m_evlFtc = Evaluations::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created EVL Ftc";
|
||||
DEBUG_LOG() << "Created EVL Ftc";
|
||||
|
||||
// create GIM Dtc
|
||||
m_gimDtc = GuezIedManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created GIM Dtc";
|
||||
DEBUG_LOG() << "Created GIM Dtc";
|
||||
|
||||
// create MSG Dtc
|
||||
m_msgDtc = Messaging::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created MSG Dtc";
|
||||
DEBUG_LOG() << "Created MSG Dtc";
|
||||
|
||||
// create MSG Ftc
|
||||
m_msgFtc = Messaging::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created MSG Ftc";
|
||||
DEBUG_LOG() << "Created MSG Ftc";
|
||||
|
||||
// create OPM Dtc
|
||||
m_opmDtc = OperatorManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created OPM Dtc";
|
||||
DEBUG_LOG() << "Created OPM Dtc";
|
||||
|
||||
// create OSS Dts
|
||||
m_ossDts = OcSituationServer::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created OSS Dts";
|
||||
DEBUG_LOG() << "Created OSS Dts";
|
||||
|
||||
// create OSS Fts
|
||||
m_ossFts = OcSituationServer::Interface::Fts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created OSS Fts";
|
||||
DEBUG_LOG() << "Created OSS Fts";
|
||||
|
||||
// create PPM Dtc
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created PPM Dtc";
|
||||
DEBUG_LOG() << "Created PPM Dtc";
|
||||
|
||||
// create PPM Ftc
|
||||
m_ppmFtc = ParticipantManagement::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created PPM Ftc";
|
||||
DEBUG_LOG() << "Created PPM Ftc";
|
||||
|
||||
// create TAB Dtc
|
||||
m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created TAB Dtc";
|
||||
DEBUG_LOG() << "Created TAB Dtc";
|
||||
|
||||
// create TAB Dts
|
||||
m_tabDts = TrainingAreaBase::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created TAB Dts";
|
||||
DEBUG_LOG() << "Created TAB Dts";
|
||||
|
||||
// create TAB Ftc
|
||||
m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created TAB Ftc";
|
||||
DEBUG_LOG() << "Created TAB Ftc";
|
||||
|
||||
// create TABOC Dtc
|
||||
m_tabocDtc = TrainingAreaBaseOC::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created TABOC Dtc";
|
||||
DEBUG_LOG() << "Created TABOC Dtc";
|
||||
|
||||
// create TABOC Dts
|
||||
m_tabocDts = TrainingAreaBaseOC::Interface::Dts::create(m_ddsHandler->dds());
|
||||
DEBUG_LOG(m_logger) << "Created TABOC Dts";
|
||||
DEBUG_LOG() << "Created TABOC Dts";
|
||||
|
||||
// create handler oc-data
|
||||
m_handlerOcData = std::make_shared<HandlerOcData>(this, this);
|
||||
if (!m_handlerOcData->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerOcData failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerOcData failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user