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/object_mine_area.cpp
+19 -20
View File
@@ -6,7 +6,6 @@
*/
#include "object_mine_area.h"
#include <utility>
#include "handler_mine_area.h"
#include "qtransform.h"
#include "special_area_provider.h"
@@ -15,10 +14,10 @@
#include <AreaEffectSimulation/aes_translation.h>
#include <QtCore/QLineF>
#include <QLineF>
#include <QPolygonF>
#include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h> // LtsUtils::toOptional
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h> // LtsUtils::toOptional
#include <LtsUtilsCore/dds_bitarray.h>
#include <ngldb/dbtransaction.h>
namespace AreaEffectSimulation
@@ -117,7 +116,7 @@ int ObjectMineArea::getMineIdByIndex(int index) const
DEBUG_LOG(m_logger) << "getMineIdByIndex index: " << index;
int count = 0;
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
{
DEBUG_LOG(m_logger) << "tm: mineId: " << tm.mineId;
if (count == index)
@@ -151,7 +150,7 @@ void ObjectMineArea::clearCorridor(const AesItemView &aiv)
QVector<int> minesToTrigger;
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zone);
if (aivUtmPoly.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -171,14 +170,14 @@ void ObjectMineArea::clearBuildings()
DEBUG_LOG(m_logger) << "mseIds size: " << mseIds.size();
QVector<int> minesToTrigger;
for (int mseId : std::as_const(mseIds))
for (int mseId : qAsConst(mseIds))
{
DEBUG_LOG(m_logger) << "mseId: " << mseId;
const QPolygonF &footprint = m_mainHandler->dds()->ismDtc()->getUtmFootprintById(mseId, zoneOut, isGroundLevel);
minesToTrigger.clear();
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
{
const LtsCoordTrans::UtmCoordinate &utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zoneOut);
if (footprint.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -350,7 +349,7 @@ bool ObjectMineArea::publishTriggeredImpacts()
tis.bitfield().resize((m_triggeredMines.size() + 7) / 8);
int i = 0;
for (const auto &mine : std::as_const(m_triggeredMines))
for (const auto &mine : qAsConst(m_triggeredMines))
{
// Triggered Impact == 0, if mine is disarmed/exploded
LtsUtils::BitArray::setBit(tis.bitfield(), i++, !mine.isTriggered);
@@ -374,7 +373,7 @@ bool ObjectMineArea::publishDusMineStatus()
dms.mines().resize(m_triggeredMines.size());
int i = 0;
for (const auto &mine : std::as_const(m_triggeredMines))
for (const auto &mine : qAsConst(m_triggeredMines))
{
const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()});
dms.mines()[i++] = entry;
@@ -400,7 +399,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> polyUtm;
polyUtm.reserve(m_mineAreaPolygon.size());
for (const QPointF &point : std::as_const(m_mineAreaPolygon))
for (const QPointF &point : qAsConst(m_mineAreaPolygon))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.x(), point.y());
DEBUG_LOG(m_logger) << "mineArea Polygon: " << posUtm.mgrs();
@@ -409,14 +408,14 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> minesUtm;
minesUtm.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position.x(), tm.position.y());
DEBUG_LOG(m_logger) << "triggeredMines: " << posUtm.mgrs();
minesUtm.append(posUtm);
}
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
{
Core::GeoPosition2D geoPos = Core::GeoPosition2D(tm.position.x(), tm.position.y());
vec.append(geoPos);
@@ -435,7 +434,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
// In case of MineLayerPoisition (Not Sorting) with DUS Mines and more than 2 Mines (1 Segment) we
// ignore the mines and just use the segments positions (Start is the startingPos of the the first segment
// then add all end Positions of all segments
for (const auto &segment : std::as_const(m_segments))
for (const auto &segment : qAsConst(m_segments))
{
if (vecSorted.empty())
vecSorted.push_back(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()));
@@ -473,7 +472,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
DEBUG_LOG(m_logger) << "Distance between startPos and pos: " << length;
Core::GeoPosition2D newPos = pos;
for (const Core::GeoPosition2D &pos2 : std::as_const(vec))
for (const Core::GeoPosition2D &pos2 : qAsConst(vec))
{
if (pos2 == pos || pos2 == startPos)
continue;
@@ -1035,7 +1034,7 @@ bool ObjectMineArea::containsPointInExpandedMinefield(const QPointF &positionGeo
const double distance = 0.5;
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
{
double x = pointUtm.x - mineAreaPointUTM.x();
@@ -1139,7 +1138,7 @@ void ObjectMineArea::updateMineByOldMineId(Database::AesMineAreaTriggeredMines &
int ObjectMineArea::mineCount()
{
double totalLength = 0.0;
for (const Database::AesMineAreaSegment &segment : std::as_const(m_segments))
for (const Database::AesMineAreaSegment &segment : qAsConst(m_segments))
{
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.startPosition);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.endPosition, startPositionUtm.zone);
@@ -1352,7 +1351,7 @@ void ObjectMineArea::onPublishData()
std::vector<MineSegment> segVec;
segVec.reserve(m_segments.size());
for (const auto &segment : std::as_const(m_segments))
for (const auto &segment : qAsConst(m_segments))
segVec.emplace_back(
MineSegment(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()), Core::GeoPosition2D(segment.endPosition.x(), segment.endPosition.y())));
@@ -1443,7 +1442,7 @@ void ObjectMineArea::publishAiv()
aiv2.effectStart(toMSec(m_data.effectStart));
aiv2.form().clear();
aiv2.form().reserve(m_triggeredMines.size());
for (const auto &tm : std::as_const(m_triggeredMines))
for (const auto &tm : qAsConst(m_triggeredMines))
aiv2.form().resize(aiv2.form().size() + 1, Core::GeoPosition(tm.position.x(), tm.position.y(), 0.0));
aiv2.boundingBoxBottomLeft(aiv.boundingBoxBottomLeft());
aiv2.boundingBoxTopRight(aiv.boundingBoxTopRight());
@@ -1494,7 +1493,7 @@ Core::FunctionReplyObject ObjectMineArea::createGeoSegmentsFromMineData(double &
std::vector<Core::GeoPosition2D> tempMinePos;
tempMinePos.reserve(m_triggeredMines.size() + mineData.size());
for (const auto &t : std::as_const(m_triggeredMines))
for (const auto &t : qAsConst(m_triggeredMines))
tempMinePos.emplace_back(Core::GeoPosition2D(t.position.x(), t.position.y()));
for (const auto &md : mineData)