lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Session 026: Lts/Services Qt5:: to Qt6:: migration

Browse Source 
- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
1244 files changed
+4266 -4633
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
+4 -3
View File
@@ -9,10 +9,10 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtTest/QtTest>
#include <QtTest>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -59,6 +59,7 @@ CesTests::CesTests(QObject *parent)
, TrainingAreaBase::Interface::Fts::SendCesHitRequestHandler(nullptr)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTests"))
, m_testId(0)
, m_buildingId(0)
, m_roomId(0)
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
+3 -4
View File
@@ -24,8 +24,8 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/QHash>
#include <QtCore/QPointF>
#include <QHash>
#include <QPointF>
namespace CentralEffectSimulation
{
@@ -77,7 +77,6 @@ protected Q_SLOTS:
void testTimeout() { failExit("Test timeout"); }
void ExitSuccess();
private:
NGL::INGLLogger &m_logger;
void onSendCesHitOnBuildingRequest(const rti::core::SampleIdentity &cookie,
const Buildings::SendCesHitOnBuildingRequest &request) override;
void onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
@@ -95,7 +94,6 @@ private: // structs
};
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
@@ -112,6 +110,7 @@ private:
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_buildingId;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
+7 -5
View File
@@ -11,8 +11,8 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
/* ----------------------------------------------------------------------------------
@@ -33,13 +33,15 @@
namespace CentralEffectSimulation
{
CesTestsBlockedAreas::CesTestsBlockedAreas(QObject *parent) : QObject(parent)
CesTestsBlockedAreas::CesTestsBlockedAreas(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestsBlockedAreas"))
, m_testId(0)
, m_participantIndex(0)
, m_DynamicParticipantIndex(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_DynamicParticipantIndex(0)
{}
CesTestsBlockedAreas::~CesTestsBlockedAreas()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.h
+1 -1
View File
@@ -65,7 +65,6 @@ private: // structs
};
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
@@ -79,6 +78,7 @@ private:
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_DynamicParticipantIndex;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
+8 -6
View File
@@ -11,10 +11,10 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtCore/QDateTime>
#include <QDateTime>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -29,10 +29,12 @@
namespace CentralEffectSimulation
{
CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent) : QObject(parent)
CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
//, m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD9387781202")))
, m_logger(getLogger("CesTest"))
, m_testId(0)
, m_participantIndex(0)
, m_id(20)
@@ -40,8 +42,8 @@ CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent) : QObject(parent)
, m_DynamicParticipantIndex(0)
, m_aesItemId(5)
, m_chargeTypeId(252) // Verdeckte Ladung
, m_countEventBoobyTrap(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_countEventBoobyTrap(0)
{}
CesTestsBoobyTrap::~CesTestsBoobyTrap()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
+2 -2
View File
@@ -17,7 +17,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/QPointF>
#include <QPointF>
namespace CentralEffectSimulation
{
@@ -54,7 +54,6 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
private: // methods
void checkParticipantEvent();
@@ -88,6 +87,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_refPos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_id;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
+8 -6
View File
@@ -11,10 +11,10 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtCore/QDateTime>
#include <QDateTime>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -29,9 +29,11 @@
namespace CentralEffectSimulation
{
CesTestsGasPipe::CesTestsGasPipe(QObject *parent) : QObject(parent)
CesTestsGasPipe::CesTestsGasPipe(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestGasPipe"))
, m_testId(0)
, m_participantIndex(0)
, m_id(20)
@@ -39,8 +41,8 @@ CesTestsGasPipe::CesTestsGasPipe(QObject *parent) : QObject(parent)
, m_DynamicParticipantIndex(0)
, m_aesItemId(5)
, m_chargeTypeId(374) // SMART
, m_countEventGasPipe(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_countEventGasPipe(0)
{}
CesTestsGasPipe::~CesTestsGasPipe()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
+2 -2
View File
@@ -17,7 +17,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/QPointF>
#include <QPointF>
namespace CentralEffectSimulation
{
@@ -57,7 +57,6 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
private: // methods
void checkParticipantEvent();
@@ -91,6 +90,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_refPos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_id;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
+7 -5
View File
@@ -11,8 +11,8 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
/* ----------------------------------------------------------------------------------
@@ -32,11 +32,13 @@
namespace CentralEffectSimulation
{
CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
CesTestsGeopairing::CesTestsGeopairing(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_testId(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_logger(getLogger("CesTestsGeopairing"))
, m_testId(0)
{}
CesTestsGeopairing::~CesTestsGeopairing()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.h
+1 -2
View File
@@ -52,8 +52,6 @@ protected Q_SLOTS:
private: // methods
NGL::INGLLogger &m_logger;
void checkParicipantEvent();
private:
@@ -70,6 +68,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
};
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
+7 -5
View File
@@ -11,8 +11,8 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
/* ----------------------------------------------------------------------------------
@@ -32,11 +32,13 @@
namespace CentralEffectSimulation
{
CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
CesTestsGeopairing::CesTestsGeopairing(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_testId(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_logger(getLogger("CesTestsGeopairing"))
, m_testId(0)
{}
CesTestsGeopairing::~CesTestsGeopairing()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.h
+1 -2
View File
@@ -52,8 +52,6 @@ protected Q_SLOTS:
private: // methods
NGL::INGLLogger &m_logger;
void checkParicipantEvent();
private:
@@ -70,6 +68,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
};
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
+8 -6
View File
@@ -11,10 +11,10 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtCore/QDateTime>
#include <QDateTime>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -68,9 +68,11 @@
namespace CentralEffectSimulation
{
CesTestsMineAreas::CesTestsMineAreas(QObject *parent) : QObject(parent)
CesTestsMineAreas::CesTestsMineAreas(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestMineAreas"))
, m_testId(0)
, m_participantIndex(0)
, m_id(20)
@@ -78,8 +80,8 @@ CesTestsMineAreas::CesTestsMineAreas(QObject *parent) : QObject(parent)
, m_DynamicParticipantIndex(0)
, m_aesItemId(5)
, m_chargeTypeId(374) // SMART
, m_countEventMineAreas(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_countEventMineAreas(0)
{}
CesTestsMineAreas::~CesTestsMineAreas()
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
+2 -2
View File
@@ -17,7 +17,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/QPointF>
#include <QPointF>
namespace CentralEffectSimulation
{
@@ -57,7 +57,6 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
private: // methods
void checkParticipantEvent();
@@ -91,6 +90,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_refPos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_id;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
+3 -2
View File
@@ -11,8 +11,8 @@
#include "CentralEffectSimulation/ces_ftc.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
/* ----------------------------------------------------------------------------------
@@ -37,6 +37,7 @@ CesTestsOwnership::CesTestsOwnership(QObject *parent)
: QObject(parent)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestsOwnership"))
, m_testId(0)
, m_participantIndex(0)
, m_DynamicParticipantIndex(0)
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.h
+1 -1
View File
@@ -49,7 +49,6 @@ protected Q_SLOTS:
void ExitSuccess();
protected:
NGL::INGLLogger &m_logger;
void onSetOwnershipReply(const Core::FunctionReplyObject &replyObject) override final;
private: // methods
@@ -82,6 +81,7 @@ private:
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_DynamicParticipantIndex;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
+4 -3
View File
@@ -12,10 +12,10 @@
#include <TrainingAreaBase/tab_fts.h>
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtTest/QTest>
#include <QTest>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -37,6 +37,7 @@ cesTestsSimulatedMovement::cesTestsSimulatedMovement(QObject *parent)
, m_participantId(20)
, m_repeat(false)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("cesTestsSimulatedMovement"))
, m_testId(0)
{}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.h
+1 -1
View File
@@ -50,7 +50,6 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
private: // methods
void checkParticipantEvent();
@@ -73,6 +72,7 @@ private:
bool m_repeat;
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
};
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
+4 -3
View File
@@ -12,10 +12,10 @@
#include <TrainingAreaBase/tab_fts.h>
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTimer>
#include <QDateTime>
#include <QPolygonF>
#include <QtCore/QDateTime>
#include <QDateTime>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (example)
@@ -35,6 +35,7 @@ CesTestsSmart::CesTestsSmart(QObject *parent)
, TrainingAreaBase::Interface::Fts::SendCesHitRequestHandler(nullptr)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestsSmart"))
, m_testId(0)
, m_participantIndex(0)
, m_DynamicParticipantIndex(0)
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
+2 -2
View File
@@ -18,7 +18,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/QPointF>
#include <QPointF>
namespace CentralEffectSimulation
{
@@ -59,7 +59,6 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
private: // methods
void checkParticipantEvent();
@@ -97,6 +96,7 @@ private:
bool m_bTestsSuccessful;
LtsCoordTrans::UtmCoordinate m_housePos;
NGL::INGLLogger &m_logger;
int m_testId;
int m_participantIndex;
int m_DynamicParticipantIndex;