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
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QRandomGenerator>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+2
-2
@@ -21,9 +21,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/logger.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <Core/core.hpp>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
|
||||
+4
-4
@@ -16,10 +16,10 @@
|
||||
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
|
||||
#include <Trajectory/trajectory_transform.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonValue>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QTransform>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
#include <Trajectory/trajectory_transform.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
|
||||
#include <TrajectorySplitter/trajectory_splitter.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+8
-8
@@ -18,14 +18,14 @@
|
||||
// PPM
|
||||
#include "ParticipantManagement/ppm_ftc_types.h"
|
||||
#include "TrainingAreaBase/tab.hpp"
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QTimer>
|
||||
#include <QVector>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
#include <QtTest/QTest>
|
||||
|
||||
|
||||
+2
-2
@@ -20,8 +20,8 @@
|
||||
#include <Buildings/bld_ftc.h>
|
||||
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <memory>
|
||||
|
||||
+2
-2
@@ -18,8 +18,8 @@
|
||||
#include <Core/core.hpp>
|
||||
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <memory>
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <memory>
|
||||
|
||||
+3
-3
@@ -7,8 +7,8 @@
|
||||
|
||||
#include "aes_convert_mine_area.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QLineF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <ngldb/dbconnection.h>
|
||||
#include <ngldb/sql_query_janitor.h>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
|
||||
#include <AreaEffectSimulation/aes_db_structs.h>
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "aes_test_base.h"
|
||||
|
||||
#include <QSqlDriver>
|
||||
#include <QSqlDatabase>
|
||||
#include <QtSql/QSqlDriver>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtSql/QSqlError>
|
||||
|
||||
#include <AreaEffectSimulation/aes_enums.hpp>
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_air_support_impact.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "aes_test_base.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <AreaEffectSimulation/logger.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_bccontamination.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_booby_trap.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_charge_administration.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_danger_area.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_explosion_area.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_explosion_area_bulk.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -8,9 +8,9 @@
|
||||
|
||||
#include "aes_test_explosion_cluster.h"
|
||||
#include <ProjectDataManagement/pdm.hpp>
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_explosion_single.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_gas_pipe.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "aes_test_base.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+4
-4
@@ -8,10 +8,10 @@
|
||||
#include "aes_test_mine_area.h"
|
||||
#include "Utils/polygons.h"
|
||||
#include "qjsonobject.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QJsonDocument>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_ncontamination.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_test_off_route_mine.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include "trajectory_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QPair>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPair>
|
||||
#include <QPolygonF>
|
||||
|
||||
#include <vector>
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include "trajectory_generator_vulcano.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QObject>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <QVector2D>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include "trajectory_export.h"
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "trajectory_point.h"
|
||||
#include "trajectory_export.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <Core/core.hpp>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "trajectory_splitter.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
//#include "svcaescommon_export.h"
|
||||
|
||||
#include <Core/core.hpp>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+5
-5
@@ -6,11 +6,11 @@
|
||||
*/
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QTest>
|
||||
#include <QVector>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QVector>
|
||||
#include <QSignalSpy>
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <QtCore>
|
||||
#include <QMetaType>
|
||||
#include <QtCore/QMetaType>
|
||||
|
||||
#include <AreaEffectSimulation/Utils/fire_automaton.h>
|
||||
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
#include <QtTest/QTest>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtTest/QSignalSpy>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <../../logger.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <AreaEffectSimulation/Utils/firing_timer.h>
|
||||
|
||||
|
||||
+2
-2
@@ -13,9 +13,9 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QTransform>
|
||||
#include <QTextStream> //
|
||||
#include <QtCore/QTextStream> //
|
||||
#include <QtTest/QTest>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
#include <iostream>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <QtTest/QTest>
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QDir>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_statemachine_test.h"
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QSignalSpy>
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
|
||||
using namespace AreaEffectSimulation;
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "aes_helper.h"
|
||||
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
#include "svcaescommon_export.h"
|
||||
#include <math.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QString>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include "aes_db.h"
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QTimer>
|
||||
#include <QStringList>
|
||||
#include <QVector>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <AreaEffectSimulation/logger.h>
|
||||
#include <AreaEffectSimulation/settings.h>
|
||||
|
||||
+4
-4
@@ -6,10 +6,10 @@
|
||||
*/
|
||||
|
||||
#include <QtCore>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include "../logger.h"
|
||||
|
||||
|
||||
+4
-4
@@ -12,11 +12,11 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include "svcaescommon_export.h"
|
||||
#include "../logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QIcon>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QTransform>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
#include <AreaEffectSimulation/aes_db_structs.h>
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QColor>
|
||||
#include <QtGui/QColor>
|
||||
#include <QPolygonF>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QRectF>
|
||||
|
||||
class QPointF;
|
||||
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
#include "icons.h"
|
||||
#include "polygons.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QLabel>
|
||||
#include <QIcon>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtGui/QIcon>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
|
||||
#include "svcaescommon_export.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <QPolygonF>
|
||||
#include <QTransform>
|
||||
#include <QFileInfo>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
|
||||
#include <Viewer/SituationMap/ElevationMap/elevation_map.h>
|
||||
|
||||
#include <QMap>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <CentralEffectSimulation/ces_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
using Trajectory = QPair<QPolygonF, QVector<double>>;
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QThread>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include "logger.h"
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
namespace Core
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
#include "effector_state_machine.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QMetaEnum>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QMetaEnum>
|
||||
#include <QRandomGenerator>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
// */
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QString>
|
||||
#include <aes_enums.hpp>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "main_handler.h"
|
||||
#include "settings.h"
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <utility>
|
||||
#include "logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "object_bccontamination.h"
|
||||
#include "object_danger_area.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "object_booby_trap.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include "object_borderline.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "handler_base.h"
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "aes_fts.h"
|
||||
|
||||
#include "logger.h"
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <QPolygonF>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include "settings.h"
|
||||
#include "aes_db.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include "handler_charge_administration.h"
|
||||
#include "object_effect_cluster.h"
|
||||
#include "settings.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QPolygonF>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <Services/AreaEffectSimulation/Utils/polygons.h>
|
||||
|
||||
+3
-3
@@ -8,14 +8,14 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
#include "object_effect_cluster.h"
|
||||
|
||||
#include <QCoreApplication> // qAddPostRoutine
|
||||
#include <QObject>
|
||||
#include <QtCore/QCoreApplication> // qAddPostRoutine
|
||||
#include <QtCore/QObject>
|
||||
|
||||
// TAB
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include "logger.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <Services/AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <QPolygonF>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
// for TrajectoryGenerator
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
+3
-3
@@ -8,14 +8,14 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
#include "object_explosion_cluster.h"
|
||||
|
||||
#include <QCoreApplication> // qAddPostRoutine
|
||||
#include <QObject>
|
||||
#include <QtCore/QCoreApplication> // qAddPostRoutine
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "handler_gas_pipe.h"
|
||||
#include <utility>
|
||||
#include "object_gas_pipe.h"
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include "Utils/polygons.h"
|
||||
|
||||
#include <QPolygonF>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include "object_gas_pipe.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include "settings.h"
|
||||
#include <QPainterPath>
|
||||
#include <QPolygonF>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "object_mine_corridor.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "object_off_route_mine.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "handler_trajectory.h"
|
||||
#include "object_trajectory.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <MeteoDataManagement/mdm_dtc.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <QPolygonF>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <DDS/Core/core.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
Loaded 100 of 2839 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user