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

@@ -12,7 +12,6 @@ namespace TrainingAreaBaseOC
ConnectionHandlerTcp::ConnectionHandlerTcp()
: m_timer(new QTimer(this))
, m_logger(getLogger("ConnectionHandlerTcp"))
{
m_timer->setInterval(5000);
connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
@@ -45,25 +44,25 @@ bool ConnectionHandlerTcp::send(const LtsUtils::SfmMessage &message)
if (!m_socket->isOpen())
{
ERROR_LOG(m_logger) << "Port is not opened!";
ERROR_LOG() << "Port is not opened!";
return false;
}
QByteArray data = LtsUtils::byteStreamFromSfmMessage(message);
DEBUG_LOG(m_logger) << "Sending frame: " << data.toHex(' ');
DEBUG_LOG() << "Sending frame: " << data.toHex(' ');
const qint64 byteswritten = m_socket->write(data);
if (byteswritten == -1)
{
ERROR_LOG(m_logger) << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
ERROR_LOG() << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
m_timer->start();
return false;
}
else if (byteswritten != data.size())
{
ERROR_LOG(m_logger) << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
ERROR_LOG() << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
return false;
}
@@ -76,10 +75,10 @@ bool ConnectionHandlerTcp::open()
m_socket->connectToHost(Settings::hostName(), Settings::port());
if (!m_socket->waitForConnected())
{
ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
return false;
}
INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" << Settings::port();
INFO_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" << Settings::port();
return true;
}
@@ -98,7 +97,7 @@ void ConnectionHandlerTcp::read()
const QByteArray ba = m_socket->readAll();
m_currentDataRead.append(ba);
DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
int idxStart = -1;
int idxEnd = -1;
@@ -108,7 +107,7 @@ void ConnectionHandlerTcp::read()
QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
LtsUtils::SfmMessage sfmMsg;
DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
try
{
@@ -116,11 +115,11 @@ void ConnectionHandlerTcp::read()
}
catch (const LtsUtils::ConversionError &ex)
{
ERROR_LOG(m_logger) << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
ERROR_LOG(m_logger) << "Faulty Data from sfm as binary " << message.toHex();
ERROR_LOG() << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
ERROR_LOG() << "Faulty Data from sfm as binary " << message.toHex();
}
INFO_LOG(m_logger) << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
INFO_LOG() << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
@@ -128,12 +127,12 @@ void ConnectionHandlerTcp::read()
}
if (m_socket->bytesAvailable() > 0)
DEBUG_LOG(m_logger) << "Still " << m_socket->bytesAvailable() << " available to be read";
DEBUG_LOG() << "Still " << m_socket->bytesAvailable() << " available to be read";
}
void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
{
DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -145,20 +144,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
case QTcpSocket::SocketError::SocketAccessError:
case QTcpSocket::SocketError::SocketResourceError:
{
ERROR_LOG(m_logger) << "Closing port trying to reopen it.";
ERROR_LOG() << "Closing port trying to reopen it.";
close();
m_timer->start();
Q_FALLTHROUGH();
}
case QTcpSocket::SocketError::RemoteHostClosedError:
{
ERROR_LOG(m_logger) << "Host closed trying to reopen.";
ERROR_LOG() << "Host closed trying to reopen.";
m_timer->start();
break;
}
default:
{
ERROR_LOG(m_logger) << errStr;
ERROR_LOG() << errStr;
close();
m_timer->start();
break;