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
@@ -5,7 +5,7 @@
 #include "StructBuilder.h"
 #include <NGLLogger/INGLLogger.h>
-#include <QCryptographicHash>
+#include <QtCore/QCryptographicHash>
 #include <grantlee/context.h>
 #ifdef RTI_HEADER_AVAILABLE
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
-#include <QObject>
+#include <QtCore/QObject>
 namespace CodeGen
 {
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
-#include <QObject>
+#include <QtCore/QObject>
 namespace CodeGen
 {
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
-#include <QObject>
+#include <QtCore/QObject>
 namespace CodeGen
 {
@@ -6,8 +6,8 @@
 #include "XmlReader.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QFile>
+#include <QtCore/QFile>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 #include <grantlee/context.h>
 #include <grantlee/engine.h>
@@ -4,8 +4,8 @@
 #include "XmlReader.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 namespace NGL
 {
@@ -4,9 +4,9 @@
 #include "StructBuilder.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QString>
+#include <QtCore/QString>
-#include <QVariant>
+#include <QtCore/QVariant>
 #include <utility>
 #ifdef RTI_HEADER_AVAILABLE
@@ -6,7 +6,7 @@
 #include "XmlReader.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
@@ -5,8 +5,8 @@
 #include "StructBuilder.h"
 #include "codegen_base_export.h"
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
-#include <QStringList>
+#include <QtCore/QStringList>
 namespace NGL
 {
@@ -3,7 +3,7 @@
 #include "StructBuilder.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <utility>
 using namespace CodeGen;
@@ -4,9 +4,9 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QDirIterator>
-#include <QDomDocument>
+#include <QtXml/QDomDocument>
-#include <QFile>
+#include <QtCore/QFile>
-#include <QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>
@@ -9,7 +9,7 @@
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QDir>
+#include <QtCore/QDir>
 #include <nglapplication/nglcoreapplication.h>
 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -9,8 +9,8 @@
 #include "ui_main_grantlee_gui.h"
 #include <NGLLogger/INGLLogger.h>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <grantlee/engine.h>
 #include <nglapplication/nglapplication.h>
@@ -1,8 +1,8 @@
 #pragma once
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include <QObject>
+#include <QtCore/QObject>
 namespace CodeGen
 {
@@ -1,6 +1,6 @@
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QDir>
+#include <QtCore/QDir>
 #include <grantlee/engine.h>
 #include <grantlee/templateloader.h>
@@ -4,8 +4,8 @@
 #ifndef MOCK_COORD_TRANS_H
 #define MOCK_COORD_TRANS_H
-#include <QString>
+#include <QtCore/QString>
-#include <QPointF>
+#include <QtCore/QPointF>
 // Minimal stub to satisfy linker requirements
 namespace LtsCoordTrans {
@@ -1,11 +1,11 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QDirIterator>
-#include <QFile>
+#include <QtCore/QFile>
 #include <QFileInfoList>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
-#include <QRegularExpressionMatch>
+#include <QtCore/QRegularExpressionMatch>
-#include <QTextStream>
+#include <QtCore/QTextStream>
 #include <cstdio>
 #include <utility>
@@ -2,12 +2,12 @@
 #include "lts_app_descriptor.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
+#include <QtCore/QJsonValue>
 namespace LtsAppDescriptor
 {
@@ -2,8 +2,8 @@
 #pragma once
-#include <QStringList>
+#include <QtCore/QStringList>
-#include <QVector>
+#include <QtCore/QVector>
 #ifndef LTSAPPDESCRIPTOR_EXPORT
 #ifdef BUILD_STATIC_LIBRARIES
@@ -2,13 +2,13 @@
 #include "ui_lts_app_descriptor_editor.h"
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QFile>
+#include <QtCore/QFile>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QStringListModel>
-#include <QTimer>
+#include <QtCore/QTimer>
 LtsAppDescriptorEditor::LtsAppDescriptorEditor(QWidget* parent) : QWidget(parent), m_ui(new Ui_LtsAppDescriptionEditor)
 {
@@ -1,8 +1,8 @@
 #pragma once
 #include "lts_app_descriptor.h"
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 #ifndef LTSAPPDESCRIPTOREDITOR_EXPORT
@@ -2,10 +2,10 @@
 #include "lts_app_descriptor_editor.h"
-#include <QAction>
+#include <QtGui/QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include <QMenuBar>
+#include <QtWidgets/QMenuBar>
 int main(int argc, char* argv[])
 {
@@ -1,7 +1,7 @@
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
 #include <Viewer/LtsDataView/abstract_display_widget.h>
 namespace Ui
@@ -7,8 +7,8 @@
 #include "lts_app_manager.h"
 #include "ui_app_chooser.h"
-#include <QCloseEvent>
+#include <QtGui/QCloseEvent>
-#include <QDebug>
+#include <QtCore/QDebug>
 namespace LtsAppManager
 {
@@ -1,8 +1,8 @@
 #pragma once
 #include <LtsAppDescriptor/lts_app_descriptor.h>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 namespace Ui
 {
@@ -2,7 +2,7 @@
 #pragma once
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QObject>
+#include <QtCore/QObject>
 namespace LtsAppManager
 {
@@ -13,16 +13,16 @@
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <OperatorManagement/opm_settings_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonValue>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
-#include <QTcpServer>
+#include <QtNetwork/QTcpServer>
-#include <QTcpSocket>
+#include <QtNetwork/QTcpSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
-#include <QUuid>
+#include <QtCore/QUuid>
 #include <utility>
 #ifndef LTS_VERSION_MAJOR
@@ -5,8 +5,8 @@
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QVector>
+#include <QtCore/QVector>
 #include <memory>
 #ifndef LTSAPPMANAGER_EXPORT
@@ -2,10 +2,10 @@
 #include "LtsCommandLineParser.h"
-#include <QFlags>
+#include <QtCore/QFlags>
 #include <QNetworkInterface>
-#include <QSettings>
+#include <QtCore/QSettings>
-#include <QUrl>
+#include <QtCore/QUrl>
 #include <ngltools/ngltools_filesystem.h>
 namespace LtsCommandLineParser
@@ -5,10 +5,10 @@
 #include <GeographicLib/Geocentric.hpp>
 #include <GeographicLib/MGRS.hpp>
 #include <GeographicLib/UTMUPS.hpp>
-#include <QPointF>
+#include <QtCore/QPointF>
-#include <QRectF>
+#include <QtCore/QRectF>
-#include <QString>
+#include <QtCore/QString>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <iomanip>
 #include <utility>
@@ -2,7 +2,7 @@
 #pragma once
-#include <QVector>
+#include <QtCore/QVector>
 #include <cmath>
 #include "ltscoordtrans_export.h"
 #include <string>
@@ -5,8 +5,8 @@
 #include "lts_coord_trans.h"
 #include <GeographicLib/Math.hpp>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QTest>
+#include <QtTest/QTest>
 #include <utility>
 QTEST_MAIN(coordtrans_test)
@@ -2,8 +2,8 @@
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
-#include <QStringList>
+#include <QtCore/QStringList>
 class coordtrans_test : public QObject
 {
@@ -5,7 +5,7 @@
 #include "lts_coord_widget_p.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 namespace LtsCoordWidget
 {
@@ -3,8 +3,8 @@
 #pragma once
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsCoordTrans/ltscoordwidget_export.h>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QToolButton;
@@ -6,10 +6,10 @@
 #include "ui_lts_coord_widget_wgs84.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 namespace LtsCoordWidget
 {
@@ -3,11 +3,11 @@
 #include "lts_coord_widget.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QLabel>
+#include <QtWidgets/QLabel>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 static void updateLabel(const QPointF& coord, QLabel* lbl, int prec)
 {
@@ -4,8 +4,8 @@
 #include <ElevationMap/elevation_map_manager.h>
 #include <LtsElevation/lts_elevation_manager.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtTest/QTest>
 using LOGGER_T = NGL::INGLLogger&;
@@ -6,9 +6,9 @@
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QPointF>
+#include <QtCore/QPointF>
-#include <QVector>
+#include <QtCore/QVector>
 #include <iosfwd>
 #include <unordered_map>
 #include <utility>
@@ -2,7 +2,8 @@
 #include "lts_coordinate.h"
-#include <QLineF>
+#include <QtCore/QLineF>
 #include <iomanip>
 namespace LtsCoordTrans
 {
@@ -7,8 +7,8 @@
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <functional>
 #include <iosfwd>
 #include <type_traits>
@@ -5,8 +5,8 @@
 #include <ElevationMap/elevation_map_manager.h>
 #include <LtsElevation/lts_elevation_manager.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtTest/QTest>
 using LOGGER_T = NGL::INGLLogger&;
@@ -6,11 +6,11 @@
 #include "ltselevation_export.h"
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QPointer>
+#include <QtCore/QPointer>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <iosfwd>
 #include <memory>
@@ -1,7 +1,7 @@
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QObject>
 class aes_crypt_test : public QObject
@@ -3,8 +3,8 @@
 #include "lts_licence.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDomDocument>
+#include <QtXml/QDomDocument>
-#include <QObject>
+#include <QtCore/QObject>
 namespace LtsLicence
 {
@@ -4,9 +4,9 @@
 #include "ltslicence_export.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
-#include <QString>
+#include <QtCore/QString>
-#include <QVector>
+#include <QtCore/QVector>
 namespace LtsLicence
 {
@@ -4,7 +4,7 @@
 #include "ui_logout_info_dialog.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 namespace LtsLogin
 {
@@ -3,7 +3,7 @@
 #pragma once
 #include <AssetManagement/asm.hpp>
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
+#include <QtCore/QObject>
 class QTimer;
@@ -12,11 +12,11 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_wait_dialog.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QDir>
+#include <QtCore/QDir>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
-#include <QProcess>
+#include <QtCore/QProcess>
 namespace LtsLogin
 {
@@ -3,7 +3,7 @@
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <Plugins/SituationReplayManagement/srm_data_plugin_interface.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <ltslogin_export.h>
 namespace LtsPluginManager
@@ -1,9 +1,9 @@
 #include "lts_dummy_widget.h"
 #include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QEvent>
+#include <QtCore/QEvent>
-#include <QIcon>
+#include <QtGui/QIcon>
 namespace LtsMultiMonitor
 {
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QEvent;
@@ -1,12 +1,12 @@
 #include "lts_magic_corner.h"
 #include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
-#include <QIcon>
+#include <QtGui/QIcon>
-#include <QLabel>
+#include <QtWidgets/QLabel>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <chrono>
 #define SMOL 48
@@ -1,9 +1,9 @@
 #pragma once
 #include "lts_screen_base.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 class QMouseEvent;
 class QPaintEvent;
@@ -12,13 +12,13 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
-#include <QPointer>
+#include <QtCore/QPointer>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QScreen>
+#include <QtGui/QScreen>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <utility>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
@@ -2,8 +2,8 @@
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QVector>
+#include <QtCore/QVector>
 #include <memory>
 namespace LtsMultiMonitor
@@ -8,15 +8,15 @@
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QCloseEvent>
+#include <QtGui/QCloseEvent>
-#include <QColor>
+#include <QtGui/QColor>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QPen>
+#include <QtGui/QPen>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QSize>
+#include <QtCore/QSize>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 namespace LtsMultiMonitor
 {
@@ -1,7 +1,7 @@
 #pragma once
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
 class QScreen;
 class QPainter;
@@ -8,14 +8,14 @@
 #include "lts_screen_normal.h"
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QColor>
+#include <QtGui/QColor>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QPen>
+#include <QtGui/QPen>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QSize>
+#include <QtCore/QSize>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 namespace LtsMultiMonitor
 {
@@ -1,9 +1,9 @@
 #pragma once
 #include "lts_multi_monitor_selector_base.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
 class QScreen;
 class QPaintEvent;
@@ -6,13 +6,13 @@
 #include "lts_screen_container.h"
 #include "lts_screen_wide.h"
-#include <QColor>
+#include <QtGui/QColor>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QPen>
+#include <QtGui/QPen>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QSize>
+#include <QtCore/QSize>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 namespace LtsMultiMonitor
 {
@@ -1,9 +1,9 @@
 #pragma once
 #include "LtsMultiMonitor/lts_multi_monitor_selector_base.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
 class QScreen;
 class QPaintEvent;
@@ -4,10 +4,10 @@
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QCloseEvent>
+#include <QtGui/QCloseEvent>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
-#include <QSplitter>
+#include <QtWidgets/QSplitter>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
 #endif
@@ -1,9 +1,9 @@
 #pragma once
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QSplitter;
 class QHBoxLayout;
@@ -3,11 +3,11 @@
 #include "lts_dummy_widget.h"
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
 namespace LtsMultiMonitor
 {
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QHBoxLayout;
@@ -5,9 +5,9 @@
 #include "lts_screen_container.h"
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
-#include <QSplitter>
+#include <QtWidgets/QSplitter>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QSplitter;
 class QHBoxLayout;
@@ -4,10 +4,10 @@
 #include "lts_screen_container.h"
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
-#include <QSplitter>
+#include <QtWidgets/QSplitter>
-#include <QTimer>
+#include <QtCore/QTimer>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
 #endif
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QSplitter;
 class QHBoxLayout;
@@ -4,7 +4,7 @@
 #include "lts_notification_ctl.h"
-#include <QIcon>
+#include <QtGui/QIcon>
 namespace LtsNotification
 {
@@ -4,8 +4,8 @@
 #include "lts_notification_export.h"
-#include <QList>
+#include <QtCore/QList>
-#include <QObject>
+#include <QtCore/QObject>
 #include <functional>
 #include <memory>
@@ -2,12 +2,12 @@
 #include "lts_notification_ctl.h"
-#include <QColor>
+#include <QtGui/QColor>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QIcon>
+#include <QtGui/QIcon>
-#include <QImage>
+#include <QtGui/QImage>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <utility>
 namespace LtsNotification
@@ -4,9 +4,9 @@
 #include "lts_notification_export.h"
-#include <QIcon>
+#include <QtGui/QIcon>
-#include <QList>
+#include <QtCore/QList>
-#include <QObject>
+#include <QtCore/QObject>
 #include <functional>
 #include <memory>
@@ -6,9 +6,9 @@
 #include "lts_plugin_manager_widget.h"
 #include "ui_lts_plugin_manager_dialog.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QString>
+#include <QtCore/QString>
 namespace LtsPluginManager
 {
@@ -4,8 +4,8 @@
 #include "lts_plugin_manager_widget.h"
 #include "ltspluginmanager_export.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QObject>
+#include <QtCore/QObject>
 namespace Ui
 {
@@ -1,8 +1,8 @@
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <lts_plugin_manager.h>
 namespace Ui
@@ -4,13 +4,13 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QDirIterator>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 #include <QMutableListIterator>
-#include <QPluginLoader>
+#include <QtCore/QPluginLoader>
 #include <utility>
 namespace LtsPluginManager
@@ -4,8 +4,8 @@
 #define PLUGIN_LOADER_VERSION 3
-#include <QMap>
+#include <QtCore/QMap>
-#include <QPair>
+#include <QtCore/QPair>
 #include <functional>
 #include <qglobal.h>
@@ -12,8 +12,8 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <utility>
 namespace LtsPluginManager
@@ -7,11 +7,11 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <ProjectConfig/project_defines.h>
-#include <QFlags>
+#include <QtCore/QFlags>
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QString>
+#include <QtCore/QString>
-#include <QVector>
+#include <QtCore/QVector>
 namespace NGL
 {
@@ -8,22 +8,22 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QAbstractItemModel>
+#include <QtCore/QAbstractItemModel>
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QImage>
+#include <QtGui/QImage>
-#include <QLabel>
+#include <QtWidgets/QLabel>
-#include <QListView>
+#include <QtWidgets/QListView>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPrintDialog>
 #include <QPrinter>
-#include <QString>
+#include <QtCore/QString>
-#include <QTableView>
+#include <QtWidgets/QTableView>
-#include <QTableWidget>
+#include <QtWidgets/QTableWidget>
-#include <QTextCursor>
+#include <QtGui/QTextCursor>
-#include <QTextDocument>
+#include <QtGui/QTextDocument>
-#include <QTextEdit>
+#include <QtWidgets/QTextEdit>
 #include <QTextTable>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 namespace LtsPrinting
 {
@@ -5,22 +5,22 @@
 #include <KDReports/KDReports.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QAbstractTextDocumentLayout>
-#include <QDateTime>
+#include <QtCore/QDateTime>
-#include <QFile>
+#include <QtCore/QFile>
-#include <QListView>
+#include <QtWidgets/QListView>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QPair>
+#include <QtCore/QPair>
 #include <QPrintDialog>
 #include <QPrinter>
 #include <QPrinterInfo>
-#include <QTableView>
+#include <QtWidgets/QTableView>
-#include <QTemporaryFile>
+#include <QtCore/QTemporaryFile>
 #include <QTextBlock>
-#include <QTextDocument>
+#include <QtGui/QTextDocument>
 #include <QTextFrame>
 #include <QTextFrameFormat>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
-#include <QUrl>
+#include <QtCore/QUrl>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_dtg.h>
 #include <ngltools/ngltools_filesystem.h>
@@ -2,7 +2,7 @@
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 namespace LtsProjectionWorkstation::JsonKeys
 {
@@ -5,7 +5,7 @@
 #include <LtsWebSocket/client_message.h>
 #include <LtsWebSocket/json_keys.h>
-#include <QUuid>
+#include <QtCore/QUuid>
 namespace LtsProjectionWorkstation
 {
@@ -2,8 +2,8 @@
 #include "messages.h"
-#include <QDebug>
+#include <QtCore/QDebug>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 namespace LtsProjectionWorkstation
 {
@@ -8,7 +8,7 @@
 #include <LtsProjectionWorkstation/vnc_server_manager.h>
 #include <LtsWebSocket/client_message.h>
 #include <LtsWebSocket/json_keys.h>
-#include <QVector>
+#include <QtCore/QVector>
 namespace LtsWebSocket
 {
@@ -7,9 +7,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWebSocket/lts_web_socket_server.h>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
-#include <QTimer>
+#include <QtCore/QTimer>
-#include <QUuid>
+#include <QtCore/QUuid>
 #include <QtWebSockets/QWebSocket>
 #include <nglsettings/nglsettings_connections.h>
 #include <utility>
@@ -8,8 +8,8 @@
 #include "vnc_server_manager.h"
 #include <LtsWebSocket/client_connection.h>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QPair>
+#include <QtCore/QPair>
 namespace LtsWebSocket
 {
@@ -2,9 +2,9 @@
 #include "vnc_server_manager.h"
-#include <QDir>
+#include <QtCore/QDir>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
-#include <QScreen>
+#include <QtGui/QScreen>
 #include <utility>
 namespace LtsProjectionWorkstation
@@ -4,11 +4,11 @@
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QProcess>
+#include <QtCore/QProcess>
-#include <QRect>
+#include <QtCore/QRect>
-#include <QString>
+#include <QtCore/QString>
-#include <QVector>
+#include <QtCore/QVector>
 class QScreen;
@@ -1,6 +1,6 @@
 #include "mainwindow.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 int main(int argc, char* argv[])
 {
@@ -3,8 +3,8 @@
 #include "ui_mainwindow.h"
 #include <LtsScriptTimeline/track_entry.h>
-#include <QDialog>
+#include <QtWidgets/QDialog>
-#include <QLabel>
+#include <QtWidgets/QLabel>
 MainWindow::MainWindow(QWidget* parent)
    : QMainWindow(parent), ui(new Ui::MainWindow), m_selectedTe(nullptr), m_currentNewTopicEditor(nullptr),
@@ -1,6 +1,6 @@
 #pragma once
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include <QObject>
+#include <QtCore/QObject>
 namespace Ui
 {
@@ -5,7 +5,7 @@
 #include "track_content_widget.h"
 #include "track_entry.h"
-#include <QPainter>
+#include <QtGui/QPainter>
 namespace LtsScriptTimeline
 {
@@ -1,9 +1,9 @@
 #pragma once
 #include "track_content_widget.h"
-#include <QMap>
+#include <QtCore/QMap>
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 namespace LtsScriptTimeline
 {
@@ -4,10 +4,10 @@
 #include "track_entry.h"
 #include "ui_filter_track_widget.h"
-#include <QBrush>
+#include <QtGui/QBrush>
-#include <QColor>
+#include <QtGui/QColor>
-#include <QPainter>
+#include <QtGui/QPainter>
-#include <QPen>
+#include <QtGui/QPen>
 namespace LtsScriptTimeline
 {
@@ -2,8 +2,8 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 namespace Ui
 {
@@ -2,7 +2,7 @@
 #include "ui_indicator.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 namespace LtsScriptTimeline
 {
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 namespace Ui
 {