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

@@ -28,7 +28,6 @@ ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *sessi
, m_exmDtc(nullptr)
, m_model(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseAssignmentDialog"))
{
m_ui->setupUi(this);
m_ui->assetListView->setSelectionMode(QAbstractItemView::MultiSelection);
@@ -57,19 +56,19 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
if (!m_ismFtc->enableInstrumentationAssetModify())
{
ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
return false;
}
if (!m_ismFtc->enableMainStructureElementModify())
{
ERROR_LOG(m_logger) << "Could not enable FT MainStructureElementModify of ISM";
ERROR_LOG() << "Could not enable FT MainStructureElementModify of ISM";
return false;
}
if (!m_exmDtc->enableExercise())
{
ERROR_LOG(m_logger) << "Could not enable DT Exercise of EXM";
ERROR_LOG() << "Could not enable DT Exercise of EXM";
return false;
}
@@ -84,7 +83,7 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
m_model = new ExerciseAssignmentDialogModel(this);
if (!m_model->initModel(m_ismDtc, m_exmDtc))
{
ERROR_LOG(m_logger) << "Could not init model";
ERROR_LOG() << "Could not init model";
delete m_model;
m_model = nullptr;
return false;
@@ -55,7 +55,5 @@ private:
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
ExerciseAssignmentDialogModel *m_model;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
};
}
@@ -18,7 +18,6 @@ ExerciseAssignmentDialogModel::ExerciseAssignmentDialogModel(QObject *parent)
parent)
, m_dtc(nullptr)
, m_exmDtc(nullptr)
, m_logger(getLogger("ExerciseAssignmentDialogModel"))
{
}
@@ -47,7 +46,7 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
if (parseError.error != QJsonParseError::NoError)
{
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
INFO_LOG() << "Could not parse JSON props of building with ID "
<< currentMainStructureElement.id()
<< ". Reason: "
<< parseError.errorString()
@@ -84,13 +83,13 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
if (!m_dtc->enableInstrumentationAsset())
{
ERROR_LOG(m_logger) << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
ERROR_LOG() << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
return false;
}
if (!m_exmDtc->enableExercise())
{
ERROR_LOG(m_logger) << "Could not enable Topic Exercise from Exercise Management DTC";
ERROR_LOG() << "Could not enable Topic Exercise from Exercise Management DTC";
return false;
}
@@ -103,7 +102,7 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
};
m_dtc->mainStructureElements(cb);
INFO_LOG(m_logger) << "initModel successful";
INFO_LOG() << "initModel successful";
return true;
}
@@ -37,8 +37,6 @@ private:
private:
std::shared_ptr<Interface::Dtc> m_dtc;
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
LOGGER_T m_logger;
};
}