lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp
+12 -13
View File
@@ -30,7 +30,6 @@ MainHandler::MainHandler(QObject *parent)
, m_handlerTabData(nullptr)
, m_handlerVehicle(nullptr)
, m_handlerControlUnit(nullptr)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
@@ -55,28 +54,28 @@ 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.";
// init control unit handler
m_handlerControlUnit = std::make_shared<EffectShowClient::ControlUnitHandler>(this);
if (!m_handlerControlUnit->init())
{
ERROR_LOG(m_logger) << "Initialisation control unit handler failed.";
ERROR_LOG() << "Initialisation control unit handler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation control unit handler succesful.";
DEBUG_LOG() << "Initialisation control unit handler succesful.";
// create handler
m_handlerOrder = std::make_shared<HandlerOrder>(this, this);
@@ -89,38 +88,38 @@ bool MainHandler::init(int domainId, int exerciseId)
// ini handler
if (!m_handlerOrder->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerOrder failed.";
ERROR_LOG() << "Initialisation HandlerOrder failed.";
return false;
}
if (!m_handlerOperatingCondition->init())
{
ERROR_LOG(m_logger) << "Initialisation handlerOperatingCondition failed.";
ERROR_LOG() << "Initialisation handlerOperatingCondition failed.";
return false;
}
if (!m_handlerFiringExplosion->init())
{
ERROR_LOG(m_logger) << "Initialisation handlerFiringExplosion failed.";
ERROR_LOG() << "Initialisation handlerFiringExplosion failed.";
return false;
}
if (!m_handlerFiringSmoke->init())
{
ERROR_LOG(m_logger) << "Initialisation handlerFiringSmoke failed.";
ERROR_LOG() << "Initialisation handlerFiringSmoke failed.";
return false;
}
if (!m_handlerTabData->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerTabData failed.";
ERROR_LOG() << "Initialisation HandlerTabData failed.";
return false;
}
if (!m_handlerVehicle->init())
{
ERROR_LOG(m_logger) << "Initialisation handlerVehicle failed.";
ERROR_LOG() << "Initialisation handlerVehicle failed.";
return false;
}