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/AreaEffectSimulation/main_handler.cpp
+12 -10
View File
@@ -46,8 +46,10 @@
namespace AreaEffectSimulation
{
MainHandler::MainHandler(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("MainHandler"))
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
QRandomGenerator(time(nullptr));
#else
@@ -157,7 +159,7 @@ bool MainHandler::initAESHandler()
// prepare some basics for HandlerExplosionCluster
// - TrajectoryGenerator
// - LtsElevationManager
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster...";
DEBUG_LOG(m_logger) << LOGFUNCTION << " ****** std::make_shared<HandlerExplosionCluster...";
const int exerciseId = dds()->exerciseId();
LtsElevation::LTS_ELEVATION_MANAGER_TYPE ltsElevationManager = LtsElevation::LtsElevationManager::createInstance(exerciseId,
dds()->exmDtc(),
@@ -175,7 +177,7 @@ bool MainHandler::initAESHandler()
#ifndef Q_OS_WIN // GUEZE-2195
if (!ltsElevationManager)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " LtsElevation::createInstance failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " LtsElevation::createInstance failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}
@@ -187,7 +189,7 @@ bool MainHandler::initAESHandler()
this->dds()->asmDtc());
if (!trajectoryGenerator)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrajectoryGenerator::getInstance failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " TrajectoryGenerator::getInstance failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}
@@ -195,7 +197,7 @@ bool MainHandler::initAESHandler()
m_handlerExplosionCluster = std::make_shared<HandlerExplosionCluster>(this);
if (!m_handlerExplosionCluster->init())
return false;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster... DONE";
DEBUG_LOG(m_logger) << LOGFUNCTION << " ****** std::make_shared<HandlerExplosionCluster... DONE";
m_handlerFunctionalArea = std::make_shared<HandlerFunctionalArea>(this);
if (!m_handlerFunctionalArea->init())
@@ -247,7 +249,7 @@ bool MainHandler::initAESHandler()
m_handlerBorderline = std::make_shared<HandlerBorderline>(this);
if (!m_handlerBorderline->init())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerBorderline failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerBorderline failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}
@@ -256,7 +258,7 @@ bool MainHandler::initAESHandler()
m_handlerGasPipe = std::make_shared<HandlerGasPipe>(this);
if (!m_handlerGasPipe->init())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerGasPipe failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerGasPipe failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}
@@ -265,7 +267,7 @@ bool MainHandler::initAESHandler()
m_handlerChargeEffect = std::make_shared<HandlerChargeEffect>(this);
if (!m_handlerChargeEffect->init())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerChargeEffect failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}
@@ -278,7 +280,7 @@ bool MainHandler::initAESHandler()
m_handlerEffector = std::make_shared<HandlerEffector>(this);
if (!m_handlerEffector->init())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerChargeEffect failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
return false;
}