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

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;