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

@@ -30,7 +30,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# Generate xxx_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS svcXxxCommon SHARED ${SRCS_common})
NGL_ADD_LIBRARY2(AAR SV WS svcXxxCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -57,7 +57,7 @@ SET(SRCS_client
# generate xxx_[d|f]tc.h, xxx_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS svcXxxClient SHARED ${SRCS_client})
NGL_ADD_LIBRARY2(AAR SV WS svcXxxClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -87,7 +87,7 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
# Generate xxx_db_impl.cpp/.h, xxx_db.h
CODEGEN_DATABASE(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV svcXxxServer SHARED ${SRCS_server})
NGL_ADD_LIBRARY2(AAR SV svcXxxServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -19,9 +19,8 @@ namespace XxxXxxXxx
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::FIXME, exerciseId))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
DdsHandler::~DdsHandler()
@@ -31,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
{
if(!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -47,10 +46,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ddsFts = XxxXxxXxx::Interface::Fts::create(m_ddsConnector);
bool bRet = m_ddsDts->enableAll();
INFO_LOG(m_logger) << "Dts initialised";
INFO_LOG() << "Dts initialised";
bRet &= m_ddsFts->enableAll();
INFO_LOG(m_logger) << "Fts initialised";
INFO_LOG() << "Fts initialised";
// TODO: call at the end of main_handler init:
//m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
@@ -50,8 +50,6 @@ private:
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<XxxXxxXxx::Interface::Dts> m_ddsDts;
std::shared_ptr<XxxXxxXxx::Interface::Fts> m_ddsFts;
NGL::INGLLogger &m_logger;
};
} // namespace XxxXxxXxx
@@ -9,7 +9,7 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
#include "xxx_export.h"
#include "svcxxxcommon_export.h"
namespace XxxXxxXxx
{
@@ -17,7 +17,6 @@ MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_ddsHandler(nullptr)
, m_dbHandler(nullptr)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
@@ -34,19 +33,19 @@ bool MainHandler::init(int domainId)
if (!m_dbHandler->init(0, Settings::settings(), m_logger))
{
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
ERROR_LOG() << "Initialisation dbHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
DEBUG_LOG() << "Initialisation dbHandler succesful.";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
ERROR_LOG() << "Initialisation ddsHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
// TODO
@@ -35,8 +35,5 @@ public:
private:
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
NGL::INGLLogger &m_logger;
};
} // namespace XxxXxxXxx