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
+3
-3
@@ -9,10 +9,10 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QtTest>
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QHash>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
|
||||
+3
-3
@@ -11,10 +11,10 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
|
||||
+3
-3
@@ -11,10 +11,10 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
|
||||
+3
-3
@@ -11,10 +11,10 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "CentralEffectSimulation/ces_ftc.h"
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
|
||||
+3
-3
@@ -12,10 +12,10 @@
|
||||
#include <TrainingAreaBase/tab_fts.h>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+3
-3
@@ -12,10 +12,10 @@
|
||||
#include <TrainingAreaBase/tab_fts.h>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QPolygonF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
/* ----------------------------------------------------------------------------------
|
||||
* HOW TO RUN THE TESTS (example)
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QtNetwork/QNetworkReply>
|
||||
#include <qmath.h>
|
||||
#include <math.h>
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <QtCore/QObject>
|
||||
|
||||
// HTTP Request
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QtNetwork/QNetworkAccessManager>
|
||||
|
||||
namespace CesArtillerySound
|
||||
{
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesArtillerySound
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "handler_participant_borderline.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
|
||||
#include <QHash>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QPolygonF>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <utility>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
//namespace NGLDB
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "simulation_movement.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace CentralEffectSimulationBasic
|
||||
{
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <CentralEffectSimulation/ces_db.h>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace CentralEffectSimulationBasic
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QPolygonF>
|
||||
|
||||
using namespace CentralEffectSimulation;
|
||||
|
||||
+2
-2
@@ -13,9 +13,9 @@
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QVector3D>
|
||||
|
||||
// operator<<
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
namespace NGL
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
|
||||
namespace CesBuildings
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include <CentralEffectSimulation/proxy_building.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace CesBuildings
|
||||
{
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesBuildings
|
||||
|
||||
+2
-2
@@ -14,9 +14,9 @@
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <cmath>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace dds
|
||||
{
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace Ces2D
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "echoplugin.h"
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace Echo
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <CentralEffectSimulation/ces_plugin_interface.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QPolygonF>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace CesExplosions
|
||||
{
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
//#include <CentralEffectSimulation/proxy_building.h>
|
||||
|
||||
|
||||
#include <QHash>
|
||||
#include <QVector>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
|
||||
|
||||
|
||||
+5
-5
@@ -19,11 +19,11 @@
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
|
||||
|
||||
#include <QPointF>
|
||||
#include <QVector>
|
||||
#include <QSet>
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
using namespace CentralEffectSimulation;
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
#include <QQueue>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
// AES-Handling for Explosions
|
||||
|
||||
|
||||
+5
-5
@@ -18,13 +18,13 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QVector>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
#include <QDateTime>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
#include <QQueue>
|
||||
#include <QHash>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
#include <CentralEffectSimulation/proxy_building.h>
|
||||
|
||||
#include <QFlags>
|
||||
#include <QtCore/QFlags>
|
||||
#pragma once
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "handler_functional_area.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CES_FUNCTIONAL_AREA
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
namespace CES_FUNCTIONAL_AREA
|
||||
{
|
||||
|
||||
|
||||
+2
-2
@@ -13,9 +13,9 @@
|
||||
#include "settings.h"
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "handler_participant_gas_pipe.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
+4
-4
@@ -8,9 +8,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QPolygonF>
|
||||
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
// AES-Handling for participants
|
||||
namespace CentralEffectSimulationGasPipes
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesGasPipes
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "ammuconfig.h"
|
||||
#include <QStringList>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
namespace N_ConfigSystem
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include "configsettings.h"
|
||||
#include <FW_Ballistic/Ammunition.hpp>
|
||||
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
#ifndef CONFIGSETTINGS_H
|
||||
#define CONFIGSETTINGS_H
|
||||
|
||||
#include <QString>
|
||||
#include <QSettings>
|
||||
#include <QVector>
|
||||
#include <QStringList>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
class ConfigSettings
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "geoconfig.h"
|
||||
#include <QFileInfo>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
namespace N_ConfigSystem
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
//#include "../logger.h"
|
||||
|
||||
#include <ElevationMap/elevation_map_manager.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <iostream> // std::cout, std::endl, std::cin
|
||||
#include <stdlib.h> // EXIT_SUCCESS
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "GeoCoord.hpp"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace N_Math
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <GeoPairingImpl/GeoPairingImplBalistic.hpp>
|
||||
#include <GeoPairingImpl/GeoPairingDataFireReport.hpp>
|
||||
#include <Schusstafel.h>
|
||||
#include <QScopedPointer>
|
||||
#include <QtCore/QScopedPointer>
|
||||
#include <FW_Ballistic/AmmunitionTypes.hpp>
|
||||
#include <GBL_ConfigSystem/ammuconfig.h>
|
||||
#include "../settings.h"
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include "GeoPairingImplAirTargetCacheData.hpp"
|
||||
|
||||
#include "GeoPairingDataFireReport.hpp"
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
#define PAN_AMMU_TIMEPROG(ammunition) (ammunition & 0x01)
|
||||
#define PAN_AMMU_INDEX(ammunition) ((ammunition >> 1) & 0x03)
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include <GBL_ConfigSystem/geoconfig.h>
|
||||
#include <limits>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
#ifdef WIN32
|
||||
#define RAND48_SEED_0 (0x330e)
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+3
-3
@@ -19,9 +19,9 @@
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
#include <QSettings>
|
||||
#include <QFileInfo>
|
||||
#include <QDataStream>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QDataStream>
|
||||
|
||||
|
||||
using namespace N_ConfigSystem;
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <MeteoDataManagement/mdm_dtc.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <FW_Ballistic/BallisticService.hpp>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace CesGeoPairing
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "handler_jamming.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QRandomGenerator>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CES_JAMMING
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace dds
|
||||
{
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesMineAreas
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+4
-4
@@ -8,10 +8,10 @@
|
||||
|
||||
#include "handler_mine_laying_artillery.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
#include <qrandom.h>
|
||||
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <CentralEffectSimulation/logger.h>
|
||||
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QPolygonF>
|
||||
#include <QQueue>
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <handler_mine_laying_artillery.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace MineLayingArtillery
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "ces_mission_plan_handler.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QRandomGenerator>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "ces_mission_plan_object.h"
|
||||
#include "qobject.h"
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
namespace CES_MISSIONPLAN
|
||||
{
|
||||
|
||||
+2
-2
@@ -14,9 +14,9 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <CentralEffectSimulation/logger.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
namespace CES_MISSIONPLAN
|
||||
{
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CES_MISSIONPLAN
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "handler_nbc.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <CentralEffectSimulation/main_handler.h>
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CES_NBC
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
// Handling for participants within buildings
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <CentralEffectSimulation/handler_building_data.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesParticipantBuildings
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include <ParticipantManagement/ppm_common.h>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QLineF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
namespace TargetAreas
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
//#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <CentralEffectSimulation/ces_plugin_interface.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
|
||||
#include "targettimer.h"
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
TargetTimer::TargetTimer(int participantId,
|
||||
int targetParticipantId,
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#define TARGETTIMER_H
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
class TargetTimer: public QObject
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace CesVirtualMines
|
||||
{
|
||||
|
||||
+4
-4
@@ -15,10 +15,10 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QPolygonF>
|
||||
|
||||
// AES-Handling for participants
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QLineF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QLineF>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace CesVirtualMines
|
||||
{
|
||||
|
||||
+4
-4
@@ -13,10 +13,10 @@
|
||||
#include <CentralEffectSimulation/aes_item_view_utm.h>
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QPolygonF>
|
||||
|
||||
// AES-Handling for participants
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesVirtualMines
|
||||
|
||||
+2
-2
@@ -13,9 +13,9 @@
|
||||
#include <AreaEffectSimulation/aes_enums.hpp>
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
|
||||
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