Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase
- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({}))
- training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly
- training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods
- training_area_telegrams.h: Changed Header struct to public members for consistency
- tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access
- lts_coordinate.cpp: Added missing #include <iomanip>
- MIGRATION_STATUS.md: Added migration progress tracking document
C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+
Build status: BUILD_RTI=OFF successful (0 errors, warnings only)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_abmeldung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_anmeldebestaetigung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_anmeldung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_aq_freitext.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_erkundungsanfrage.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_erkundungsergebnisse.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fh_feuerhalt.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_flugbahnberechnung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_flugbahndaten.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_abgefeuert.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_feuerbereit.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_feuerkampf.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_feuern.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_vollzugsmeldung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_fq_wirkfeldplanung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_hq_fuehrungslinien.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_hq_koordinierungsmassnahmen.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_mq_manuelle_quittung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_sq_stellungsmeldung_fs.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_sq_stellungsmeldung_lp.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_sq_stellungsmeldung_ws.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_sq_stellungswechsel.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_status.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "ex_tq_technische_quittung.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "msgcompares.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
|
||||
+6
-6
@@ -6,13 +6,13 @@
|
||||
#include "DDS/Core/core_types.h"
|
||||
#include "aes.hpp"
|
||||
#include "json_dispatcher.h"
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QPointF>
|
||||
#include <QRectF>
|
||||
#include <QString>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QtCore/QString>
|
||||
#include <QTransform>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <time.h>
|
||||
#include <vector>
|
||||
|
||||
+4
-4
@@ -7,10 +7,10 @@
|
||||
#include "logger.h"
|
||||
#include "main_dispatcher.h"
|
||||
#include "telegrams.h"
|
||||
#include <QDateTime>
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QUrl>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QUrl>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "asm_handler.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
#include <AssetManagement/asm_ftc.h>
|
||||
#include "main_dispatcher.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace AssetManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include "nglsettings/nglsettings_settings.h"
|
||||
#include "ngltools/ngltools_filesystem.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <FileManagement/flm_ftc.h>
|
||||
#include <NotificationManagement/nom_ftc.h>
|
||||
#include <NotificationManagement/nom_ftc_types.h>
|
||||
|
||||
+4
-4
@@ -10,10 +10,10 @@
|
||||
#include <AreaEffectSimulation/aes_operator_rights.h>
|
||||
|
||||
#include <QHostInfo>
|
||||
#include <QJsonDocument>
|
||||
#include <QSettings>
|
||||
#include <QStringList>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <vector>
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <Core/core_types.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "json_dispatcher.h"
|
||||
#include "ppm_handler.h"
|
||||
#include "telegrams.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
#include <TrainingAreaBase/tx_mixin.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "pdm_handler.h"
|
||||
#include "aes_handler.h"
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
class QWebSocket;
|
||||
class PpmHandler;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "pdm_handler.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+4
-4
@@ -9,10 +9,10 @@
|
||||
#include <ProjectDataManagement/pdm.hpp>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QUrl>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "TrainingAreaBase/dds_handler.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
namespace AdlerJson
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <utility>
|
||||
#include "Core/core.hpp"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include "json_dispatcher.h"
|
||||
#include <QRandomGenerator>
|
||||
|
||||
+5
-5
@@ -10,11 +10,11 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QUrl>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <telegrams.h>
|
||||
|
||||
namespace AdlerJson
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
#include "ppm_handler.h"
|
||||
#include "aes_handler.h"
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include "LtsUtils/LtsUtilsCore/lts_portrange.h"
|
||||
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
#include "telegrams.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QJsonDocument>
|
||||
#include <QString>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QString>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
|
||||
namespace AdlerJson
|
||||
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
#pragma once
|
||||
#include "saatelegrams_export.h"
|
||||
#include <QChar>
|
||||
#include <QDateTime>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QString>
|
||||
#include <QUuid>
|
||||
#include <QVector>
|
||||
#include <QtCore/QChar>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#include "ws_handler.h"
|
||||
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
namespace TrainingAreaBase {
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <qobjectdefs.h>
|
||||
|
||||
namespace TrainingAreaBase {
|
||||
|
||||
Reference in new issue
Block a user