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

@@ -26,7 +26,6 @@ AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent)
, m_keepAliveTime(Settings::getAvsKeepAliveTime())
, m_avsIfConnectionState(AvsIfConnectionState::Undefined)
, m_socket(nullptr)
, m_logger(getLogger("AVS_Interface"))
{
doConnect();
@@ -46,7 +45,7 @@ AvsInterface::~AvsInterface()
void AvsInterface::doConnect()
{
DEBUG_LOG(m_logger) << "doConnect TCP-Socket ";
DEBUG_LOG() << "doConnect TCP-Socket ";
if (m_socket)
m_socket->deleteLater();
@@ -63,7 +62,7 @@ void AvsInterface::doConnect()
if (m_tryReconnect)
{
INFO_LOG(m_logger) << "Try reconnect to host: " << m_hostName
INFO_LOG() << "Try reconnect to host: " << m_hostName
<< " port: " << m_hostPort
<< " ip-address: " << m_ipAddressDNS;
@@ -79,12 +78,12 @@ void AvsInterface::start(const QString &hostName, quint16 port)
const QList<QHostAddress> ipList = hostInfo.addresses();
if (ipList.isEmpty())
{
ERROR_LOG(m_logger) << "Non ip-address found for hostname: " << hostName;
ERROR_LOG() << "Non ip-address found for hostname: " << hostName;
m_ipAddressDNS.clear();
}
else
{
INFO_LOG(m_logger) << "Try connect to AVS: " << hostName
INFO_LOG() << "Try connect to AVS: " << hostName
<< " port: " << port
<< " ip-address: " << ipList.at(0).toString();
@@ -98,7 +97,7 @@ void AvsInterface::start(const QString &hostName, quint16 port)
void AvsInterface::onConnected()
{
INFO_LOG(m_logger) << "Connected to "
INFO_LOG() << "Connected to "
<< m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_waitTime = 1;
@@ -113,7 +112,7 @@ void AvsInterface::onConnected()
void AvsInterface::onDisonnected()
{
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_avsKeepAliveTimer->stop();
@@ -126,7 +125,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
{
if (m_enableTryReconnect)
{
ERROR_LOG(m_logger) << "Socket error: " << err
ERROR_LOG() << "Socket error: " << err
<< " \"" << m_socket->errorString() << "\""
<< " Hostname: " << m_hostName
<< " Port:" << m_hostPort
@@ -135,7 +134,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
}
else
{
ERROR_LOG(m_logger) << "Socket error: " << err
ERROR_LOG() << "Socket error: " << err
<< " \"" << m_socket->errorString() << "\""
<< " Hostname: " << m_hostName
<< " Port:" << m_hostPort
@@ -180,7 +179,7 @@ void AvsInterface::onReadyRead()
if (data.isEmpty())
continue;
INFO_LOG(m_logger) << "Incoming RCP_AVA: '" << data << "'";
INFO_LOG() << "Incoming RCP_AVA: '" << data << "'";
int cmdNr = -1;
bool bOk = false;
@@ -237,11 +236,11 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
{
bool bOk = true;
INFO_LOG(m_logger) << "Send command: " << qba.trimmed();
INFO_LOG() << "Send command: " << qba.trimmed();
if (m_socket->state() != QTcpSocket::ConnectedState)
{
ERROR_LOG(m_logger) << "sendCommand()"
ERROR_LOG() << "sendCommand()"
<< " '" << qba.trimmed()
<< "' No socket connection established.";
return false;
@@ -252,7 +251,7 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
if (trxBytes != qba.size())
{
bOk = false;
ERROR_LOG(m_logger) << "Insufficient number of tansfered bytes."
ERROR_LOG() << "Insufficient number of tansfered bytes."
<< " Soll: " << trxBytes << " Ist: " << qba.size();
}
m_socket->flush();