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

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
 {