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
-1
@@ -20,7 +20,6 @@ EquipmentErrorRegistrationDialog::EquipmentErrorRegistrationDialog(QWidget *pare
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::EquipmentErrorRegistrationDialog)
|
||||
, m_logger(getLogger("EquipmentErrorRegistrationDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &EquipmentErrorRegistrationDialog::onPrint);
|
||||
|
||||
-2
@@ -46,7 +46,5 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
|
||||
Ui::EquipmentErrorRegistrationDialog *m_ui;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -28,7 +28,6 @@ EquipmentErrorRegistrationModel::EquipmentErrorRegistrationModel(QObject *parent
|
||||
, m_chunksRequested(0)
|
||||
, m_chunksReceived(0)
|
||||
, m_session(nullptr)
|
||||
, m_logger(getLogger("EquipmentErrorRegistrationModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -43,7 +42,7 @@ bool EquipmentErrorRegistrationModel::initModel(LtsSession::LtsSession *session,
|
||||
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG(m_logger) << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
ERROR_LOG() << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -136,7 +135,7 @@ void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement:
|
||||
{
|
||||
if (ev.eventTypeId() != ProjectDataManagement::EventType_def::EquipmentErrorReport)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
INFO_LOG() << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
insertRow(event2Entry(ev));
|
||||
|
||||
emit chunksUpdated(m_chunksReceived, m_chunksRequested);
|
||||
|
||||
-3
@@ -65,9 +65,6 @@ private:
|
||||
QSet<TimeLineManagement::TimelineDataProviderInterface*> m_requests;
|
||||
|
||||
LtsSession::LtsSession *m_session;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
friend class EquipmentErrorRegistrationProxyModel;
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user