Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,124 @@
|
||||
/**
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QStringList>
|
||||
#include <QTcpSocket>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include "main_sim.h"
|
||||
|
||||
//
|
||||
// PayloadSender
|
||||
//
|
||||
PayloadSender::PayloadSender(int numByte, int ctrFail, QTcpSocket *s, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_socket(s)
|
||||
, m_timer(new QTimer(this))
|
||||
, m_char('1')
|
||||
, m_numByte(numByte)
|
||||
, m_ctrFail(ctrFail)
|
||||
{
|
||||
m_timer->setInterval(10 * 1000); // 10s
|
||||
m_timer->setSingleShot(false);
|
||||
m_timer->start();
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &PayloadSender::onTimeout);
|
||||
}
|
||||
|
||||
PayloadSender::~PayloadSender()
|
||||
{
|
||||
if (m_socket->state() != QAbstractSocket::UnconnectedState)
|
||||
{
|
||||
m_socket->disconnectFromHost();
|
||||
m_socket->waitForDisconnected(2000);
|
||||
}
|
||||
delete m_socket;
|
||||
delete m_timer;
|
||||
}
|
||||
|
||||
void PayloadSender::onTimeout()
|
||||
{
|
||||
static int ctrFail = 0;
|
||||
|
||||
ctrFail++;
|
||||
bool failure = ((ctrFail >= m_ctrFail) && (ctrFail <= (m_ctrFail + 2)));
|
||||
|
||||
if (!failure)
|
||||
{
|
||||
qDebug() << "Sending data to socket " << m_socket << " content: 256 * 0x" << QString::number(m_char, 16);
|
||||
QByteArray ba(m_numByte, m_char++);
|
||||
m_socket->write(ba);
|
||||
}
|
||||
else
|
||||
qDebug() << " +++ Failure: Sending data ";
|
||||
}
|
||||
|
||||
//
|
||||
// TcpTestServer
|
||||
//
|
||||
TcpTestServer::TcpTestServer(int numByte, int ctrFail, QObject *parent)
|
||||
: QTcpServer(parent)
|
||||
, m_numByte(numByte)
|
||||
, m_ctrFail(ctrFail)
|
||||
{
|
||||
connect(this, &TcpTestServer::newConnection,
|
||||
this, &TcpTestServer::onNewIncomingConnection);
|
||||
}
|
||||
|
||||
TcpTestServer::~TcpTestServer()
|
||||
{
|
||||
qDeleteAll(m_openConnections);
|
||||
}
|
||||
|
||||
void TcpTestServer::onNewIncomingConnection()
|
||||
{
|
||||
QTcpSocket *newSocket = nextPendingConnection();
|
||||
if (!newSocket)
|
||||
return;
|
||||
PayloadSender *ps = new PayloadSender(m_numByte, m_ctrFail, newSocket, this);
|
||||
|
||||
connect(newSocket, &QTcpSocket::disconnected,
|
||||
ps, &PayloadSender::deleteLater);
|
||||
|
||||
qDebug() << "Created new payload sender" << ps << "for socket " << newSocket;
|
||||
m_openConnections += ps;
|
||||
|
||||
connect(ps, &PayloadSender::destroyed,
|
||||
this, &TcpTestServer::onPayloadSenderDestroyed);
|
||||
}
|
||||
|
||||
void TcpTestServer::onPayloadSenderDestroyed(QObject *obj)
|
||||
{
|
||||
qDebug() << "Payload sender " << obj << "destroyed";
|
||||
m_openConnections -= obj;
|
||||
}
|
||||
|
||||
//
|
||||
// main
|
||||
//
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
unsigned short port = 1234;
|
||||
int numByte = 40;
|
||||
int ctrFail = -10;
|
||||
if (app.arguments().size() > 1) port = app.arguments().at(1).toInt();
|
||||
if (app.arguments().size() > 2) numByte = app.arguments().at(2).toInt();
|
||||
if (app.arguments().size() > 3) ctrFail = app.arguments().at(3).toInt();
|
||||
|
||||
|
||||
TcpTestServer *srv = new TcpTestServer(numByte, ctrFail);
|
||||
if (!srv->listen(QHostAddress::Any, port))
|
||||
return 1;
|
||||
|
||||
int ret = app.exec();
|
||||
|
||||
delete srv;
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTcpServer>
|
||||
|
||||
class QTimer;
|
||||
class PayloadSender : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
PayloadSender(int numByte, int ctrFail, QTcpSocket *s, QObject *parent = nullptr);
|
||||
~PayloadSender();
|
||||
|
||||
private Q_SLOTS:
|
||||
void onTimeout();
|
||||
private:
|
||||
QTcpSocket *m_socket;
|
||||
QTimer *m_timer;
|
||||
char m_char;
|
||||
int m_numByte;
|
||||
int m_ctrFail;
|
||||
};
|
||||
|
||||
class TcpTestServer : public QTcpServer
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TcpTestServer(int numByte, int ctrFail, QObject *parent = nullptr);
|
||||
~TcpTestServer();
|
||||
|
||||
private Q_SLOTS:
|
||||
void onNewIncomingConnection();
|
||||
void onPayloadSenderDestroyed(QObject *obj);
|
||||
private:
|
||||
QSet<QObject *> m_openConnections;
|
||||
int m_numByte;
|
||||
int m_ctrFail;
|
||||
};
|
||||
Reference in new issue
Block a user