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/AreaEffectSimulation/handler_charge_effect.cpp
+13 -13
View File
@@ -37,7 +37,7 @@ bool HandlerChargeEffect::init()
if (!m_mainHandler)
{
ERROR_LOG(m_logger) << QStringLiteral("Not possible to init HandlerChargeEffect --> No MainHandler present.");
ERROR_LOG() << QStringLiteral("Not possible to init HandlerChargeEffect --> No MainHandler present.");
return false;
}
@@ -46,7 +46,7 @@ bool HandlerChargeEffect::init()
if (!m_mainHandler->db()->select(chargeEffectDbData))
{
ERROR_LOG(m_logger) << QStringLiteral("Not possible to init HandlerChargeEffect --> Not possible to get database data.");
ERROR_LOG() << QStringLiteral("Not possible to init HandlerChargeEffect --> Not possible to get database data.");
return false;
}
@@ -82,7 +82,7 @@ void HandlerChargeEffect::onChargeEffectModifyRequest(const rti::core::SampleIde
{
if (!m_mainHandler)
{
ERROR_LOG(m_logger) << QStringLiteral("Not possible to process ChargeEffectModifyRequest --> No MainHandler present.");
ERROR_LOG() << QStringLiteral("Not possible to process ChargeEffectModifyRequest --> No MainHandler present.");
return;
}
@@ -117,13 +117,13 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
if (chargeEffect == nullptr)
{
ERROR_LOG(m_logger) << "onChargeEffectExpired: got invalid chargeEffectId " << chargeEffectId;
ERROR_LOG() << "onChargeEffectExpired: got invalid chargeEffectId " << chargeEffectId;
return;
}
if (!chargeEffect->remove())
{
ERROR_LOG(m_logger) << "onChargeEffectExpired: failed to remove ChargeEffect with id " << chargeEffectId;
ERROR_LOG() << "onChargeEffectExpired: failed to remove ChargeEffect with id " << chargeEffectId;
return;
}
@@ -135,7 +135,7 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
const int trajId = m_trajObjIds.value(chargeEffectId, -1);
if (!m_trajectoryHandler->remove(trajId))
{
ERROR_LOG(m_logger) << "onChargeEffectExpired: failed to remove trajectory from chargeEffect id " << chargeEffectId;
ERROR_LOG() << "onChargeEffectExpired: failed to remove trajectory from chargeEffect id " << chargeEffectId;
return;
}
m_trajObjIds.remove(chargeEffectId);
@@ -143,7 +143,7 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
void HandlerChargeEffect::onChargeEffectStateChanged(const int id, AesEffectState newState)
{
DEBUG_LOG(m_logger) << " [CHARGE EFFECT STATE] state changed !! id: " << id << " state: " << newState;
DEBUG_LOG() << " [CHARGE EFFECT STATE] state changed !! id: " << id << " state: " << newState;
if (id <= 0)
return;
@@ -165,8 +165,8 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
m_chargeEffects.insert(newChargeEffect->id(), newChargeEffect);
// Create ChargeAdministration Entry for reports
DEBUG_LOG(m_logger) << "newChargeEffect id: " << newChargeEffect->id();
DEBUG_LOG(m_logger) << "request.originatorTypeId: " << request.originatorTypeId();
DEBUG_LOG() << "newChargeEffect id: " << newChargeEffect->id();
DEBUG_LOG() << "request.originatorTypeId: " << request.originatorTypeId();
if (request.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
{
int amount = 1;
@@ -185,7 +185,7 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
{
int trajId = m_trajectoryHandler->create(trajectoryData(newChargeEffect->id(), request.trajectoryTimeAware().get()));
if (trajId < 0)
ERROR_LOG(m_logger) << " Couldn't create trajectory for chargeEffect id: " << newChargeEffect->id();
ERROR_LOG() << " Couldn't create trajectory for chargeEffect id: " << newChargeEffect->id();
else
m_trajObjIds.insert(newChargeEffect->id(), trajId);
}
@@ -233,7 +233,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
{
reply.setStr("Not possible to update ChargeEffect --> No MainHandler present.");
ERROR_LOG(m_logger) << reply.str();
ERROR_LOG() << reply.str();
return reply;
}
@@ -243,7 +243,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
reply.setStr("Not possible to update ChargeEffect --> Got invalid id.");
ERROR_LOG(m_logger) << reply.str();
ERROR_LOG() << reply.str();
return reply;
}
@@ -257,7 +257,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
{
// update failed should the trajectory be created again?
reply.setStr("Not possible to update ChargeEffect --> Got invalid trajectory id.");
ERROR_LOG(m_logger) << " Couldn't update trajectory: unknown chargeEffect id: " << chargeEffetObj->id();
ERROR_LOG() << " Couldn't update trajectory: unknown chargeEffect id: " << chargeEffetObj->id();
}
return reply;