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
+6
-6
@@ -8,7 +8,6 @@
|
||||
*/
|
||||
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include <utility>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include "main_handler.h"
|
||||
#include "ParticipantHandling/participant.h"
|
||||
@@ -24,6 +23,7 @@ MissionPlanHandler::MissionPlanHandler(MainHandler *mainHandler)
|
||||
, Interface::Fts::RemoveMissionPlanRequestHandler(mainHandler->fts())
|
||||
, Interface::Fts::SetMissionActionFulfilledRequestHandler(mainHandler->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("MissionPlanHandler"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -90,7 +90,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
<<" Items size = "<<missionItemVec.size()
|
||||
<<" Actions size = "<<missionActionVec.size();
|
||||
// add to internal buffer
|
||||
for (const ParticipantManagement::Database::PpmMissionPlan &data : std::as_const(missionPlanVec))
|
||||
for (const ParticipantManagement::Database::PpmMissionPlan &data : qAsConst(missionPlanVec))
|
||||
{
|
||||
ParticipantManagement::MissionPlan missionPlan;
|
||||
missionPlan.id(data.id);
|
||||
@@ -105,12 +105,12 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
QMultiMap <int, ParticipantManagement::Database::PpmMissionAction> actionsDbMap;
|
||||
//get mission items and actions for curr mission plan id
|
||||
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &itemDb : std::as_const(missionItemVec))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &itemDb : qAsConst(missionItemVec))
|
||||
{
|
||||
if (itemDb.missionPlanId == data.id)
|
||||
{
|
||||
itemsDbMap.insert(itemDb.elementNumber, itemDb);
|
||||
for (const ParticipantManagement::Database::PpmMissionAction &actionDb : std::as_const(missionActionVec) )
|
||||
for (const ParticipantManagement::Database::PpmMissionAction &actionDb : qAsConst(missionActionVec) )
|
||||
{
|
||||
if (actionDb.missionItemId == itemDb.id)
|
||||
actionsDbMap.insert(actionDb.missionItemId, actionDb);
|
||||
@@ -120,7 +120,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
|
||||
|
||||
missionPlan.items().reserve(itemsDbMap.size());
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(itemsDbMap))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : qAsConst(itemsDbMap))
|
||||
{
|
||||
ParticipantManagement::MissionItem msi;
|
||||
msi.actions().reserve(actionsDbMap.size());
|
||||
@@ -189,7 +189,7 @@ bool MissionPlanHandler::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 MissionPlanHandler::isUasCombatReady(int participantId)
|
||||
{
|
||||
m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataDynamicParticipantData(3000);
|
||||
|
||||
+1
-1
@@ -42,7 +42,6 @@ public:
|
||||
bool setCurrentMissionActionFulfilled(int participantId, const QString &nameOfTheMissionThatEnded);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool isUasCombatReady(int participantId);
|
||||
bool isUasInAutoMode(int participantId);
|
||||
Core::FunctionReplyObject createMissionPlanRequest(const ModifyMissionPlanRequest &request);
|
||||
@@ -57,6 +56,7 @@ private:
|
||||
|
||||
MainHandler *m_mainHandler;
|
||||
QHash<int32_t, ObjectMissionPlan *> m_objMissionPlans;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+6
-5
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "object_mission_plan.h"
|
||||
#include <utility>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
@@ -18,11 +17,13 @@ namespace UasHandling
|
||||
ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db,
|
||||
const ParticipantManagement::MissionPlan & missionPlan,
|
||||
QObject *parent) : QObject(parent)
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_missionplan(missionPlan),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_missionplan(missionPlan)
|
||||
, m_logger(getLogger("ObjectMissionPlan"))
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
|
||||
|
||||
}
|
||||
@@ -77,7 +78,7 @@ void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement:
|
||||
m_mapMissionItems.clear();
|
||||
m_dbMissionActions.clear();
|
||||
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(dbItems))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : qAsConst(dbItems))
|
||||
{
|
||||
ParticipantManagement::MissionItem msi;
|
||||
msi.actions().reserve(dbActions.size());
|
||||
|
||||
+4
-3
@@ -10,12 +10,12 @@
|
||||
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <ParticipantManagement/dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
namespace UasHandling
|
||||
@@ -45,13 +45,14 @@ public:
|
||||
Core::FunctionReplyObject setMissionActionFulfilled(SetMissionActionFulfilledRequest req, qint64 currentTimeMSec);
|
||||
Core::FunctionReplyObject setMissionPlanAborted(bool state);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<ParticipantManagement::DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<ParticipantManagement::DatabaseInterface> m_db;
|
||||
ParticipantManagement::MissionPlan m_missionplan;
|
||||
QHash<int /*dbItemId*/, ParticipantManagement::MissionItem > m_mapMissionItems; /// key:dbItemId | Value MissionItem
|
||||
|
||||
std::vector<std::vector<ParticipantManagement::Database::PpmMissionAction> > m_dbMissionActions; /// [ItemNumber][ActionNumber]
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
} // namespace UasHandling
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_db.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+5
-5
@@ -8,13 +8,12 @@
|
||||
*/
|
||||
|
||||
#include "uas_handler.h"
|
||||
#include <utility>
|
||||
#include "uas.h"
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "main_handler.h"
|
||||
#include "ParticipantHandling/participant.h"
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonDocument>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
@@ -26,6 +25,7 @@ UasHandler::UasHandler(MainHandler *mainHandler)
|
||||
, CreateModifyUasRequestHandler(mainHandler->exAnyFts())
|
||||
, RemoveUasRequestHandler(mainHandler->exAnyFts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("UasHandler"))
|
||||
{
|
||||
m_mainHandler->exAnyFts()->enableCreateModifyUas();
|
||||
m_mainHandler->exAnyFts()->enableRemoveUas();
|
||||
@@ -53,7 +53,7 @@ bool UasHandler::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const Database::PpmUas ¤tUas : std::as_const(uasVec))
|
||||
for (const Database::PpmUas ¤tUas : qAsConst(uasVec))
|
||||
{
|
||||
UasHandling::Uas *newUas = new UasHandling::Uas(currentUas);
|
||||
|
||||
@@ -137,7 +137,7 @@ Core::FunctionReplyObject UasHandler::removeUas(UasHandling::Uas *uasToDelete)
|
||||
//------------------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
|
||||
// cant check here as we dont have access to all party participants
|
||||
/*
|
||||
@@ -283,7 +283,7 @@ void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnect
|
||||
|
||||
bool UasHandler::hostNameHostPortExists(const QString &hostname, int hostport, int uasId)
|
||||
{
|
||||
for (Uas *uas : std::as_const(m_uass))
|
||||
for (Uas *uas : qAsConst(m_uass))
|
||||
{
|
||||
if (uas->id() == uasId)
|
||||
continue;
|
||||
|
||||
+3
-1
@@ -42,7 +42,6 @@ private slots:
|
||||
void onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification mod);
|
||||
void onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnectionStatus &data, DataModification mod);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
Core::FunctionReplyObject removeUas(const RemoveUasRequest &request);
|
||||
Core::FunctionReplyObject removeUas(UasHandling::Uas *uasToDelete);
|
||||
Core::FunctionReplyObject createUas(const CreateModifyUasRequest &request);
|
||||
@@ -54,6 +53,9 @@ private:
|
||||
MainHandler *m_mainHandler;
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
|
||||
QHash<int32_t, Uas *> m_uass;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
} // namespace UasHandling
|
||||
} // namespace ParticipantManagement
|
||||
Reference in new issue
Block a user