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>
2026-08-23 20:49:23 +02:00
1 parent 3d3c3b48fe
commit 7a6be7474e
@@ -3,7 +3,7 @@
 #pragma once

 #include "buildingcontrolbsm_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <logger.h>
 #include "bsm_types.h"

@@ -4,8 +4,8 @@

 #include "bsm_socket.h"
 #include "bsm_telegrams_configuration_setup.h"
-#include <QTimer>
-#include <QHostAddress>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>

 static const int s_aliveTimeout = 10;  
 namespace BuildingControlUnit
@@ -2,9 +2,9 @@

 #pragma once

-#include <QObject>
-#include <QHostAddress>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QTcpSocket>
 #include <logger.h>
 #include "bsm_types.h"

@@ -12,7 +12,7 @@
 #include "bsm_telegrams_sw_version_report.h"
 #include "bsm_telegrams_sw_version_request.h"
 #include "bsm_telegrams_technical_status_request.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <QHostInfo>

 namespace BuildingControlUnit
@@ -2,9 +2,9 @@

 #pragma once

-#include <QObject>
-#include <QMap>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QTimer>
 #include <QElapsedTimer>
 #include <logger.h>
 #include "bsm_socket.h"
@@ -3,7 +3,7 @@

 #pragma once

-#include <QByteArray>
+#include <QtCore/QByteArray>
 #include "buildingcontrolbsm_export.h"

 namespace BuildingControlUnit
@@ -4,7 +4,7 @@
 #pragma once

 #include "bsm_telegrams_base.h"
-#include <QObject>
+#include <QtCore/QObject>

 namespace BuildingControlUnit
 {
@@ -2,7 +2,7 @@


 #include <nglapplication/nglcoreapplication.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include "bsm_api.h"

 int main(int argc, char **argv)
@@ -2,7 +2,7 @@

 #pragma once

-#include <QString>
+#include <QtCore/QString>
 #include <bcu_types.h>

 namespace BuildingControlUnit
@@ -2,8 +2,8 @@


 #include "handeleffect.h"
-#include <QUrlQuery>
-#include <QTimer>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QTimer>

 namespace BuildingControlUnit
 {
@@ -5,13 +5,13 @@
 #include <utility>
 #include "handeleffect.h"
 #include "handle_http_request.h"
-#include <QTimer>
-#include <QUrlQuery>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QDateTime>
-#include <QJsonArray>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonArray>
+#include <QtCore/QDateTime>

 namespace BuildingControlUnit
 {
@@ -1,8 +1,8 @@
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "xmlreader.h"
 #include "handeleffects.h"
-#include <QString>
-#include <QDebug>
+#include <QtCore/QString>
+#include <QtCore/QDebug>


 int main(int argc, char *argv[])
@@ -3,8 +3,8 @@

 #include "xmlreader.h"

-#include <QFile>
-#include <QUrlQuery>
+#include <QtCore/QFile>
+#include <QtCore/QUrlQuery>
 #include <QXmlStreamAttributes>

 namespace BuildingControlUnit
@@ -8,9 +8,9 @@

 #include <NGLLogger/NGLLoggerBootstrap.h>

-#include <QXmlStreamReader>
-#include <QVector>
-#include <QUrl>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QVector>
+#include <QtCore/QUrl>

 namespace BuildingControlUnit
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include "buildingcontroljson_export.h"
 #include <VWM/vwm_types.h>
 #include <BSM/bsm_types.h>
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
@@ -3,9 +3,9 @@


 #include <nglapplication/nglcoreapplication.h>
-#include <QDateTime>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 #include "vwm_api.h"
 #include "vwm_math.h"
 #include "test_read_xml.h"
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <NGLLogger/INGLLogger.h>
 #include "vwm_api.h"

@@ -14,11 +14,11 @@

 #include <bcu_xml_reader.h>

-#include <QStringList>
-#include <QFile>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
 #include <QPolygonF>
-#include <QDomDocument>
-#include <QDebug>
+#include <QtXml/QDomDocument>
+#include <QtCore/QDebug>

 static QDomElement getChildElement(const QDomElement &parent, const QString &childTag, bool bThrow = true)
 {
@@ -7,9 +7,9 @@
 #include "vwm_xml_reader.h"
 #include "vwm_state_store.h"
 #include "vwm_math.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <settings.h>
-#include <QFile>
+#include <QtCore/QFile>
 #include <initializer_list>
 #ifdef LTS_DEBUG

@@ -17,11 +17,11 @@
 #  include <sstream>
 #endif 

-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>
-#include <QDebug>
+#include <QtCore/QDebug>

 namespace BuildingControlUnit
 {
@@ -4,7 +4,7 @@
 #pragma once

 #include "vwm_building_room_geometry.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <logger.h>
 #include "vwm_building.h"
 #include "vwm_types.h"
@@ -4,9 +4,9 @@
 #include "vwm_building.h"
 #include <utility>
 #include "vwm_math.h"
-#include <QSet>
-#include <QVector>
-#include <QLineF>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QLineF>
 #include <settings.h>

 #include <algorithm>
@@ -3,9 +3,9 @@

 #pragma once

-#include <QString>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <logger.h>
 #include "vwm_types.h"
@@ -5,7 +5,7 @@
 #include "bcu_xml_reader.h"

 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <algorithm>


@@ -3,8 +3,8 @@

 #pragma once

-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 #include <QPolygonF>
 #include <QDomElement>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
@@ -3,7 +3,7 @@
 #pragma once

 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include "vwm_building.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
@@ -2,7 +2,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>

 class VwmMathUnitTest : public QObject
 {
@@ -3,13 +3,13 @@
 #include "vwm_state_store.h"
 #include <utility>
 #include <logger.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QString>
-#include <QFile>
-#include <QStandardPaths>
-#include <QDir>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QDir>


 namespace BuildingControlUnit
@@ -5,7 +5,7 @@
 #include "vwm_building.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
-#include <QMap>
+#include <QtCore/QMap>

 namespace BuildingControlUnit
 {
@@ -5,8 +5,8 @@

 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <utility>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 #include <cstdint>
 #include <iostream>
 #include <bcu_types.h>
@@ -5,9 +5,9 @@
 #include "vwm_xml_reader.h"
 #include "vwm_building_room_geometry.h"
 #include <logger.h>
-#include <QFile>
-#include <QDomDocument>
-#include <QSet>
+#include <QtCore/QFile>
+#include <QtXml/QDomDocument>
+#include <QtCore/QSet>
 #include <bcu_xml_reader.h>

 namespace BuildingControlUnit
@@ -6,7 +6,7 @@
 #include "vwm_building_room_geometry.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
-#include <QMap>
+#include <QtCore/QMap>

 namespace BuildingControlUnit
 {
@@ -4,9 +4,9 @@
 #pragma once

 #include <iostream>
-#include <QVector>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>

 namespace BuildingControlUnit
@@ -5,8 +5,8 @@
 #include "bcu_xml_reader.h"
 #include "logger.h"
 #include <QDomElement>
-#include <QDomDocument>
-#include <QFile>
+#include <QtXml/QDomDocument>
+#include <QtCore/QFile>

 namespace BuildingControlUnit
 {
@@ -3,9 +3,9 @@

 #include "handle_http_request.h"
 #include <QAuthenticator>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QTimer>

 namespace BuildingControlUnit
 {
@@ -2,14 +2,14 @@

 #pragma once

-#include <QObject>
-#include <QNetworkRequest>
+#include <QtCore/QObject>
+#include <QtNetwork/QNetworkRequest>
 #include <QQueue>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <logger.h>
 #include "bcu_types.h"
-#include <QTime>
+#include <QtCore/QTime>



@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <BSM/bsm_api.h>
 #include <Json/json_api.h>
 #include <VWM/vwm_api.h>
@@ -2,7 +2,7 @@


 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include "buildingcontrolcommon_export.h"

 namespace BuildingControlUnit
@@ -3,9 +3,9 @@

 #include "web_socket_telegrams.h"
 #include <utility>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>

 namespace BuildingControlUnit
 {
@@ -2,8 +2,8 @@

 #pragma once

-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include "buildingcontrolcommon_export.h"
 #include <bcu_types.h>

@@ -5,9 +5,9 @@
 #include <utility>
 #include "building_process.h"
 #include "main_handler.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QStandardPaths>
-#include <QDateTime>
+#include <QtCore/QDateTime>

 #include <ngldb/nsqlquery.h>

@@ -3,8 +3,8 @@

 #pragma once

-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include "ism_handler.h"
 #include "logger.h"
 #include <bld_fts.h>
@@ -9,12 +9,12 @@

 #include <QStandardPaths>
 #include <QFile>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTransform>
 #include <QtWebSockets/QWebSocket>
 #include <QXmlStreamWriter>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <ngltools/ngltools_filesystem.h>

 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -5,7 +5,7 @@

 #include <QAbstractSocket>
 #include <QProcess>
-#include <QVector>
+#include <QtCore/QVector>
 #include <QUrl>
 #include "ism_handler.h"
 #include "logger.h"
@@ -4,11 +4,11 @@
 #include "ism_handler.h"
 #include <utility>
 #include "main_handler.h"
-#include <QTimer>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <QtWebSockets/QWebSocket>
 #include <web_socket_telegrams.h>
@@ -2,11 +2,11 @@


 #pragma once
-#include <QObject>
-#include <QMap>
-#include <QSet>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QHash>
+#include <QtCore/QVector>

 #include <InfrastructureManagement/ism.hpp>
 #include <InfrastructureManagement/ism_dtc.h>
@@ -5,7 +5,7 @@
 #include "settings.h"
 #include <DDS/Core/pacemaker.h>
 #include <AssetManagement/asm_dtc.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace Buildings
 {
@@ -3,7 +3,7 @@
 #pragma once

 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "building_control_handler.h"
 #include "dds_handler.h"
 #include "ism_handler.h"
@@ -2,7 +2,7 @@

 #pragma once
 #include <ProjectDataManagement/pdm.hpp>
-#include <QMap>
+#include <QtCore/QMap>
 #include "logger.h"

 namespace Buildings
@@ -3,7 +3,7 @@

 #pragma once
 #include <ParticipantManagement/ppm.hpp>
-#include <QHash>
+#include <QtCore/QHash>
 #include "logger.h"

 namespace Buildings
@@ -3,7 +3,7 @@

 #pragma once
 #include <ParticipantManagement/ppm.hpp>
-#include <QHash>
+#include <QtCore/QHash>
 #include "logger.h"
 #include <bld_fts.h>

@@ -2,8 +2,8 @@


 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>

 namespace NGL
 {
@@ -6,9 +6,9 @@
 #include "building_process.h"

 #include <QtWebSockets/QWebSocket>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>



@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include "building_control_handler.h"
 #include "logger.h"
@@ -4,12 +4,12 @@

 #include <utility>
 #include <AudioVideoManagement/avm_translation.h>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QSet>
+#include <QtCore/QVector>

-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>

 namespace AudioVideoManagement {

@@ -1,10 +1,10 @@
 #pragma once

-#include <QString>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVector>
-#include <QSet>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
+#include <QtCore/QSet>
 #include "svccnrhelper_export.h"

 // Use avm_enums.hpp from RTI DDS tools
@@ -8,7 +8,7 @@
 #include <QtCore/QUuid>
 #include <QtCore/QJsonDocument>
 #include <QtGlobal>
-#include <QDateTime>
+#include <QtCore/QDateTime>

 namespace CombatNetRadio
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <set>

 namespace ExerciseManagement
@@ -7,10 +7,10 @@
 #include <AudioVideoManagement/avm_dtc.h>
 #include <AudioVideoManagement/avm_translation.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <QDateTime>
-#include <QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
 #include <QtGlobal>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>

 namespace CombatNetRadio
@@ -5,8 +5,8 @@

 #include "WebSocketInterface/Messages/reply_message.h"
 #include "logger.h"
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <boost/optional.hpp>

 namespace AudioVideoManagement
@@ -10,9 +10,9 @@
 #include "config_cnr.h"
 #include "positions_cnr.h"
 #include <ExerciseManagement/exm_dtc.h>
-#include <QUuid>
-#include <QDateTime>
-#include <QJsonDocument>
+#include <QtCore/QUuid>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
 #include <memory>


@@ -4,10 +4,10 @@
 #pragma once

 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QObject>
-#include <QString>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 #include <map>
 #include <vector>
 #include <memory>
@@ -5,8 +5,8 @@
 #include <LtsUtilsCore/json_object.h>
 #include <AudioVideoManagement/avm.hpp>
 #include <InfrastructureManagement/ism.hpp>
-#include <QString>
-#include <QJsonDocument>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>

 namespace CombatNetRadio
 {
@@ -9,8 +9,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <QtGlobal>
-#include <QDateTime>
-#include <QSet>
+#include <QtCore/QDateTime>
+#include <QtCore/QSet>

 namespace
 {
@@ -4,7 +4,7 @@
 #pragma once

 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QVector>
+#include <QtCore/QVector>
 #include <boost/optional.hpp>

 namespace AudioVideoManagement
@@ -9,7 +9,7 @@
 #include <AssetManagement/asm_dtc.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <QtGlobal>
-#include <QPointF>
+#include <QtCore/QPointF>

 namespace CombatNetRadio
 {
@@ -3,9 +3,9 @@

 #include "checkmk_handler.h"

-#include <QTimer>
-#include <QHostAddress>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QDateTime>



@@ -6,9 +6,9 @@
 #include "logger.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QTimer>
-#include <QTcpSocket>
-#include <QDataStream>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDataStream>

 namespace DDSConnector
 {
@@ -4,9 +4,9 @@
 #include "checkmk_handler_schedule_check.h"
 #include <utility>

-#include <QTimer>
-#include <QHostAddress>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QDateTime>

 namespace ComponentMonitor
 {
@@ -7,9 +7,9 @@
 #include "logger.h"
 #include <ComponentMonitor/cmo_fts.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QTimer>
-#include <QTcpSocket>
-#include <QDataStream>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDataStream>

 namespace DDSConnector
 {
@@ -7,7 +7,7 @@
 #include <ComponentMonitor/cmo.hpp>
 #include <ComponentMonitor/cmo_dts.h>

-#include <QTimer>
+#include <QtCore/QTimer>

 namespace ComponentMonitor
 {
@@ -6,7 +6,7 @@
 #include "logger.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>

 namespace DDSConnector
@@ -6,7 +6,7 @@
 #include <ComponentMonitor/cmo.hpp>
 #include <ComponentMonitor/cmo_dts.h>
 #include <ComponentMonitor/settings.h>
-#include <QTimer>
+#include <QtCore/QTimer>

 namespace ComponentMonitor
 {
@@ -9,7 +9,7 @@
 #include "checkmk_handler_schedule_check.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>

 namespace DDSConnector
@@ -2,7 +2,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "cmo_db.h"
@@ -2,7 +2,7 @@


 #pragma once
-#include <QString>
+#include <QtCore/QString>

 namespace NGL
 {
@@ -1,11 +1,11 @@



-#include <QCoreApplication>
-#include <QStringList>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 #include "main_sim.h"


@@ -3,7 +3,7 @@

 #pragma once

-#include <QTcpServer>
+#include <QtNetwork/QTcpServer>

 class QTimer;
 class PayloadSender : public QObject
@@ -1,8 +1,8 @@


-#include <QSettings>
-#include <QFileInfo>
-#include <QCoreApplication>
+#include <QtCore/QSettings>
+#include <QtCore/QFileInfo>
+#include <QtCore/QCoreApplication>
 #include "dgps_config.h"

 using namespace DifferentialGPS;
@@ -2,7 +2,7 @@

 #pragma once

-#include <QString>
+#include <QtCore/QString>

 namespace DifferentialGPS
 {
@@ -6,8 +6,8 @@
 #include "tetra_if_impl.h"
 #include "trimble_if.h"

-#include <QMutexLocker>
-#include <QTimer>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QTimer>
 #include <DDS/Core/pacemaker.h>

 namespace DifferentialGPS
@@ -2,9 +2,9 @@

 #include "tcpsocket.h"

-#include <QTcpSocket>
-#include <QHostAddress>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QTimer>

 namespace DifferentialGPS
 {
@@ -6,10 +6,10 @@
 #ifdef BUILD_RTI

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTcpSocket>
-#include <QHostAddress>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
 #include <QNetworkInterface>
-#include <QTimer>
+#include <QtCore/QTimer>

 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
@@ -6,10 +6,10 @@
 #include "dgps_config.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTcpSocket>
-#include <QHostAddress>
-#include <QFile>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>

 namespace DifferentialGPS
 {
@@ -6,10 +6,10 @@

 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>



@@ -12,7 +12,7 @@

 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>

 namespace FeedGeoJson
 {
@@ -7,7 +7,7 @@

 #include "websocket_server.h"
 #include <utility>
-#include <QDebug>
+#include <QtCore/QDebug>

 WebSocketServer::WebSocketServer(quint16 port, QObject *parent)
  : QObject(parent),
@@ -14,7 +14,7 @@

 #ifndef WEBSOCKETSERVER_H
 #define WEBSOCKETSERVER_H
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/QWebSocket>

@@ -4,8 +4,8 @@
 #include "abstract_socket_handler.h"
 #include "guez_nasat_telegrams.h"
 #include "settings.h"
-#include <QDateTime>
-#include <QJsonDocument>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>

 namespace GuezNasat
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <logger.h>
 #include "guez_nasat_telegrams.h"
@@ -11,8 +11,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <TrainingAreaBase/tab_dts.h>
-#include <QHash>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QSet>

 #include "logger.h"

@@ -3,8 +3,8 @@

 #include "guez_nasat_telegrams.h"

-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>

 namespace GuezNasat
 {
@@ -5,8 +5,8 @@

 #include <cstdint>
 #include <exception>
-#include <QJsonObject>
-#include <QString>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>

 namespace GuezNasat
 {
@@ -3,8 +3,8 @@

 #pragma once

-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <GuezNasat/gna_dts.h>
 #include <GuezNasat/gna_fts.h>
 #include <GuezNasat/gna_db.h>
@@ -8,7 +8,7 @@
 #include "dds_handler.h"
 #include "handler_participant.h"
 #include <GuezNasat/gna_db.h>
-#include <QTimer>
+#include <QtCore/QTimer>

 namespace GuezNasat
 {
@@ -3,8 +3,8 @@

 #pragma once

-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <GuezNasat/gna_dts.h>
 #include <GuezNasat/gna_fts.h>
 #include <ExerciseManagement/exm_dtc.h>
@@ -6,9 +6,9 @@
 #include "dds_handler.h"
 #include "handler_participant.h"

-#include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>

@@ -3,8 +3,8 @@

 #pragma once

-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ProjectDataManagement/pdm.hpp>
 #include "guez_nasat_telegrams.h"
@@ -9,7 +9,7 @@
 #include "initialization.h"
 #include "dds_handler.h"

-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>

 namespace GuezNasat
@@ -7,8 +7,8 @@
 #include "handler_participant.h"
 #include "logger.h"
 #include <GuezNasat/gna_dtc.h>
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>

 namespace GuezNasat
 {