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

@@ -15,30 +15,29 @@ HandlerStaticMeteoData::HandlerStaticMeteoData(const std::shared_ptr<DdsHandler>
: StaticMeteoDataModifyRequestHandler(ddsHandler->fts())
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("HandlerStaticMeteoData"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
bool HandlerStaticMeteoData::init()
{
INFO_LOG(m_logger) << "Start HandlerStaticMeteoData.";
INFO_LOG() << "Start HandlerStaticMeteoData.";
// read data from db-table 'mdm_static_meteo_data'
QVector<Database::MdmStaticMeteoData> dataVec;
if (!m_db->select(dataVec))
{
ERROR_LOG(m_logger) << "Error reading data from database 'mdm_static_meteo_data'!";
ERROR_LOG() << "Error reading data from database 'mdm_static_meteo_data'!";
return false;
}
if (dataVec.isEmpty())
{
WARNING_LOG(m_logger) << "DB table 'mdm_static_meteo_data' is empty! Try to create default entry.";
WARNING_LOG() << "DB table 'mdm_static_meteo_data' is empty! Try to create default entry.";
if (!insertDefaultStaticMeteoDataEntry())
{
ERROR_LOG(m_logger) << "Insert DB table 'mdm_static_meteo_data' failed! No static meteo data may be handled!";
ERROR_LOG() << "Insert DB table 'mdm_static_meteo_data' failed! No static meteo data may be handled!";
return false; // Damit werden alle moeglicherweise erreichbaren MDU's nicht bearbeitet,
// da die Initialisierung des Service im 'SCM' mit Error beendet wird.
}
@@ -48,7 +47,7 @@ bool HandlerStaticMeteoData::init()
m_dbStaticMeteoData.timeStamp = QDateTime::currentMSecsSinceEpoch();
INFO_LOG(m_logger) << "Insert into DB table 'mdm_static_meteo_data' successfully. id: "
INFO_LOG() << "Insert into DB table 'mdm_static_meteo_data' successfully. id: "
<< m_dbStaticMeteoData.id;
onPublishData();
@@ -57,7 +56,7 @@ bool HandlerStaticMeteoData::init()
if (dataVec.size() > 1)
{
WARNING_LOG(m_logger) << "Invalid number of table entries for 'mdm_static_meteo_data' size:"
WARNING_LOG() << "Invalid number of table entries for 'mdm_static_meteo_data' size:"
<< dataVec.size()
<< " The first entry will be used only!";
}
@@ -71,7 +70,7 @@ bool HandlerStaticMeteoData::init()
void HandlerStaticMeteoData::onStaticMeteoDataModifyRequest(const rti::core::SampleIdentity &cookie,
const StaticMeteoDataModifyRequest &request)
{
INFO_LOG(m_logger) << "onStaticMeteoDataModifyRequest: " << request;
INFO_LOG() << "onStaticMeteoDataModifyRequest: " << request;
Core::FunctionReplyObject rep(request.id());
@@ -94,7 +93,7 @@ bool HandlerStaticMeteoData::updateStaticMeteoDatainDB(const StaticMeteoDataModi
{
if (request.id() != m_dbStaticMeteoData.id)
{
WARNING_LOG(m_logger) << "Invalid id for db-table 'mdm_static_meteo_data'"
WARNING_LOG() << "Invalid id for db-table 'mdm_static_meteo_data'"
<< m_dbStaticMeteoData.id
<< " correct id: " << m_dbStaticMeteoData.id;
return false;
@@ -120,10 +119,10 @@ void HandlerStaticMeteoData::onPublishData()
ddsData.note(note);
ddsData.weatherStationId(ddsData.id()); // MDUid == dbId
INFO_LOG(m_logger) << "Publish static MeteoData to dds: " << ddsData;
INFO_LOG() << "Publish static MeteoData to dds: " << ddsData;
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG(m_logger) << "Error publishing static MdmMeteoData to dds";
ERROR_LOG() << "Error publishing static MdmMeteoData to dds";
} // end of onPublishData()
//-----------------------------------------------------------------------------
@@ -142,7 +141,7 @@ bool HandlerStaticMeteoData::insertDefaultStaticMeteoDataEntry()
if (!m_db->insert(dbData))
{
ERROR_LOG(m_logger) << "insertDefaultStaticMeteoDataEntry for db-table 'mdm_static_meteo_data' failed!";
ERROR_LOG() << "insertDefaultStaticMeteoDataEntry for db-table 'mdm_static_meteo_data' failed!";
return false;
}
return true;