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

- 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

No files matched your search

@@ -117,7 +117,6 @@ CnrTvcProfileHandler::CnrTvcProfileHandler(DatabaseInterface *db, Interface::Dts
, m_fts(fts)
, m_cnrHandler(cnrHandler)
, m_tvcHandler(tvcHandler)
, m_logger(getLogger("CnrTvcProfileHandler"))
{
Q_ASSERT(db);
Q_ASSERT(dts);
@@ -145,7 +144,7 @@ bool CnrTvcProfileHandler::init()
bool status = m_db->select(circuitContainersDb);
if (!status)
{
ERROR_LOG(m_logger) << "Error reading data from database 'avm.avm_cnr_tvc_profile'";
ERROR_LOG() << "Error reading data from database 'avm.avm_cnr_tvc_profile'";
return false;
}
@@ -175,7 +174,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
bool status = m_db->selectByContainerId(circuitsContentDb, circuitContainerDb.id);
if (!status)
{
ERROR_LOG(m_logger) << "Error reading data from database 'avm.avm_cnr_tvc_profile_data'";
ERROR_LOG() << "Error reading data from database 'avm.avm_cnr_tvc_profile_data'";
return false;
}
@@ -186,7 +185,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
{
status = m_db->removeAvmCnrTvcProfileData(invalid.id);
if (!status)
ERROR_LOG(m_logger) << "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with id " << invalid.id;
ERROR_LOG() << "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with id " << invalid.id;
auto newEnd = std::remove_if(circuitsContentDb.begin(), circuitsContentDb.end(), [&invalid] (const Database::AvmCnrTvcProfileData &circuit) { return circuit.id == invalid.id; });
circuitsContentDb.erase(newEnd, circuitsContentDb.end());
}
@@ -199,7 +198,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
status = m_db->removeAvmCnrTvcProfile(circuitContainerDb.id);
if (!status)
{
ERROR_LOG(m_logger) << "Failed to remove from 'avm.avm_cnr_tvc_profile' with id " << circuitContainerDb.id;
ERROR_LOG() << "Failed to remove from 'avm.avm_cnr_tvc_profile' with id " << circuitContainerDb.id;
return false;
}
@@ -232,7 +231,7 @@ void CnrTvcProfileHandler::onModifyCnrTvcProfileRequest(const rti::core::SampleI
rep = modifyProfile(request);
if (rep.error())
WARNING_LOG(m_logger) << rep.str();
WARNING_LOG() << rep.str();
m_fts->modifyCnrTvcProfileReply(cookie, rep);
}
@@ -243,7 +242,7 @@ void CnrTvcProfileHandler::onRemoveCnrTvcProfileRequest(const rti::core::SampleI
Core::FunctionReplyObject rep = removeProfile(request);
if (rep.error())
WARNING_LOG(m_logger) << rep.str();
WARNING_LOG() << rep.str();
m_fts->removeCnrTvcProfileReply(cookie, rep);
}
@@ -362,7 +361,7 @@ void CnrTvcProfileHandler::addProfile(const CnrTvcProfile &profile)
bool status = m_dts->publish(profile);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id());
ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id());
}
void CnrTvcProfileHandler::removeProfile(int64_t id)
@@ -376,7 +375,7 @@ void CnrTvcProfileHandler::removeProfile(int64_t id)
bool status = m_dts->removeCnrTvcProfileByKey(id);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' with id %1 (remove)").arg(id);
ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' with id %1 (remove)").arg(id);
}
void CnrTvcProfileHandler::updateProfile(const CnrTvcProfile &profile)
@@ -394,7 +393,7 @@ void CnrTvcProfileHandler::updateProfile(const CnrTvcProfile &profile)
bool status = m_dts->publish(profile);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id());
ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id());
}
void CnrTvcProfileHandler::onCnrConfigChanged(const CnrConfig &cnrConfig)