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:
2785 files changed
+18754
-18316
No files matched your search
@@ -185,7 +185,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
|
||||
{
|
||||
uint8_t wirkfeldTyp = a_radioTelegram->getPayloadDataUInt32(5, 1);
|
||||
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
|
||||
DEBUG_LOG(m_logger) << commonLog
|
||||
DEBUG_LOG() << commonLog
|
||||
<< ", type: " << wirkfeldTyp2Str(wirkfeldTyp) << ", kennung: "
|
||||
<< wirkfeldKennung;
|
||||
break;
|
||||
@@ -193,7 +193,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
|
||||
case GEF_DEAKTIVIERUNG_EINZELMINE: {
|
||||
uint32_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(9, 2);
|
||||
uint32_t minenKennung = a_radioTelegram->getPayloadDataUInt32(11, 2);
|
||||
DEBUG_LOG(m_logger) << commonLog
|
||||
DEBUG_LOG() << commonLog
|
||||
<< ", kennung: " << wirkfeldKennung << ", mineId: " << minenKennung;
|
||||
break;
|
||||
}
|
||||
@@ -207,14 +207,14 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
|
||||
case GEF_DEAKTIVIEREN_FUNKTIONSRAUM:
|
||||
{
|
||||
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
DEBUG_LOG(m_logger) << commonLog << ", kennung: " << wirkfeldKennung;
|
||||
DEBUG_LOG() << commonLog << ", kennung: " << wirkfeldKennung;
|
||||
break;
|
||||
}
|
||||
case GEF_TECHNIK_FUNKTIONSRAUM:
|
||||
{
|
||||
uint16_t funktionsraumkennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
uint8_t funktionsraumtyp = a_radioTelegram->getPayloadDataUInt32(7, 1);
|
||||
DEBUG_LOG(m_logger) << commonLog
|
||||
DEBUG_LOG() << commonLog
|
||||
<< ", kennung: " << funktionsraumkennung
|
||||
<< " type: " << int(funktionsraumtyp);
|
||||
break;
|
||||
@@ -222,19 +222,19 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
|
||||
case GEF_WF_SAMMELDEAKTIVIERUNG:
|
||||
case GEF_WF_SAMMELDEAKTIVIERUNG_DUS_MINEN:
|
||||
case GEF_WF_SAMMELDEAKTIVIERUNG_FUNKTIONSRAUM:
|
||||
DEBUG_LOG(m_logger) << commonLog << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
|
||||
DEBUG_LOG() << commonLog << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
|
||||
break;
|
||||
case GEF_NOP:
|
||||
{
|
||||
uint16_t bcFrom = a_radioTelegram->getPayloadDataUInt32(3, 2);
|
||||
uint16_t bcTo = a_radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
DEBUG_LOG(m_logger) << prefix
|
||||
DEBUG_LOG() << prefix
|
||||
<< commonLog
|
||||
<< ", from BC " << bcFrom << " to " << bcTo;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
DEBUG_LOG(m_logger) << commonLog;
|
||||
DEBUG_LOG() << commonLog;
|
||||
break;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user