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

@@ -23,7 +23,6 @@ HgrAndMineSearchDialog::HgrAndMineSearchDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
, m_session(nullptr)
, m_ui(new Ui::HgrAndMineSearchDialog)
, m_logger(getLogger("HgrAndMineSearchDialog"))
{
m_ui->setupUi(this);
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &HgrAndMineSearchDialog::onPrint);
@@ -81,7 +81,5 @@ private:
LtsSession::LtsSession *m_session;
HgrAndMineSearchModel *m_model {nullptr};
Ui::HgrAndMineSearchDialog *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -44,7 +44,6 @@ HgrAndMineSearchModel::HgrAndMineSearchModel(QObject *parent)
, m_chunksRequested(0)
, m_chunksReceived(0)
, m_session(nullptr)
, m_logger(getLogger("HgrAndMineSearchModel"))
{}
bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
@@ -68,44 +67,44 @@ bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
if (!m_ppmDtc->enableEquipmentSystemEventFtcReply())
{
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
ERROR_LOG() << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
return false;
}
if (!m_ppmFtc->enableEquipmentSystemEventData())
{
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
ERROR_LOG() << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
return false;
}
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;
}
if (!m_pdmDtc->enableEquipmentSystemEventFilter())
{
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
ERROR_LOG() << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
return false;
}
if (!m_pdmDtc->enableEventFilterHgrMineSearch())
{
ERROR_LOG(m_logger) << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
ERROR_LOG() << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
return false;
}
if (!m_aesDtc->enableMineArea())
{
ERROR_LOG(m_logger) << " Could not enable MineArea Data-Topic in AES DTC!";
ERROR_LOG() << " Could not enable MineArea Data-Topic in AES DTC!";
return false;
}
if (!m_aesDtc->enableDusMineState())
{
ERROR_LOG(m_logger) << " Could not enable DusMineState Data-Topic in AES DTC!";
ERROR_LOG() << " Could not enable DusMineState Data-Topic in AES DTC!";
return false;
}
@@ -106,9 +106,6 @@ private:
QVariant m_typeCbxFilterContent;
LtsSession::LtsSession *m_session;
NGL::INGLLogger &m_logger;
friend class HgrAndMineSearchProxyModel;
};