Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -23,6 +23,7 @@ SET(SRCS
# So NGL_ADD_LIBRARY2 SHARED with would create ./Plugins/GeoPairing/cesplugingeopairing_export.h,
# but not with MODULE.
# But is an export macro realy needed? -> No
set(CMAKE_AUTOMOC ON)
NGL_ADD_LIBRARY(AAR SV cesPluginGeoPairing MODULE ${SRCS})
NGL_TARGET_LINK_LIBRARIES(cesPluginGeoPairing
Qt6::Network
@@ -35,7 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(cesPluginGeoPairing
GBL_ConfigSystem
FW_Ballistic
svcCesGeoPairingImpl
${SCHUSSTAFEL_LIBRARY}
$<$<TARGET_EXISTS:Schusstafel::Schusstafel>:Schusstafel::Schusstafel>
)
NGL_INSTALL_TARGET(cesPluginGeoPairing)
@@ -14,7 +14,7 @@
// **************************************************************************
#include <GBL_Global/Types.hpp>
#include <QString>
#include <QtCore/QString>
#include "DiscreteType.hpp"
#include "PolygonParamType.hpp"
@@ -13,7 +13,7 @@
//
// **************************************************************************
#include <QVector>
#include <QtCore/QVector>
namespace N_Ballistic
{
@@ -7,7 +7,7 @@
*/
#include "ammuconfig.h"
#include <QStringList>
#include <QtCore/QStringList>
namespace N_ConfigSystem
{
@@ -1,7 +1,7 @@
#pragma once
#include <QString>
#include <QVector>
#include <QtCore/QString>
#include <QtCore/QVector>
#include "configsettings.h"
#include <FW_Ballistic/Ammunition.hpp>
@@ -1,10 +1,10 @@
#ifndef CONFIGSETTINGS_H
#define CONFIGSETTINGS_H
#include <QString>
#include <QtCore/QString>
#include <QSettings>
#include <QVector>
#include <QStringList>
#include <QtCore/QVector>
#include <QtCore/QStringList>
class ConfigSettings
{
@@ -7,7 +7,7 @@
*/
#include "geoconfig.h"
#include <QFileInfo>
#include <QtCore/QFileInfo>
namespace N_ConfigSystem
{
@@ -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
@@ -13,7 +13,7 @@
#include "GeoCoord.hpp"
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QPointF>
#include <QtCore/QPointF>
namespace N_Math
{
@@ -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"
@@ -10,8 +10,8 @@
#include "../logger.h"
#include <CentralEffectSimulation/handler_participant.h>
#include <QString>
#include <QMap>
#include <QtCore/QString>
#include <QtCore/QMap>
#include <FW_Ballistic/BallisticService.hpp>
#include <FW_Ballistic/AmmunitionTypes.hpp>
#include <GeoPairingImpl/GeoPairingImplAirTarget.hpp>
@@ -51,7 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
PUBLIC
Qt6::Core
NGLLogger
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
LtsCoordTrans
GBL_Types
GBL_ConfigSystem
@@ -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)
@@ -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)
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{
@@ -19,8 +19,8 @@
#include <TrainingAreaBase/tab_ftc.h>
#include <QSettings>
#include <QFileInfo>
#include <QDataStream>
#include <QtCore/QFileInfo>
#include <QtCore/QDataStream>
using namespace N_ConfigSystem;
@@ -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>
@@ -17,7 +17,7 @@
#include <CentralEffectSimulation/dds_handler.h>
#include <NGLLogger/INGLLogger.h>
#include <QObject>
#include <QtCore/QObject>
namespace CesGeoPairing
{
@@ -25,8 +25,7 @@ namespace CesGeoPairing
class CesGeoPairingPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "special:3:ces.CesGeoPairingPlugin")
Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
Q_PLUGIN_METADATA(IID "special:3:ces")
public:
CesGeoPairingPlugin() = default;
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{