Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -26,7 +26,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
||||
# ddsfts
|
||||
PUBLIC
|
||||
svcAvmCommon
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
# svcAesCommon
|
||||
# ngldb
|
||||
)
|
||||
@@ -91,9 +91,9 @@ NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
|
||||
LtsUtilsCore
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
ngltools
|
||||
svcCoreClient
|
||||
svcCnrHelper
|
||||
|
||||
+3
-2
@@ -1,4 +1,5 @@
|
||||
#include "cnr_frequency_planning_helper.h"
|
||||
#include <utility>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
@@ -187,7 +188,7 @@ QVector<RadioCircuit*> fromJson(const std::string &json)
|
||||
|
||||
|
||||
|
||||
for(const QJsonValue &val : qAsConst(arr))
|
||||
for(const QJsonValue &val : std::as_const(arr))
|
||||
{
|
||||
RadioCircuit *rc = nullptr;
|
||||
const QJsonObject obj = val.toObject();
|
||||
@@ -230,7 +231,7 @@ QSet<int> frequencySetDataIds(const std::string &frequencyPlanDataProperties)
|
||||
QJsonArray arr = doc.object().value(QStringLiteral("subCircuits")).toArray();
|
||||
|
||||
|
||||
for(const QJsonValue &val : qAsConst(arr))
|
||||
for(const QJsonValue &val : std::as_const(arr))
|
||||
{
|
||||
const QJsonObject obj = val.toObject();
|
||||
FrequencyBand ft = static_cast<FrequencyBand::inner_enum>(obj[QStringLiteral("FrequencyBand")].toInt());
|
||||
|
||||
+4
-3
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "connection_handler.h"
|
||||
#include <utility>
|
||||
|
||||
#include "client_connection.h"
|
||||
|
||||
@@ -17,7 +18,7 @@ ConnectionHandler::ConnectionHandler()
|
||||
|
||||
ConnectionHandler::~ConnectionHandler()
|
||||
{
|
||||
for (auto s : qAsConst(m_connections))
|
||||
for (auto s : std::as_const(m_connections))
|
||||
s->disconnect(this);
|
||||
qDeleteAll(m_connections);
|
||||
}
|
||||
@@ -52,7 +53,7 @@ bool ConnectionHandler::init()
|
||||
void ConnectionHandler::onUpdate()
|
||||
{
|
||||
emit clearFrequencyPlanningStatus();
|
||||
for (ClientConnection *currentConnection : qAsConst(m_connections))
|
||||
for (ClientConnection *currentConnection : std::as_const(m_connections))
|
||||
currentConnection->addMessage(Messages::UpdateMessage());
|
||||
}
|
||||
|
||||
@@ -103,6 +104,6 @@ void ConnectionHandler::onDisconnected(ClientConnection *conn)
|
||||
|
||||
void ConnectionHandler::onPositions(const CombatNetRadio::WebSocketInterface::Messages::ReplyMessage &positionsCnr)
|
||||
{
|
||||
for (ClientConnection *currentConnection : qAsConst(m_connections))
|
||||
for (ClientConnection *currentConnection : std::as_const(m_connections))
|
||||
currentConnection->addMessage(positionsCnr);
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "config_cnr.h"
|
||||
#include <utility>
|
||||
#include "helper.h"
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
@@ -56,7 +57,7 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId());
|
||||
QMap<int, AudioVideoManagement::FrequencySetDataWithId> fsdMap;
|
||||
for (const auto &fsd : qAsConst(frequencySet.data()))
|
||||
for (const auto &fsd : std::as_const(frequencySet.data()))
|
||||
fsdMap.insert(fsd.id(), fsd);
|
||||
|
||||
configCnr.setId = plan->frequencySetId();
|
||||
@@ -72,7 +73,7 @@ void ConfigCnr::buildConfigCnrData()
|
||||
QVector<AudioVideoManagement::RadioCircuit*> circuits = AudioVideoManagement::fromJson(currentData.properties());
|
||||
|
||||
int subCircuitCount = 0;
|
||||
for (AudioVideoManagement::RadioCircuit* circuit : qAsConst(circuits))
|
||||
for (AudioVideoManagement::RadioCircuit* circuit : std::as_const(circuits))
|
||||
{
|
||||
|
||||
InfrastructureManagement::MainStructureElement radioStation = m_ismDtc->mainStructureElement(circuit->radioStationId);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "positions_cnr.h"
|
||||
#include <utility>
|
||||
#include "exercise_manager.h"
|
||||
#include "helper.h"
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
@@ -105,7 +106,7 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
const qint64 now = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> positions;
|
||||
for (int participantId : qAsConst(participantIdsInUnit))
|
||||
for (int participantId : std::as_const(participantIdsInUnit))
|
||||
{
|
||||
const ParticipantManagement::Participant &participant = allParticipants.value(participantId);
|
||||
if (!participant.equipmentNumber().is_set())
|
||||
|
||||
Reference in new issue
Block a user