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
@@ -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
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user