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/GuezMinelayerProcessing/handler_minelayer_data.cpp
+8 -43
View File
@@ -9,18 +9,14 @@
#include "handler_minelayer_data.h"
#if BUILD_RTI
#include <AreaEffectSimulation/aes_ftc.h>
#endif
#include <AssetManagement/asm_dtc.h>
#include <ExerciseManagement/exm_dtc.h>
#include "dds_handler.h"
#include "zssi_wi_Minenfeld_Interpreter.h"
#include <QtCore/QLineF>
#if BUILD_RTI
#include <QLineF>
namespace GuezMinelayerProcessing
{
@@ -28,15 +24,13 @@ namespace GuezMinelayerProcessing
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
, m_ddsHandler(ddsHandler)
#if BUILD_RTI
, m_tabDtc(nullptr)
, m_ppmDtc(nullptr)
, m_aesFtc(nullptr)
#endif
, m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
, m_minefieldInterpreterTimer(new QTimer(this))
, m_logger(getLogger("HandlerMinelayerData"))
{}
HandlerMinelayerData::~HandlerMinelayerData()
@@ -44,24 +38,19 @@ HandlerMinelayerData::~HandlerMinelayerData()
bool HandlerMinelayerData::init()
{
#if BUILD_RTI
// AES-Ftc
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
if (!ret)
{
ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaModifyFromCtaData()";
ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
return false;
}
#endif
// Data from training area base
m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->ddsConnector());
bool ret = true;
#if BUILD_RTI
ret &= m_tabDtc->enableSpecialSensorData();
#endif
ret &= m_tabDtc->enableMinelayerTrailerData();
ret &= m_tabDtc->enableMinelayerThrowerData();
if (!ret)
@@ -70,17 +59,13 @@ bool HandlerMinelayerData::init()
return false;
}
#if BUILD_RTI
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::specialSensorDataChanged, this, &HandlerMinelayerData::onSpecialSensorDataChanged);
#endif
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerTrailerDataChanged, this, &HandlerMinelayerData::onMinelayerTrailerData);
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerThrowerDataChanged, this, &HandlerMinelayerData::onMinelayerThrowerData);
// PPM for partyId Mapping
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
#if BUILD_RTI
ret &= m_ppmDtc->enableParticipant();
#endif
if (!ret)
{
ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
@@ -98,7 +83,7 @@ bool HandlerMinelayerData::init()
return ret;
}
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType)
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType)
{
if (modType != DataModification::eAdded &&
modType != DataModification::eModified)
@@ -159,7 +144,7 @@ void HandlerMinelayerData::convertMinelayerDataToXdrData(const TrainingAreaBase:
outData.verlegedaten.anzahl_verlegter_minen = inData.mineCount();
}
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType)
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType)
{
if ((modType == DataModification::eAdded) ||
(modType == DataModification::eModified))
@@ -202,7 +187,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
}
}
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType)
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType)
{
if ((modType == DataModification::eAdded) ||
(modType == DataModification::eModified))
@@ -306,7 +291,6 @@ static inline double compassFromMathAngleForSfm(int mathAngle)
void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt)
{
#if BUILD_RTI
AreaEffectSimulation::MineArea outData;
outData.participantId(minefield.header.identitaet);
outData.partyId(partyIdFromEquipmentNumber(minefield.header.identitaet)); // Get from PPM;
@@ -349,7 +333,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
// request create mine area from aes
m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
#endif
}
void HandlerMinelayerData::onStartMinefieldInterpreter()
@@ -366,23 +350,4 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
}
} // namespace GuezMinelayerProcessing
#else // BUILD_RTI
namespace GuezMinelayerProcessing
{
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
, m_ddsHandler(ddsHandler)
{}
HandlerMinelayerData::~HandlerMinelayerData()
{}
} // namespace GuezMinelayerProcessing
#endif // BUILD_RTI
}