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

@@ -9,20 +9,19 @@ namespace DifferentialGPS
DdsHandler::DdsHandler(int domainId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
INFO_LOG(m_logger) << "--- Start DifferentialGPS DDSHandler.";
INFO_LOG() << "--- Start DifferentialGPS DDSHandler.";
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -32,8 +32,6 @@ public:
private:
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
NGL::INGLLogger &m_logger;
};
}
@@ -18,7 +18,6 @@ MainThread::MainThread(QObject *parent)
, m_dgpsTimer(new QTimer(this))
, m_tetraIfNum(0)
, m_trimbleIfNum(0)
, m_logger(getLogger("MainThread"))
, m_broadcastTime(QTime::currentTime())
, m_broadcastCycle_ms(10000)
{
@@ -60,7 +59,7 @@ bool MainThread::init(int domainId)
m_ddsHandler.reset(new DdsHandler(domainId));
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
ERROR_LOG() << "Initialisation DdsHandler failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -39,9 +39,7 @@ protected:
int m_tetraIfNum;
TrimbleIF *m_trimbleIF[2];
int m_trimbleIfNum;
NGL::INGLLogger &m_logger;
int m_trimbleIfNum;
QTime m_broadcastTime;
int m_broadcastCycle_ms;
};
@@ -33,7 +33,7 @@ void TcpSocket::startThreadInternal(const QString &hostName, quint16 port)
void TcpSocket::run()
{
DEBUG_LOG(m_logger) << "Starting thread";
DEBUG_LOG() << "Starting thread";
m_reconnectTimer = new QTimer(this);
doConnect();
exec();
@@ -54,14 +54,14 @@ void TcpSocket::doConnect()
connect(m_socket, &QTcpSocket::readyRead,
this, &TcpSocket::onReadyRead);
INFO_LOG(m_logger) << "Connecting to tcp server at "
INFO_LOG() << "Connecting to tcp server at "
<< m_hostName << ":" << m_hostPort;
m_socket->connectToHost(m_hostName, m_hostPort);
}
void TcpSocket::onConnected()
{
INFO_LOG(m_logger) << "Connected to "
INFO_LOG() << "Connected to "
<< m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_waitTime = 1;
@@ -69,13 +69,13 @@ void TcpSocket::onConnected()
void TcpSocket::onDisconnected()
{
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
}
void TcpSocket::onError(QAbstractSocket::SocketError err)
{
ERROR_LOG(m_logger) << "Socket error: " << err
ERROR_LOG() << "Socket error: " << err
<< " " << m_socket->errorString()
<< ":" << m_socket->peerPort()
<< " - trying to reconnect in " << m_waitTime << " seconds";
@@ -36,7 +36,6 @@ protected:
QString m_hostName;
quint16 m_hostPort;
QTcpSocket *m_socket;
NGL::INGLLogger &m_logger;
private:
qint32 m_waitTime;
QTimer *m_reconnectTimer;