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_null.cpp
+6 -7
View File
@@ -6,11 +6,10 @@
*/
#include "object_mine_area_null.h"
#include <utility>
#include "special_area_provider.h"
#include <QPolygonF>
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <ngldb/dbtransaction.h>
namespace AreaEffectSimulation
@@ -74,7 +73,7 @@ bool ObjectMineAreaNull::isVirtualMine() const
int ObjectMineAreaNull::lastConcreteMineNo()
{
int lastMineNo = 0;
for (const Database::AesMineAreaTriggeredMines &mine : std::as_const(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &mine : qAsConst(m_triggeredMines))
{
// NOTE: igniterType/IgniterFunciton = 0 as long as AesMineAreaTriggeredMines does not contain values
DEBUG_LOG(m_logger) << "mine: chargeTypeId " << mine.chargeTypeId << ", mineId: " << mine.mineId;
@@ -246,7 +245,7 @@ void ObjectMineAreaNull::publishAiv()
vec.reserve(m_triggeredMines.size());
QPolygonF tmp;
tmp.reserve(m_triggeredMines.size());
for (const auto &mine : std::as_const(m_triggeredMines))
for (const auto &mine : qAsConst(m_triggeredMines))
{
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
tmp.push_back(mine.position);
@@ -286,7 +285,7 @@ bool ObjectMineAreaNull::publishTriggeredImpacts()
tis.setId(dds::core::optional<rti::core::int64>(m_setId));
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);
@@ -308,7 +307,7 @@ bool ObjectMineAreaNull::publishDusMineStatus()
dms.mines().resize(m_triggeredMines.size());
dms.setId(dds::core::optional<rti::core::int64>(m_setId));
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;
@@ -329,7 +328,7 @@ QPolygonF ObjectMineAreaNull::generateForm()
vec.reserve(m_triggeredMines.size());
QPolygonF tmp;
tmp.reserve(m_triggeredMines.size());
for (const auto &mine : std::as_const(m_triggeredMines))
for (const auto &mine : qAsConst(m_triggeredMines))
{
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
tmp.push_back(mine.position);