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
+9
-10
@@ -8,12 +8,11 @@
|
||||
*/
|
||||
|
||||
#include "handler_effect_cluster.h"
|
||||
#include <utility>
|
||||
#include "handler_charge_administration.h"
|
||||
#include "object_effect_cluster.h"
|
||||
#include "settings.h"
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPolygonF>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <Services/AreaEffectSimulation/Utils/polygons.h>
|
||||
@@ -633,7 +632,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
|
||||
void HandlerEffectCluster::recountActiveAreas()
|
||||
{
|
||||
s_currentAirSupportCount = 0;
|
||||
for (const auto *area : std::as_const(m_objectMap))
|
||||
for (const auto *area : qAsConst(m_objectMap))
|
||||
{
|
||||
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
|
||||
{
|
||||
@@ -682,7 +681,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
|
||||
QMap<int, ObjectEffectCluster *> effectClusterPartyMap;
|
||||
|
||||
for (const auto *area : std::as_const(m_objectMap))
|
||||
for (const auto *area : qAsConst(m_objectMap))
|
||||
{
|
||||
if (area->data().partyId == request.partyId())
|
||||
{
|
||||
@@ -702,7 +701,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
case ProjectDataManagement::L22_FireHaltCategory::A: // Feuer Halt Allgemein
|
||||
{
|
||||
// all control operations are halted
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
{
|
||||
EffectClusterPauseResumeRequest req;
|
||||
|
||||
@@ -719,7 +718,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
{
|
||||
// Ongoing combat operations are halted after comparing the extent of
|
||||
// the fire hold with the corresponding target coordinate and circular area.
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
{
|
||||
const double lonRad = request.longitude().is_set() ? request.longitude().get() * LtsCoordTrans::deg2rad() : 0.0;
|
||||
const double latRad = request.latitude().is_set() ? request.latitude().get() * LtsCoordTrans::deg2rad() : 0.0;
|
||||
@@ -747,7 +746,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
// Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
|
||||
// followed by an EX-FQ(FN) report. Once the weapon system confirms execution,
|
||||
// the engagement is closed and the target area status is set to "expired."
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "[Feuer Einstellen ----- markAsExpired] " << "effectClusterId: " << ifs->data().id;
|
||||
|
||||
@@ -756,7 +755,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::L22_FireHaltCategory::C: // Aufheben Feuer Halt Allgemein
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
|
||||
|
||||
@@ -769,7 +768,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
break;
|
||||
case ProjectDataManagement::L22_FireHaltCategory::F: // Aufheben Feuer Halt Referenziert
|
||||
{
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
{
|
||||
const double lonRad = request.longitude().is_set() ? request.longitude().get() * LtsCoordTrans::deg2rad() : 0.0; // optional<lonRad>
|
||||
const double latRad = request.latitude().is_set() ? request.latitude().get() * LtsCoordTrans::deg2rad() : 0.0; // optional <latRad>
|
||||
|
||||
Reference in new issue
Block a user