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

@@ -48,7 +48,6 @@ SetRecordingDialog::SetRecordingDialog(QWidget *parent)
, m_model(nullptr)
, m_checkStateProxyModel(nullptr)
, m_timerUpdate(nullptr)
, m_logger(getLogger("SetRecordingDialog"))
{
m_ui->setupUi(this);
setOnlineHelpFilename(QStringLiteral("Ressourcen-Exercise_Assignment"));
@@ -74,7 +73,7 @@ bool SetRecordingDialog::init(const std::shared_ptr<Interface::Dtc> &ismDtc, con
if (!(m_ismDtc->enableMainStructureElement() &&
m_ismFtc->enableMainStructureElementModify()))
{
ERROR_LOG(m_logger) << "Could not enable ISM topics";
ERROR_LOG() << "Could not enable ISM topics";
return false;
}
@@ -89,7 +88,7 @@ bool SetRecordingDialog::init(const std::shared_ptr<Interface::Dtc> &ismDtc, con
{
delete m_model;
m_model = nullptr;
ERROR_LOG(m_logger) << "Could not init model";
ERROR_LOG() << "Could not init model";
return false;
}
@@ -53,8 +53,6 @@ private:
SetRecordingCheckStateProxyModel *m_checkStateProxyModel;
QTimer *m_timerUpdate;
bool update = false;
LOGGER_T m_logger;
};
}
@@ -16,7 +16,6 @@ namespace InfrastructureManagement
SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent)
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name") })
, m_dtc(nullptr)
, m_logger(getLogger("InfrastructureManagement"))
{
}
@@ -54,7 +53,7 @@ bool SetRecordingDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &d
if (!(m_dtc->enableMainStructureElement() &&
m_dtc->enableMountingPointAsset()))
{
ERROR_LOG(m_logger) << "Could not enable Datatopics";
ERROR_LOG() << "Could not enable Datatopics";
return false;
}
@@ -63,7 +62,7 @@ bool SetRecordingDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &d
connect(m_dataInterface.get(), &ForeignDataInterface::mountingPointChanged,
this, &SetRecordingDialogModel::onMountingPointChanged);
INFO_LOG(m_logger) << "initModel successfull";
INFO_LOG() << "initModel successfull";
initData();
@@ -122,7 +121,7 @@ void SetRecordingDialogModel::initData()
if(mapGroup.contains(groupId))
continue;
const QString sectionText = InfrastructureManagement::toString(static_cast<InfrastructureManagement::BuildingGroup_def::type>(groupId));
DEBUG_LOG(m_logger)<<" >> Adding section >> "<<sectionText;
DEBUG_LOG()<<" >> Adding section >> "<<sectionText;
NGLTreeItem *sectionRoot = new NGLTreeItem(sectionText);
mapGroup.insert(groupId, sectionRoot);
m_rootItem->appendChild(mapGroup.value(groupId));
@@ -64,8 +64,6 @@ private:
private:
std::shared_ptr<Interface::Dtc> m_dtc;
std::shared_ptr<InfrastructureManagement::ForeignDataInterface> m_dataInterface;
LOGGER_T m_logger;
};
}
Q_DECLARE_METATYPE(InfrastructureManagement::SimpleRecordingData)