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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
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/handler_mine_area.cpp
+24 -24
View File
@@ -203,7 +203,7 @@ int HandlerMineArea::totalAreasCentral() const { return s_areaCountCentral[stati
template <typename T> T getValueHelper(T in) { return in; }
template <typename T> T getValueHelper(const dds::core::optional<T> &in) { return in.is_set() ? in.get() : T(); }
template <typename T> T getValueHelper(const dds::core::optional<T> &in) { return in.has_value() ? in.get() : T(); }
template <typename T> static void fillData(const T &src, Database::AesMineArea &dst)
{
@@ -211,12 +211,12 @@ template <typename T> static void fillData(const T &src, Database::AesMineArea &
dst.id = src.id;
dst.name = QString::fromStdString(src.name);
dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectDuration = src.effectDuration;
dst.effectSourceId = src.effectSourceId;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
dst.chargeTypeId = src.chargeStruct.chargeTypeId;
dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
dst.density = src.density;
dst.width = src.width;
dst.layingProcedureTypeId = src.layingProcedureType;
@@ -254,7 +254,7 @@ void HandlerMineArea::onMineAreaModifyRequest(const rti::core::SampleIdentity &c
template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateRequest(const T &request)
{
// if ( !isDusMineArea(request.chargeTypeId())
// && (totalAreas() >= s_maxActiveAreas[AesType::AtMineArea] && request.effectStart.is_set()))
// && (totalAreas() >= s_maxActiveAreas[AesType::AtMineArea] && request.effectStart.has_value()))
// return Core::FunctionReplyObject(1, tr_lts("dds", "Too many peripheral mine areas."));
Database::AesMineArea newData;
@@ -302,7 +302,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
bool isCentral = ifs->checkIsCentral(_form);
if (isCentral)
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] && request.effectStart.is_set())
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] && request.effectStart.has_value())
{
ifs->removeObject(); // Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -330,14 +330,14 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
{
if (request.effectStart.is_set())
if (request.effectStart.has_value())
--pzAbwWMiSafe;
}
if (pzAbwWMiSafe < 0)
pzAbwWMiSafe = 0;
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe && request.effectStart.is_set())
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe && request.effectStart.has_value())
{
ifs->removeObject(); // Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -347,7 +347,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
{
if (request.effectStart.is_set())
if (request.effectStart.has_value())
++m_totalPzAbwWMis;
}
}
@@ -399,7 +399,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
return ret;
}
if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
return removeObject(ifs);
Database::AesMineArea newData(ifs->data());
@@ -423,12 +423,12 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
/*!
* If the effect start added after creation, the max amount need to be checked
*/
if (!ifs->isActivationTimeSet() && request.effectStart.is_set())
if (!ifs->isActivationTimeSet() && request.effectStart.has_value())
{
if (isCentral)
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] /*&& request.effectStart.is_set()*/)
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] /*&& request.effectStart.has_value()*/)
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many central mine areas."));
ret = ifs->checkDensity(newData.density, totalLength, s_maxCentralSingleMinesCount);
@@ -454,7 +454,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
if (pzAbwWMiSafe < 0)
pzAbwWMiSafe = 0;
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe /*&& request.effectStart.is_set()*/)
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe /*&& request.effectStart.has_value()*/)
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many peripheral mine areas."));
if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
@@ -465,7 +465,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
}
// For counting, only Elements being at least prepared are important:
if (request.effectStart.is_set() && ifs->isObjectModifiable())
if (request.effectStart.has_value() && ifs->isObjectModifiable())
{
// Calculate new polygon here. Not nice, though
@@ -482,7 +482,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
{
if (request.effectStart.is_set())
if (request.effectStart.has_value())
--pzAbwWMiSafe;
}
@@ -601,7 +601,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
if (request.mineAreaId == 0)
{
// If single mine...
if (request.mineId.is_set())
if (request.mineId.has_value())
{
DEBUG_LOG(m_logger) << "Checking in DUS-Mine-Areas";
bool found = false;
@@ -638,7 +638,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
return Core::FunctionReplyObject(request.mineAreaId, tr_lts("dds", "Mine area with id %1 not found.")).arg(request.mineAreaId);
bool bOk;
if (request.mineId.is_set())
if (request.mineId.has_value())
bOk = ifs->resetMine(request.mineId.get());
else
bOk = ifs->resetMines();
@@ -658,9 +658,9 @@ void HandlerMineArea::onMineTriggered(const TrainingAreaBase::MineTriggered &dat
mtr.mineAreaId = data.mineAreaId;
// from tab - mine area mine index starts at 1 ...
mtr.mineId = data.mineAreaId == 0 ? data.mineIndex : data.mineIndex - 1;
if (data.position.is_set())
if (data.position.has_value())
mtr.position = data.position.get();
if (data.chargeTypeId.is_set())
if (data.chargeTypeId.has_value())
mtr.chargeTypeId = data.chargeTypeId.get();
auto ret = mineTriggeredRequest(mtr);
@@ -680,14 +680,14 @@ Core::FunctionReplyObject HandlerMineArea::mineTriggeredRequest(const MineTrigge
{
DEBUG_LOG(m_logger) << "mineTriggeredRequest: " << request;
// NOTE: igniterType/IgniterFunciton = 0 as long as MineTriggeredRequest does not contain values
if (request.mineAreaId == 0 || (request.chargeTypeId.is_set() && isConcreteMine(request.chargeTypeId.get(), 0, 0)))
if (request.mineAreaId == 0 || (request.chargeTypeId.has_value() && isConcreteMine(request.chargeTypeId.get(), 0, 0)))
{
int chargeTypeId = request.chargeTypeId.is_set() ? request.chargeTypeId.get() : 0;
int chargeTypeId = request.chargeTypeId.has_value() ? request.chargeTypeId.get() : 0;
// DUS Mines:
// NOTE: igniterType/IgniterFunciton = 0 as long as MineTriggeredRequest does not contain values
QPointF position;
if (request.position.is_set() && !isFromMineLayer(chargeTypeId, 0, 0))
if (request.position.has_value() && !isFromMineLayer(chargeTypeId, 0, 0))
{
position.setX(request.position.get().lon);
position.setY(request.position.get().lat);
@@ -748,7 +748,7 @@ Core::FunctionReplyObject HandlerMineArea::mineTriggeredRequest(const MineTrigge
if (mine.id != 0) // mine did exist already
{
if (request.position.is_set()) // update position
if (request.position.has_value()) // update position
mine.position = position;
}
@@ -1444,7 +1444,7 @@ QPolygonF HandlerMineArea::msGetBoundingBoxPolygon(const QPolygonF &minen, doubl
bool HandlerMineArea::triggerUnpairedMine(const MineTriggeredRequest &request)
{
if (!request.position.is_set())
if (!request.position.has_value())
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " failed, because there is no position.";