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
+4
-4
@@ -8,11 +8,11 @@
|
||||
|
||||
#include "ces_mission_plan_handler.h"
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QRandomGenerator>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
@@ -168,7 +168,7 @@ bool CesMissionPlanHandler::isUasInAutoMode(int participantId)
|
||||
return (uas.uasState() == ProjectDataManagement::UasState::Auto);
|
||||
}
|
||||
|
||||
// stolen from Lts/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
// stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
bool CesMissionPlanHandler::isUasCombatReady(int participantId)
|
||||
{
|
||||
|
||||
|
||||
+1
-2
@@ -43,7 +43,6 @@ public:
|
||||
bool init();
|
||||
void updateMissionPlanList(const ParticipantManagement::MissionPlan &data);
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void sendNextMissionAction();
|
||||
private Q_SLOTS:
|
||||
|
||||
@@ -65,7 +64,7 @@ private: // attributes
|
||||
|
||||
QHash<int/*PlanId*/, CesMissionPlanObject *> m_missionPlanObjects; // Only: MissionBegin is reached and fulfilled = 0;
|
||||
int m_requestId = 1;
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
};
|
||||
} // namespace CES_MISSIONPLAN
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "ces_mission_plan_object.h"
|
||||
#include "qobject.h"
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
namespace CES_MISSIONPLAN
|
||||
{
|
||||
|
||||
+4
-5
@@ -9,14 +9,14 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <CentralEffectSimulation/logger.h>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
namespace CES_MISSIONPLAN
|
||||
{
|
||||
|
||||
@@ -36,7 +36,6 @@ public:
|
||||
int participantId() const; /// uas participantId
|
||||
bool isMissionFulfilled(const ParticipantManagement::MissionPlan &mission);
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void sendActionAttact();
|
||||
AreaEffectSimulation::ExplosionClusterSingleEffectOnlyRequest getExplosionCluster();
|
||||
ParticipantManagement::MissionPlan &missionPlan();
|
||||
@@ -63,7 +62,7 @@ private:
|
||||
QTimer *m_loiterTimer{nullptr};
|
||||
std::shared_ptr<CentralEffectSimulation::DdsHandler> m_ddsHandler;
|
||||
ParticipantManagement::MissionPlan m_missionPlan;
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
namespace CES_MISSIONPLAN
|
||||
|
||||
Reference in new issue
Block a user