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

@@ -25,7 +25,6 @@ HandlerSanNineLiner::HandlerSanNineLiner(const std::shared_ptr<DdsHandler> &ddsH
, Interface::Fts::SanNineLinerRemoveRequestHandler(ddsHandler->fts())
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("HandlerSanNineLiner"))
{}
HandlerSanNineLiner::~HandlerSanNineLiner()
@@ -44,7 +43,7 @@ bool HandlerSanNineLiner::init()
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
bRet = false;
return;
}
@@ -52,7 +51,7 @@ bool HandlerSanNineLiner::init()
};
if (!m_db->select(cbSanNineLiner) || !bRet)
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -62,7 +61,7 @@ bool HandlerSanNineLiner::init()
ObjectSanNineLiner *objSan = m_mapObjectSanNineLiner.value(data.nineLinerId);
if (!objSan)
{
WARNING_LOG(m_logger) << "Cannot find nineLiner Id = " << data.nineLinerId
WARNING_LOG() << "Cannot find nineLiner Id = " << data.nineLinerId
<< " for categoryLineId " << data.id;
return;
}
@@ -71,7 +70,7 @@ bool HandlerSanNineLiner::init()
if (!m_db->select(cb))
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -97,7 +96,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
INFO_LOG(m_logger) << "lines: " << request.lines();
INFO_LOG() << "lines: " << request.lines();
Core::FunctionReplyObject ret;
ObjectSanNineLiner *ifs = nullptr;
@@ -110,7 +109,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
{
delete ifs;
ifs = nullptr;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
}
else
{
@@ -133,22 +132,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
// delete old entries
if (!m_db->removeCategoryLinesPerNineLiner(data.id))
ERROR_LOG(m_logger) << "Error while deleting old entries for nineLinerId " << data.id;
ERROR_LOG() << "Error while deleting old entries for nineLinerId " << data.id;
ifs->removeCategoryLines();
// line3 - line9 in object_san_category_line
INFO_LOG(m_logger) << "data.id: " << data.id;
INFO_LOG() << "data.id: " << data.id;
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
INFO_LOG() << "LinesCategory count: " << linesCategory.count();
for (Database::SanCategoryLine cl : std::as_const(linesCategory))
{
ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db));
ret = ifsCl->createObject(cl);
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
cl.id = ifsCl->getId();