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/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
+18 -19
View File
@@ -17,7 +17,6 @@ namespace WarehouseManagement
IWMS2ECC_Impl::IWMS2ECC_Impl(const std::shared_ptr<ExercisesHandler> &exercisesHandler)
: m_exercisesHandler(exercisesHandler)
, m_logger(getLogger("Wms2Ecc"))
{
connect(m_exercisesHandler.get(), &ExercisesHandler::registrationReturnValue,
this, &IWMS2ECC_Impl::onRegistrationReturnValue);
@@ -55,7 +54,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
pi.exerciseId = exerciseId;
pi.forceId = part.partyId();
DEBUG_LOG(m_logger) << "Force Id = " << pi.forceId;
DEBUG_LOG() << "Force Id = " << pi.forceId;
pi.info = QString::fromStdString(part.info());
pi.parentPlayerId = part.superiorId();
@@ -68,10 +67,10 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
{
pi.equipTypeId = partType.equipmentTypeId();
pi.typeClassId = convert(partType.typeClass());
TRACE_LOG(m_logger) << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
TRACE_LOG() << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
}
else
WARNING_LOG(m_logger) << "Can not find participant type with id " << part.typeId();
WARNING_LOG() << "Can not find participant type with id " << part.typeId();
pi.typeId = part.typeId();
pi.isDeleted = part.isDeleted();
@@ -81,8 +80,8 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
pi.symbolColor = party.color();
DEBUG_LOG(m_logger) << "party.name: " << pi.forceName;
DEBUG_LOG(m_logger) << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
DEBUG_LOG() << "party.name: " << pi.forceName;
DEBUG_LOG() << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
return pi;
@@ -98,7 +97,7 @@ IWMS2ECC::exerciseMap IWMS2ECC_Impl::getExercises() const
retMap.insert(ex.id(), convert(ex));
}
INFO_LOG(m_logger) << "IN getExercises, exMap.size(): " << exMap.size()
INFO_LOG() << "IN getExercises, exMap.size(): " << exMap.size()
<< ", retMap.size: " << retMap.size();
return retMap;
}
@@ -132,12 +131,12 @@ QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllPlayers(int exerciseId) con
QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllParticipants(int exerciseId) const
{
INFO_LOG(m_logger) << "IN getAllParticipants";
INFO_LOG() << "IN getAllParticipants";
QMap<int, IWMS2ECC::PlayerInfo> retMap;
const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
INFO_LOG() << "getAllPlayers map.size() : " << map.size();
for (const ParticipantManagement::Participant &exePart : map)
{
@@ -172,8 +171,8 @@ IWMS2ECC::RegisterReturnValue IWMS2ECC_Impl::registerPlayer(int playerId, int eq
void IWMS2ECC_Impl::onRegistrationReturnValue(int exerciseId, qint32 participantId, ParticipantManagement::RegisterReturnValue retValue)
{
INFO_LOG(m_logger) << "IN onRegistrationReturnValue ";
INFO_LOG(m_logger) << "exerciseId: " << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
INFO_LOG() << "IN onRegistrationReturnValue ";
INFO_LOG() << "exerciseId: " << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
emit registrationReturnValue(exerciseId, participantId, convert(retValue));
}
@@ -188,12 +187,12 @@ IWMS2ECC::UnregisterReturnValue IWMS2ECC_Impl::unregister(int equipNo, int exerc
IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
{
DEBUG_LOG(m_logger) << "IN getPlayerInfo: "
DEBUG_LOG() << "IN getPlayerInfo: "
<< " playerId = " << playerId << ", exerciseId = " << exerciseId;
if (playerId <= 0 || exerciseId <= 0)
{
WARNING_LOG(m_logger) << "Invalid Player (0,0)";
WARNING_LOG() << "Invalid Player (0,0)";
IWMS2ECC::PlayerInfo pi;
pi.playerState = NOT_FOUND;
return pi;
@@ -218,7 +217,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
pi.playerState = FOUND;
INFO_LOG(m_logger) << "Player (" << pi.playerId << "," << exerciseId << ") found: "
INFO_LOG() << "Player (" << pi.playerId << "," << exerciseId << ") found: "
<< "AssignState: " << pi.assignState << ", forceName: " << pi.forceName;
return pi;
@@ -231,7 +230,7 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
INFO_LOG() << "getAllPlayers map.size() : " << map.size();
QMap<int, int> reqPartTypes;
@@ -251,17 +250,17 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
const ParticipantManagement::Type partType = m_exercisesHandler->participantType(typeId);
if (partType.id() == typeId)
{
DEBUG_LOG(m_logger) << "Key: " << typeId;
DEBUG_LOG() << "Key: " << typeId;
ParticipantManagement::TypeClass typeClass = partType.typeClass();
int equipTypeId = partType.equipmentTypeId();
if (typeClass != ParticipantManagement::TypeClass_def::Unit && typeClass != ParticipantManagement::TypeClass_def::SupportUnit)
{
reqEquipTypes[equipTypeId] = cIt.value();
DEBUG_LOG(m_logger) << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
DEBUG_LOG() << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
}
}
else
WARNING_LOG(m_logger) << "Can not find participant type with id " << typeId;
WARNING_LOG() << "Can not find participant type with id " << typeId;
}
return reqEquipTypes;
}
@@ -409,7 +408,7 @@ bool IWMS2ECC_Impl::setEquipmentType(const EquipmentType &et)
bool IWMS2ECC_Impl::setEquipmentTypes(const equipTypeMap &map)
{
INFO_LOG(m_logger) << "IN setEquipmentTypes: equipMap.size: " << map.size();
INFO_LOG() << "IN setEquipmentTypes: equipMap.size: " << map.size();
std::vector<ParticipantManagement::EquipmentType> vEquipTypes;
vEquipTypes.reserve(map.size());