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
@@ -381,7 +381,7 @@ void PlanOverlayModel::updatePlanItem(const PlanItem &planItem)
|
||||
{
|
||||
if (!planItem.isValid())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "planItem has invalid key";
|
||||
ERROR_LOG() << "planItem has invalid key";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -539,12 +539,12 @@ void PlanOverlayModel::removeOverlay(int keyId)
|
||||
|
||||
bool PlanOverlayModel::reInitModel(int exerciseId, int phaseId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ReInit Model for exerciseId = " << exerciseId << ", phaseId = " << phaseId;
|
||||
DEBUG_LOG() << "ReInit Model for exerciseId = " << exerciseId << ", phaseId = " << phaseId;
|
||||
|
||||
if ((exerciseId < 1) || (phaseId < 1))
|
||||
{
|
||||
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " has been called with undefined exercise and/or phaseId";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " has been called with undefined exercise and/or phaseId";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -558,7 +558,7 @@ bool PlanOverlayModel::reInitModel(int exerciseId, int phaseId)
|
||||
int planExId = it.value().m_exerciseId;
|
||||
int planPhId = it.value().m_phaseId;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Plan name = " << it.value().m_fileName << " exercise = " << planExId << " phase = " << planPhId;
|
||||
DEBUG_LOG() << "Plan name = " << it.value().m_fileName << " exercise = " << planExId << " phase = " << planPhId;
|
||||
|
||||
if ((planExId < 1) || (planPhId < 1) || ((planExId == exerciseId) && (planPhId == phaseId)))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user