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
+13
-14
@@ -7,23 +7,22 @@
|
||||
*/
|
||||
|
||||
#include "object_explosion_cluster.h"
|
||||
#include <utility>
|
||||
#include "Utils/polygons.h"
|
||||
#include "handler_charge_administration.h"
|
||||
#include "handler_trajectory.h"
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <Trajectory/trajectory_generator.h>
|
||||
#include <Trajectory/trajectory_generator_vulcano.h>
|
||||
#include <Trajectory/trajectory_helper.h>
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonValue>
|
||||
#include <QPolygonF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
#include <QVector3D>
|
||||
|
||||
/*
|
||||
@@ -300,7 +299,7 @@ Core::FunctionReplyObject ObjectExplosionCluster::createObject(const Database::A
|
||||
// DEBUG_LOG(m_logger) << "data.damagePercent() > 80. Check, if m_trajectoryCont contains building:" << data.id()
|
||||
// << " aesItemId=" << m_aiv.aesItemId();
|
||||
|
||||
// for (const TracjectoryData &tracjectoryData : std::as_const(m_trajectoryCont))
|
||||
// for (const TracjectoryData &tracjectoryData : qAsConst(m_trajectoryCont))
|
||||
// {
|
||||
// DEBUG_LOG(m_logger) << "print_m_trajectory"
|
||||
// << " value: index=" << tracjectoryData.index
|
||||
@@ -515,7 +514,7 @@ bool ObjectExplosionCluster::initialCalculations(QString *reasonOut)
|
||||
mtps_asUtm.resize(m_data.impactCount);
|
||||
|
||||
m_temporaryData.mhPoints.reserve(mtps_asUtm.size());
|
||||
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
|
||||
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
|
||||
{
|
||||
LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
|
||||
m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y()));
|
||||
@@ -1516,7 +1515,7 @@ void ObjectExplosionCluster::publishAiv()
|
||||
int explosionIndex = 0;
|
||||
|
||||
singleEffectsRef.reserve(singleExplosions.size());
|
||||
for (const QPointF &singleExplosion : std::as_const(singleExplosions))
|
||||
for (const QPointF &singleExplosion : qAsConst(singleExplosions))
|
||||
{
|
||||
SingleEffect se;
|
||||
se.singleEffectState(AesSingleEffectState_def::SesScheduled);
|
||||
@@ -1653,7 +1652,7 @@ void ObjectExplosionCluster::removeTopics()
|
||||
#ifdef USE_TRAJECTORY_VIA_HANDLER
|
||||
// remove TrajectoryTimeAware created via Handler:
|
||||
// topicIds are stored at m_trajectoryHandlerExplosionIndexToTopicId
|
||||
for (int topicId : std::as_const(m_trajectoryHandlerExplosionIndexToTopicId))
|
||||
for (int topicId : qAsConst(m_trajectoryHandlerExplosionIndexToTopicId))
|
||||
{
|
||||
dts->removeTrajectoryTimeAwareByKey(topicId);
|
||||
}
|
||||
@@ -2479,7 +2478,7 @@ bool ObjectExplosionCluster::generateTrajectoryVulcanoSpecific(int explosionNumb
|
||||
|
||||
// "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry
|
||||
tdRef.trajectoryGeometry.clear();
|
||||
for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry()))
|
||||
for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry()))
|
||||
tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast
|
||||
|
||||
tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z();
|
||||
@@ -2750,7 +2749,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex)
|
||||
#define REDUCED_DISTRIBUTION // [GUEZE-2462] Darstellung Flugparabel Steilfeuer
|
||||
#ifdef REDUCED_DISTRIBUTION
|
||||
const int trajSize = trajectoryGeometry.size();
|
||||
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
|
||||
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
|
||||
{
|
||||
// if (!m_isAirSupportSource)
|
||||
{
|
||||
@@ -2778,7 +2777,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex)
|
||||
} // for
|
||||
|
||||
#else
|
||||
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
|
||||
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
|
||||
{
|
||||
geometryRef.emplace_back(Core::GeoPositionRelativeTime(pos3D.lon(), pos3D.lat(), pos3D.z(), idx * flightDurationMSecSeg));
|
||||
++idx;
|
||||
@@ -2931,7 +2930,7 @@ void ObjectExplosionCluster::dump(const char *file, int lineNo) const
|
||||
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_trajectoryCont.keys()= " << trajectoryContKeys;
|
||||
|
||||
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug.size = " << m_publisedTrajectoriesForDebug.size();
|
||||
for (const auto &item : std::as_const(m_publisedTrajectoriesForDebug))
|
||||
for (const auto &item : qAsConst(m_publisedTrajectoriesForDebug))
|
||||
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug = " << item;
|
||||
|
||||
DEBUG_LOG(m_logger) << "END ******* DUMP: id = " << m_data.id << ", name = '" << m_data.name << "' **************";
|
||||
|
||||
Reference in new issue
Block a user