Session 026: Lts/Services Qt5:: to Qt6:: migration
- 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:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+10
-11
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "handler_mine_area.h"
|
||||
#include <utility>
|
||||
#include "Utils/polygons.h"
|
||||
#include "handler_effect_cluster.h"
|
||||
#include "handler_mine_corridor.h"
|
||||
@@ -15,7 +14,7 @@
|
||||
#include "settings.h"
|
||||
#include <QPainterPath>
|
||||
#include <QPolygonF>
|
||||
#include <QtCore/QSet>
|
||||
#include <QSet>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
|
||||
|
||||
@@ -70,7 +69,7 @@ bool HandlerMineArea::init()
|
||||
}
|
||||
|
||||
// create area mine objects
|
||||
for (const Database::AesMineArea &area : std::as_const(areaVec))
|
||||
for (const Database::AesMineArea &area : qAsConst(areaVec))
|
||||
{
|
||||
|
||||
if (area.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery && !area.isCentral
|
||||
@@ -160,7 +159,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
|
||||
DEBUG_LOG(m_logger) << "Putting mines from " << aesId << " into other MineAreas if applicable or in NullArea.";
|
||||
|
||||
// check if any other MineArea will handle some of the mines
|
||||
for (const auto &mineArea : std::as_const(m_objectMap))
|
||||
for (const auto &mineArea : qAsConst(m_objectMap))
|
||||
{
|
||||
if (mineArea->id() != aesId)
|
||||
{
|
||||
@@ -186,7 +185,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
|
||||
|
||||
bool HandlerMineArea::removeDuplicateMine(int mineId)
|
||||
{
|
||||
for (const auto &mineArea : std::as_const(m_objectMap))
|
||||
for (const auto &mineArea : qAsConst(m_objectMap))
|
||||
{
|
||||
if (mineArea->isDusMineArea() && mineArea->hasMine(mineId))
|
||||
{
|
||||
@@ -622,7 +621,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
|
||||
DEBUG_LOG(m_logger) << "Resetting all unassociated DUS mines (NullArea) and all DUS mine areas";
|
||||
// Do this first!
|
||||
m_nullArea->resetMines();
|
||||
for (auto mineAreaObj : std::as_const(m_objectMap))
|
||||
for (auto mineAreaObj : qAsConst(m_objectMap))
|
||||
{
|
||||
if (!mineAreaObj->isDusMineArea() && !mineAreaObj->isConcreteMine())
|
||||
continue;
|
||||
@@ -806,7 +805,7 @@ void HandlerMineArea::onNewMineCorridor(const AesItemView &aiv)
|
||||
if (aiv.effectStateId() != AesEffectState::EsActivated)
|
||||
return;
|
||||
|
||||
for (ObjectMineArea *ma : std::as_const(m_objectMap))
|
||||
for (ObjectMineArea *ma : qAsConst(m_objectMap))
|
||||
{
|
||||
if (intersects(ma->boundingRect(), aiv.form()))
|
||||
ma->clearCorridor(aiv);
|
||||
@@ -1184,7 +1183,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
|
||||
|
||||
std::vector<Core::GeoPosition2D> vec;
|
||||
vec.reserve(points.size());
|
||||
for (QPointF bbPoint : std::as_const(points))
|
||||
for (QPointF bbPoint : qAsConst(points))
|
||||
{
|
||||
Core::GeoPosition2D pos;
|
||||
pos.lon(bbPoint.x());
|
||||
@@ -1193,7 +1192,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
|
||||
vec.push_back(pos);
|
||||
}
|
||||
// vec.reserve(boundingBox.size());
|
||||
// for( QPointF bbPoint : std::as_const(boundingBox))
|
||||
// for( QPointF bbPoint : qAsConst(boundingBox))
|
||||
// {
|
||||
// Core::GeoPosition2D pos;
|
||||
// LtsCoordTrans::UtmCoordinate utm;
|
||||
@@ -1260,7 +1259,7 @@ bool HandlerMineArea::checkIfNullMineIsInArea(const std::vector<AreaEffectSimula
|
||||
QVector<Database::AesMineAreaSegment> vecSeg;
|
||||
vecSeg.reserve(segments.size());
|
||||
|
||||
for (const AreaEffectSimulation::MineSegment &seg : std::as_const(segments))
|
||||
for (const AreaEffectSimulation::MineSegment &seg : qAsConst(segments))
|
||||
{
|
||||
Database::AesMineAreaSegment dbSeg;
|
||||
dbSeg.startPosition = QPointF(seg.positionStart().lon(), seg.positionStart().lat());
|
||||
@@ -1304,7 +1303,7 @@ bool HandlerMineArea::containsPointInExpandedMinefield(const QPointF &positionGe
|
||||
mineAreaPolygonUtm.push_back(QPointF(pointMineAreaUtm.x, pointMineAreaUtm.y));
|
||||
}
|
||||
|
||||
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
|
||||
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
|
||||
{
|
||||
|
||||
double x = pointUtm.x - mineAreaPointUTM.x();
|
||||
|
||||
Reference in new issue
Block a user