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>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "connection_handler_serial.h"
|
||||
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "logger.h"
|
||||
#include <LtsSerialPortQuerry/lts_serial_port_querry.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QSerialPort>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "settings.h"
|
||||
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QTcpSocket>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
|
||||
#include "logger.h"
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
#include "logger.h"
|
||||
#include "handler_vehicle.h"
|
||||
#include "esc_helper.h"
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <EffectShowClient/esc_dts.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "esc_convert_to_tab.h"
|
||||
#include <LtsUtils/qbytearray_byteaccess.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QByteArray>
|
||||
|
||||
|
||||
namespace EffectShowClient
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <EffectShowManagement/esm_dtc.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include "handler_order.h"
|
||||
#include "handler_vehicle.h"
|
||||
#include "control_unit_handler.h"
|
||||
#include <QTimer>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace EffectShowClient
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <EffectShowClient/esc_db.h>
|
||||
#include "handler_vehicle.h"
|
||||
#include "dds_handler.h"
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
#include "handler_tab_data.h"
|
||||
#include "handler_order.h"
|
||||
#include "handler_vehicle.h"
|
||||
#include <QTimer>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace EffectShowClient
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <EffectShowClient/esc_db.h>
|
||||
|
||||
#include "handler_vehicle.h"
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
|
||||
#include "handler_tab_data.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include "handler_vehicle.h"
|
||||
#include "dds_handler.h"
|
||||
#include "control_unit_handler.h"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "handler_tab_data.h"
|
||||
#include "handler_vehicle.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace EffectShowClient
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <EffectShowClient/esc_db.h>
|
||||
#include "dds_handler.h"
|
||||
#include "esc_convert_from_tab.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2017-02-20
|
||||
*/
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include "main_handler.h"
|
||||
#include "handler_tab_data.h"
|
||||
#include "handler_order.h"
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "esc_helper.h"
|
||||
#include "control_unit_handler.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
#include "esc_convert_to_tab.h"
|
||||
#include "logger.h"
|
||||
#include "esc_helper.h"
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <NotificationManagement/nom_ftc.h>
|
||||
|
||||
#include <Core/core_types.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user