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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/CMakeLists.txt

@@ -14,6 +14,7 @@ SET(SRCS
   settings.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginArtillerySound MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginArtillerySound
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h

@@ -13,12 +13,11 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <CentralEffectSimulation/ces_plugin_interface.h>
-#include <CentralEffectSimulation/ces_plugin_interface.h>
 #include <CentralEffectSimulation/dds_handler.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <CentralEffectSimulation/main_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesArtillerySound
@@ -32,8 +31,7 @@ namespace CesArtillerySound
 class CentralEffectSimulationArtillerySoundPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationArtillerySoundPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CentralEffectSimulationArtillerySoundPlugin() = default;
@@ -48,8 +46,7 @@ public:
 //class CentralEffectSimulation2DPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 //{
 //  Q_OBJECT
-//  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulation2DPlugin")
-//  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+//  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 //public:
 //  CentralEffectSimulation2DPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/CMakeLists.txt

@@ -18,6 +18,7 @@ SET(SRCS
 #  logger.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginBasic MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginBasic
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp

@@ -8,8 +8,8 @@
 
 #include "handler_participant_borderline.h"
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h

@@ -15,9 +15,9 @@
 #include <CentralEffectSimulation/handler_participant.h>
 
 
-#include <QHash>
-#include <QRectF>
-#include <QPolygonF>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
+#include <QtGui/QPolygonF>
 
 
 // AES-Handling for participants

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp

@@ -8,7 +8,7 @@
 #include "handler_simulated_movement.h"
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/dbtransaction.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.h

@@ -18,7 +18,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QHash>
+#include <QtCore/QHash>
 
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h

@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 //namespace NGLDB
@@ -31,8 +31,7 @@ namespace CentralEffectSimulationBasic
 class CentralEffectSimulationBasicPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationBasicPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CentralEffectSimulationBasicPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp

@@ -8,7 +8,7 @@
 
 #include "simulation_movement.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace CentralEffectSimulationBasic
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h

@@ -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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/CMakeLists.txt

@@ -22,6 +22,7 @@ SET(SRCS
 #  logger.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCesBuildings MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCesBuildings
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp

@@ -14,7 +14,7 @@
 
 #include <float.h>
 
-#include <QLineF>
+#include <QtCore/QLineF>
 #include <QDebug>
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.h

@@ -15,8 +15,8 @@
 #include <InfrastructureManagement/ism.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QObject>
-#include <QPolygonF>
+#include <QtCore/QObject>
+#include <QtGui/QPolygonF>
 
 using namespace CentralEffectSimulation;
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp

@@ -11,11 +11,11 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QPainterPath>
-#include <QPointF>
-#include <QPolygonF>
-#include <QTimer>
-#include <QTransform>
+#include <QtGui/QPainterPath>
+#include <QtCore/QPointF>
+#include <QtGui/QPolygonF>
+#include <QtCore/QTimer>
+#include <QtGui/QTransform>
 
 #include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsUtilsCore/qpoint3d.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h

@@ -24,8 +24,8 @@
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include <QPolygonF>
-#include <QTimer>
+#include <QtGui/QPolygonF>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.h

@@ -16,8 +16,8 @@
 
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 
 namespace NGL

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp

@@ -11,8 +11,8 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QPainterPath>
-#include <QPolygonF>
+#include <QtGui/QPainterPath>
+#include <QtGui/QPolygonF>
 
 namespace CesBuildings
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp

@@ -10,7 +10,7 @@
 
 #include <CentralEffectSimulation/proxy_building.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace CesBuildings
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h

@@ -22,7 +22,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesBuildings
@@ -31,8 +31,7 @@ namespace CesBuildings
 class CesBuildingsPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationBuildingOwnershipPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesBuildingsPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/CMakeLists.txt

@@ -18,6 +18,7 @@ SET(SRCS
   logger.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCes2D MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCes2D
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp

@@ -12,11 +12,11 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QPainterPath>
-#include <QPointF>
-#include <QPolygonF>
-#include <QTimer>
-#include <QTransform>
+#include <QtGui/QPainterPath>
+#include <QtCore/QPointF>
+#include <QtGui/QPolygonF>
+#include <QtCore/QTimer>
+#include <QtGui/QTransform>
 
 #include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsUtilsCore/qpoint3d.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.h

@@ -22,7 +22,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include <QPolygonF>
+#include <QtGui/QPolygonF>
 
 
 namespace LtsUtils

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp

@@ -16,8 +16,8 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <cmath>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace dds
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h

@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <NGLLogger/INGLLogger.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace Ces2D
@@ -28,8 +28,7 @@ namespace Ces2D
 class CentralEffectSimulation2DPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulation2DPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CentralEffectSimulation2DPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/CMakeLists.txt

@@ -10,6 +10,7 @@ SET(SRCS
     echoplugin.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginEcho MODULE ${SRCS})
 NGL_INSTALL_TARGET(cesPluginEcho)
 NGL_TARGET_LINK_LIBRARIES(cesPluginEcho

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <CentralEffectSimulation/ces_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/CMakeLists.txt

@@ -32,6 +32,7 @@ SET(SRCS
   line_of_sight.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginExplosions MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginExplosions
   Qt6::Core

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QPolygonF>
-#include <QString>
+#include <QtGui/QPolygonF>
+#include <QtCore/QString>
 
 namespace CesExplosions
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h

@@ -17,9 +17,9 @@
 //#include <CentralEffectSimulation/proxy_building.h>
 
 
-#include <QHash>
-#include <QVector>
-#include <QPolygonF>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
+#include <QtGui/QPolygonF>
 
 
 // AES-Handling for Artillery

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp

@@ -18,11 +18,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;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h

@@ -25,9 +25,9 @@
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include <QPolygonF>
-#include <QQueue>
-#include <QTimer>
+#include <QtGui/QPolygonF>
+#include <QtCore/QQueue>
+#include <QtCore/QTimer>
 
 // AES-Handling for Explosions
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp

@@ -16,14 +16,14 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QPainterPath>
-#include <QPointF>
-#include <QPolygonF>
-#include <QVector>
-#include <QTimer>
-#include <QTransform>
-#include <QDateTime>
-#include <QVariant>
+#include <QtGui/QPainterPath>
+#include <QtCore/QPointF>
+#include <QtGui/QPolygonF>
+#include <QtCore/QVector>
+#include <QtCore/QTimer>
+#include <QtGui/QTransform>
+#include <QtCore/QDateTime>
+#include <QtCore/QVariant>
 
 
 namespace CesExplosions

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h

@@ -21,10 +21,10 @@
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include <QPolygonF>
-#include <QQueue>
-#include <QHash>
-#include <QTimer>
+#include <QtGui/QPolygonF>
+#include <QtCore/QQueue>
+#include <QtCore/QHash>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h

@@ -17,7 +17,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesExplosions
@@ -27,8 +27,7 @@ namespace CesExplosions
 class CentralEffectSimulationExplosionsPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationExplosionsPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
     CentralEffectSimulationExplosionsPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/CMakeLists.txt

@@ -16,6 +16,7 @@ SET(SRCS
 #  logger.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCES_FunctionalAreas MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCES_FunctionalAreas
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp

@@ -8,8 +8,8 @@
 
 #include "handler_functional_area.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 #include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.h

@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_FUNCTIONAL_AREA
@@ -25,8 +25,7 @@ namespace CES_FUNCTIONAL_AREA
 class CesFunctionalAreaPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesFunctionalAreaPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesFunctionalAreaPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/supplytimer.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 namespace CES_FUNCTIONAL_AREA
 {
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(SRCS
   plugin.h
 )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginGasPipes MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginGasPipes
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp

@@ -11,11 +11,11 @@
 //#include "main_handler.h"
 #include "settings.h"
 
-#include <QPainterPath>
-#include <QPointF>
-#include <QPolygonF>
-#include <QTimer>
-#include <QTransform>
+#include <QtGui/QPainterPath>
+#include <QtCore/QPointF>
+#include <QtGui/QPolygonF>
+#include <QtCore/QTimer>
+#include <QtGui/QTransform>
 
 #include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsUtilsCore/qpoint3d.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.h

@@ -19,7 +19,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include <QPolygonF>
+#include <QtGui/QPolygonF>
 
 
 namespace LtsUtils

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp

@@ -8,8 +8,8 @@
 
 #include "handler_participant_gas_pipe.h"
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
-#include <QRectF>
-#include <QPolygonF>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
+#include <QtGui/QPolygonF>
 
 #include <CentralEffectSimulation/dds_handler.h>
 #include <handler_aes_data.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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.h

@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesGasPipes
@@ -25,8 +25,7 @@ namespace CesGasPipes
 class CesGasPipesPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesGasPipesPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesGasPipesPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/CMakeLists.txt

@@ -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)
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/Ammunition.hpp

@@ -14,7 +14,7 @@
 // **************************************************************************
 
 #include <GBL_Global/Types.hpp>
-#include <QString>
+#include <QtCore/QString>
 
 #include "DiscreteType.hpp"
 #include "PolygonParamType.hpp"

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/CWParamType.hpp

@@ -13,7 +13,7 @@
 //
 // **************************************************************************
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace N_Ballistic
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.cpp

@@ -7,7 +7,7 @@
   */
 
 #include "ammuconfig.h"
-#include <QStringList>
+#include <QtCore/QStringList>
 
 namespace N_ConfigSystem
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include "configsettings.h"
 #include <FW_Ballistic/Ammunition.hpp>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/configsettings.h

@@ -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
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp

@@ -7,7 +7,7 @@
   */
 
 #include "geoconfig.h"
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 namespace N_ConfigSystem
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h

@@ -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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_Types/GeoCoord.cpp

@@ -13,7 +13,7 @@
 
 #include "GeoCoord.hpp"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace N_Math
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp

@@ -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"

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.hpp

@@ -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>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/CMakeLists.txt

@@ -51,7 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
   PUBLIC
     Qt6::Core
     NGLLogger
-    svcPdmCommon
+    $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
     LtsCoordTrans
     GBL_Types
     GBL_ConfigSystem

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp

@@ -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)

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp

@@ -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)

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/geo_settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp

@@ -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;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h

@@ -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>
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h

@@ -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;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(SRCS
   handler_jamming.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCES_Jamming MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCES_Jamming
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp

@@ -8,8 +8,8 @@
 
 #include "handler_jamming.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QRandomGenerator>
 
 #include <LtsUtilsCore/dds_bitarray.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.h

@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_JAMMING
@@ -25,8 +25,7 @@ namespace CES_JAMMING
 class CesFunctionalAreaPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesJammingPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesFunctionalAreaPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/CMakeLists.txt

@@ -14,6 +14,7 @@ SET(SRCS
   settings.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginMineAreas MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginMineAreas
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp

@@ -15,8 +15,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace dds
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.h

@@ -15,7 +15,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesMineAreas
@@ -24,8 +24,7 @@ namespace CesMineAreas
 class CesMineAreasPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesMineAreasPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesMineAreasPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/CMakeLists.txt

@@ -5,6 +5,7 @@ SET(SRCS
   handler_mine_laying_artillery.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginMineLayingArtillery MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginMineLayingArtillery
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp

@@ -11,8 +11,8 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QTimer>
-#include <QTransform>
+#include <QtCore/QTimer>
+#include <QtGui/QTransform>
 #include <qrandom.h>
 
 namespace MineLayingArtillery

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.h

@@ -15,10 +15,10 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/logger.h>
 
-#include <QMap>
-#include <QObject>
-#include <QPolygonF>
-#include <QQueue>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtGui/QPolygonF>
+#include <QtCore/QQueue>
 
 class QTimer;
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.h

@@ -16,7 +16,7 @@
 
 #include <handler_mine_laying_artillery.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace MineLayingArtillery
 {
@@ -25,8 +25,7 @@ class MineLayingArtilleryPlugin
     , public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.MineLayingArtilleryPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
   public:
   MineLayingArtilleryPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/CMakeLists.txt

@@ -14,6 +14,7 @@ SET(SRCS
   ces_mission_plan_object.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCES_MissionPlan MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCES_MissionPlan
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp

@@ -8,8 +8,8 @@
 
 #include "ces_mission_plan_handler.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QRandomGenerator>
 
 #include <LtsUtilsCore/dds_bitarray.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h

@@ -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
 {
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.h

@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_MISSIONPLAN
@@ -25,8 +25,7 @@ namespace CES_MISSIONPLAN
 class CesMissionPlanPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesMissionPlanPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesMissionPlanPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(SRCS
   handler_nbc.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginCES_NBC MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginCES_NBC
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp

@@ -8,8 +8,8 @@
 
 #include "handler_nbc.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 #include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.h

@@ -15,7 +15,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_NBC
@@ -24,8 +24,7 @@ namespace CES_NBC
 class CentralEffectSimulationNBCPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationNBCPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CentralEffectSimulationNBCPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/CMakeLists.txt

@@ -18,6 +18,7 @@ SET(SRCS
   settings.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginParticipantBuildings MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginParticipantBuildings
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.h

@@ -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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.h

@@ -19,7 +19,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesParticipantBuildings
@@ -28,8 +28,7 @@ namespace CesParticipantBuildings
 class CesParticipantBuildingsPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationParticipantBuildingsPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesParticipantBuildingsPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/CMakeLists.txt

@@ -18,6 +18,7 @@ SET(SRCS
   logger.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginTargetAreas MODULE ${SRCS})
 NGL_INSTALL_TARGET(cesPluginTargetAreas)
 NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
@@ -27,8 +28,8 @@ NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
   cesPluginInterface
   svcPpmClient
   svcTabClient
-  ddsconnector
-  ddscore
+  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+  $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
   LtsCoordTrans
   svcCoreClient
 )

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h

@@ -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>

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp

@@ -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

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 //#include <CentralEffectSimulation/dds_handler.h>
 #include "logger.h"
 

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h

@@ -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>
@@ -19,8 +19,7 @@ namespace TargetAreas
 class TargetAreasPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.TargetAreasPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   TargetAreasPlugin() = default;

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.h

@@ -11,8 +11,8 @@
 #define TARGETTIMER_H
 
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 class TargetTimer: public QObject
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/CMakeLists.txt

@@ -14,6 +14,7 @@ SET(SRCS
   handler_participant_off_route_mine.h
   )
 
+set(CMAKE_AUTOMOC ON)
 NGL_ADD_LIBRARY(AAR SV cesPluginVirtualMines MODULE ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(cesPluginVirtualMines
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp

@@ -10,8 +10,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 namespace CesVirtualMines
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h

@@ -15,11 +15,11 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QRectF>
-#include <QPolygonF>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
+#include <QtGui/QPolygonF>
 
 // AES-Handling for participants
 namespace CesVirtualMines

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp

@@ -10,8 +10,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 namespace CesVirtualMines
 {

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h

@@ -13,11 +13,11 @@
 #include <CentralEffectSimulation/aes_item_view_utm.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QRectF>
-#include <QPolygonF>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
+#include <QtGui/QPolygonF>
 
 // AES-Handling for participants
 namespace CesVirtualMines

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.h

@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesVirtualMines
@@ -27,8 +27,7 @@ namespace CesVirtualMines
 class CesVirtualMinesPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
 {
   Q_OBJECT
-  Q_PLUGIN_METADATA(IID "special:3:ces.CesVirtualMinesPlugin")
-  Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
+  Q_PLUGIN_METADATA(IID "special:3:ces")
 
 public:
   CesVirtualMinesPlugin() = default;