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/HighLevelArchitecture/Guez/aes_handler.cpp
+18 -19
View File
@@ -72,7 +72,6 @@ AesHandler::AesHandler(NgsHandler *ngsHandler)
, m_dtcAes(nullptr)
, m_ftcAes(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AesHandler"))
{
}
@@ -80,9 +79,9 @@ AesHandler::AesHandler(NgsHandler *ngsHandler)
void AesHandler::onMineAreaModifyReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
WARNING_LOG(m_logger) << "ModifyReply: " << replyObject();
WARNING_LOG() << "ModifyReply: " << replyObject();
else
DEBUG_LOG(m_logger) << "ModifyReply: " << replyObject();
DEBUG_LOG() << "ModifyReply: " << replyObject();
m_requestHelper->requestReply(replyObject);
}
@@ -177,7 +176,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
for (const auto &pos : data.form())
formString << ParticipantPosition(pos).toString();
DEBUG_LOG(m_logger) << "\n##############################"
DEBUG_LOG() << "\n##############################"
<< "\n##### AesItemViewChanged #####"
<< "\n##############################"
<< "\nid: " << data.id()
@@ -197,7 +196,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
data.effectStateId() == AesEffectState::EsExpired ||
data.effectStateId() == AesEffectState::EsRemoved)
{
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " removed";
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " removed";
m_aesItemViews.remove(data.aesItemId());
m_takenIndicesForAesItem.remove(data.aesItemId());
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId());
@@ -206,7 +205,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
else if (data.effectStateId() == AesEffectState::EsPrepared &&
data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions)
{
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added";
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " added";
m_aesItemViews.insert(data.aesItemId(), data);
m_takenIndicesForAesItem.insert(data.aesItemId(), QVector<int32_t>());
}
@@ -214,7 +213,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
else if (data.aesTypeId() == AesType_def::AtBCContamination)
{
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
}
}
@@ -230,7 +229,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
}
bitfield.append(QStringLiteral("]"));
DEBUG_LOG(m_logger) << "\n#####################################"
DEBUG_LOG() << "\n#####################################"
<< "\n##### triggered impacts changed #####"
<< "\n#####################################"
<< "\nid: " << data.id()
@@ -350,7 +349,7 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
DEBUG_LOG(m_logger) << "\n####################################"
DEBUG_LOG() << "\n####################################"
<< "\n##### single explosion changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -388,7 +387,7 @@ void AesHandler::onAesMineAreaChanged(const MineArea &data, DataModification mod
{
Q_UNUSED(modType);
DEBUG_LOG(m_logger) << "\n#############################"
DEBUG_LOG() << "\n#############################"
<< "\n##### mine area changed #####"
<< "\n#############################"
<< "\nid: " << data.id()
@@ -411,7 +410,7 @@ void AesHandler::onAesMineCorridorChanged(const MineCorridor &data, DataModifica
{
Q_UNUSED(modType);
DEBUG_LOG(m_logger) << "\n#################################"
DEBUG_LOG() << "\n#################################"
<< "\n##### mine corridor changed #####"
<< "\n#################################"
<< "\nid: " << data.id()
@@ -436,7 +435,7 @@ void AesHandler::onAesNContaminationChanged(const NContamination &data, DataModi
Q_UNUSED(modType);
m_ngsHandler->ngsConnector()->guezNuclearAgent(data);
DEBUG_LOG(m_logger) << "\n####################################"
DEBUG_LOG() << "\n####################################"
<< "\n##### n contamination changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -459,7 +458,7 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
Q_UNUSED(modType);
m_ngsHandler->ngsConnector()->guezChemicalAgent(data);
DEBUG_LOG(m_logger) << "\n####################################"
DEBUG_LOG() << "\n####################################"
<< "\n##### bc contamination changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -564,7 +563,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
Core::RemoveElementRequest req(aesItemId);
DEBUG_LOG(m_logger) << "Remove Item for " << aesItemId << " requested. Type: " << type;
DEBUG_LOG() << "Remove Item for " << aesItemId << " requested. Type: " << type;
switch (type.underlying())
{
@@ -648,11 +647,11 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
}
case AreaEffectSimulation::AesType_def::AtMineArea:
{
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea";
DEBUG_LOG() << "onAesActivationTimeChanged / MineArea";
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
{
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea - Request NOT found";
DEBUG_LOG() << "onAesActivationTimeChanged / MineArea - Request NOT found";
AreaEffectSimulation::MineArea item = m_dtcAes->mineArea(aesItemId);
if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
return;
@@ -959,7 +958,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
DEBUG_LOG(m_logger) << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
DEBUG_LOG() << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
switch (type.underlying())
{
@@ -981,7 +980,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
std::vector<Core::GeoPosition2D> segments;
if (!getCorridorSegment(pos, segments, width))
{
ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
return;
}
req->segments(segments);
@@ -1004,7 +1003,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
std::vector<Core::GeoPosition2D> segments;
if (!getCorridorSegment(pos, segments, width))
{
ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
return;
}
req->segments(segments);