Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <utility>
|
||||
#include "web_socket_handler.h"
|
||||
#include "web_socket_telegrams.h"
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtGlobal>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
#include "web_socket_telegrams.h"
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <iostream>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <logger.h>
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "main_handler.h"
|
||||
#include <utility>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include "VWM/vwm_types.h"
|
||||
#include "bcu_xml_reader.h"
|
||||
#include <settings.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <QFile>
|
||||
#include <QTimer>
|
||||
#include <QTransform>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <web_socket_telegrams.h>
|
||||
|
||||
namespace Buildings
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <utility>
|
||||
#include "building_process.h"
|
||||
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include "building_control_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
@@ -17,6 +17,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCnrHelper
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/AudioVideoManagement/
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
@@ -27,7 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
||||
# ddsfts
|
||||
PUBLIC
|
||||
svcAvmCommon
|
||||
Qt6::Core
|
||||
|
||||
# svcAesCommon
|
||||
# ngldb
|
||||
)
|
||||
@@ -95,6 +101,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
ngltools
|
||||
|
||||
+9
-3
@@ -1,9 +1,15 @@
|
||||
#pragma once
|
||||
#include <QJsonDocument>
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#include "svccnrhelper_export.h"
|
||||
#include <CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
|
||||
// Use stub enums when BUILD_RTI is OFF (avm_enums.hpp is generated by RTI DDS tools)
|
||||
#ifdef BUILD_RTI
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#else
|
||||
#include <AudioVideoManagement/avm_enums_stub.hpp>
|
||||
#endif
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
@@ -12,7 +18,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
virtual ~RadioCircuit() = default;
|
||||
|
||||
QString name;
|
||||
FrequencyBand freqBand {FrequencyBand_def::VHF};
|
||||
FrequencyBand freqBand {FrequencyBand::VHF_v};
|
||||
int radioStationId {0};
|
||||
|
||||
|
||||
@@ -71,7 +77,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuitUHF: public RadioCircuit
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit
|
||||
{
|
||||
RcOperatingMode operatingMode {RcOperatingMode_def::FixedFreqEncNone};
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone_v};
|
||||
int freqSetDataId {0};
|
||||
bool pilotTone {false};
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace DifferentialGPS
|
||||
{
|
||||
TcpSocket::TcpSocket(const char *logName)
|
||||
: QThread()
|
||||
, m_socket(nullptr)
|
||||
, m_logger(getLogger(logName))
|
||||
, m_socket(nullptr)
|
||||
, m_waitTime(1)
|
||||
, m_reconnectTimer(nullptr)
|
||||
{
|
||||
@@ -49,7 +49,7 @@ void TcpSocket::doConnect()
|
||||
this, &TcpSocket::onConnected);
|
||||
connect(m_socket, &QTcpSocket::disconnected,
|
||||
this, &TcpSocket::onDisconnected);
|
||||
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
|
||||
connect(m_socket, &QAbstractSocket::errorOccurred,
|
||||
this, &TcpSocket::onError);
|
||||
connect(m_socket, &QTcpSocket::readyRead,
|
||||
this, &TcpSocket::onReadyRead);
|
||||
|
||||
@@ -34,7 +34,6 @@ protected Q_SLOTS:
|
||||
virtual void onError(QAbstractSocket::SocketError);
|
||||
virtual void onReadyRead() = 0;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString m_hostName;
|
||||
quint16 m_hostPort;
|
||||
QTcpSocket *m_socket;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <logger.h>
|
||||
#include "guez_nasat_telegrams.h"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
#include "guez_nasat_telegrams.h"
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include "logger.h"
|
||||
#include "abstract_socket_handler.h"
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Common/settings.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Common/settings.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include <QSettings>
|
||||
#include <QStringList>
|
||||
#include <QTimer>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <vector>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <Core/core_types.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "aes_handler.h"
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
namespace AdlerJson
|
||||
{
|
||||
class PpmHandler;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#include "ws_handler.h"
|
||||
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QJsonDocument>
|
||||
namespace TrainingAreaBase {
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "logger.h"
|
||||
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QObject>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "hla_handler_tx.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ppm_handler.h"
|
||||
#include "pdm_handler.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
namespace ApHlaJson
|
||||
{
|
||||
class PpmHandler;
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "hla_handler_tx.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "hla_handler_tx.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace HlaJson
|
||||
{
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocketServer>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <QUdpSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QUdpSocket>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
|
||||
namespace TetraRadio
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocketServer>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocketServer>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "wls_handler_tx.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "wls_dispatcher.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <taboc_dtc.h>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
class QTimer;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
#include "logger.h"
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QPointF>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
class WlsJsonclientTest : public QObject
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user