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/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
+14 -15
View File
@@ -35,7 +35,6 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<Interface::Dtc>
: m_dtc(dtc)
, m_scheduleId(-1)
, m_exerciseId(exerciseId)
, m_logger(getLogger("ForeignDataInterface"))
{
}
@@ -50,7 +49,7 @@ void ForeignInterfaceImpl::enableIsmForeignInterface() const
if (!m_mountingPoints.isEmpty())
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
<< " already initialized -> return";
return;
}
@@ -60,7 +59,7 @@ void ForeignInterfaceImpl::enableIsmForeignInterface() const
NON_CONST_THIS->init();
#ifdef BENCHMARK_RUN
NOTICE_LOG(m_logger) << LOGFUNCTION << " ISM::StructureElementCache / ForeignInterfaceImpl::init took " << elapsedTimer.elapsed() << " [ms]"
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " ISM::StructureElementCache / ForeignInterfaceImpl::init took " << elapsedTimer.elapsed() << " [ms]"
<< " - m_exerciseId = " << m_exerciseId
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
<< ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
@@ -76,12 +75,12 @@ bool ForeignInterfaceImpl::mountingPoints(const std::function<void (const Mounti
cb(it.value());
#ifdef BENCHMARK_RUN
NOTICE_LOG(m_logger) << LOGFUNCTION
NOTICE_LOG(m_logger) << Q_FUNC_INFO
<< " - m_exerciseId = " << m_exerciseId
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
<< " took " << elapsedTimer.elapsed() << " [ms]";
#else
NOTICE_LOG(m_logger) << LOGFUNCTION
NOTICE_LOG(m_logger) << Q_FUNC_INFO
<< " - m_exerciseId = " << m_exerciseId
<< " - m_mountingPoints.size()=" << m_mountingPoints.size();
#endif
@@ -118,7 +117,7 @@ MainSchedule ForeignInterfaceImpl::mainSchedule(int32_t scheduleId)
void ForeignInterfaceImpl::setScheduleId(int32_t scheduleId)
{
DEBUG_LOG(m_logger) << "setScheduleId to: " << scheduleId
DEBUG_LOG() << "setScheduleId to: " << scheduleId
<< " (was " << m_scheduleId << ")";
enableIsmForeignInterface();
@@ -184,7 +183,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
if (parserError.error != QJsonParseError::NoError)
WARNING_LOG(m_logger) << "Invalid properties for MSE " << data.id() << ", " << data.name();
WARNING_LOG() << "Invalid properties for MSE " << data.id() << ", " << data.name();
else
{
const QJsonArray exercises(QJsonObject(doc.object()).value(QStringLiteral("available_in_exercise")).toArray());
@@ -222,7 +221,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
if (realChange)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " m_bldgsInExcersise updated."
DEBUG_LOG() << Q_FUNC_INFO << " m_bldgsInExcersise updated."
<< " (mseId=" << mseId << " name=" << data.name();
emit buildingsInCurrentExerciseChanged();
}
@@ -248,7 +247,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
if (!m_dtc->getStructureElementById(curPath[1], seFloor))
WARNING_LOG(m_logger) << " getStructureElementById failed for " << curPath[1];
WARNING_LOG() << " getStructureElementById failed for " << curPath[1];
}
@@ -269,7 +268,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
mountingPointRef.updateData(currentStructEle, floorId);
emit mountingPointChanged(mountingPointRef, DataModification::eModified);
} else {
DEBUG_LOG(m_logger) << "New Mounting point with id " << currentStructEle.id()
DEBUG_LOG() << "New Mounting point with id " << currentStructEle.id()
<< " and type " << currentStructEle.mountingPointTypeId()
<< " (type " << currentStructEle.mountingPointTypeId().underlying() << ")"
<< " subid: " << currentStructEle.mountingPointId() << this;
@@ -295,7 +294,7 @@ void ForeignInterfaceImpl::onMountingPointAssetChanged(const MountingPointAsset
{
const int32_t structureElementId = data.structureElementId();
DEBUG_LOG(m_logger) << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
DEBUG_LOG() << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
@@ -367,7 +366,7 @@ void ForeignInterfaceImpl::onMainScheduleChanged(const MainSchedule &data, DataM
void ForeignInterfaceImpl::init()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
<< ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
@@ -426,12 +425,12 @@ void ForeignInterfaceImpl::init()
int firstBldg = -1;
if (!m_bldgsInExcersise.isEmpty())
firstBldg = *m_bldgsInExcersise.begin();
DEBUG_LOG(m_logger) << LOGFUNCTION << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
DEBUG_LOG() << Q_FUNC_INFO << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
<< ", firstBldg: " << firstBldg;
DEBUG_LOG(m_logger) << LOGFUNCTION << "XXXXX" << m_bldgsInExcersise.size();
DEBUG_LOG() << Q_FUNC_INFO << "XXXXX" << m_bldgsInExcersise.size();
DEBUG_LOG(m_logger) << LOGFUNCTION << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
DEBUG_LOG() << Q_FUNC_INFO << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
<< ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
-1
View File
@@ -64,7 +64,6 @@ private:
int32_t m_scheduleId;
int32_t m_exerciseId{-1};
NGL::INGLLogger &m_logger;
};
}