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
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "buildingcontrolbsm_export.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <logger.h>
|
||||
#include "bsm_types.h"
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+3
-3
@@ -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"
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+3
-3
@@ -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"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QByteArray>
|
||||
#include "buildingcontrolbsm_export.h"
|
||||
|
||||
namespace BuildingControlUnit
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "bsm_telegrams_base.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include "bsm_api.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <bcu_types.h>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#include "handeleffect.h"
|
||||
#include <QUrlQuery>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QUrlQuery>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
|
||||
+7
-7
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -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[])
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "xmlreader.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QUrlQuery>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QUrlQuery>
|
||||
#include <QXmlStreamAttributes>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
|
||||
+3
-3
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
|
||||
+3
-3
@@ -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"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "vwm_api.h"
|
||||
|
||||
|
||||
+4
-4
@@ -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)
|
||||
{
|
||||
|
||||
+6
-6
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+3
-3
@@ -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
-3
@@ -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"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "bcu_xml_reader.h"
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <algorithm>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -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>
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class VwmMathUnitTest : public QObject
|
||||
{
|
||||
|
||||
+7
-7
@@ -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
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "vwm_building.h"
|
||||
#include "vwm_types.h"
|
||||
#include "buildingcontrolvwm_export.h"
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
|
||||
+2
-2
@@ -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>
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
+2
-2
@@ -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
-3
@@ -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
|
||||
{
|
||||
|
||||
+5
-5
@@ -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>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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
-3
@@ -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
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include "buildingcontrolcommon_export.h"
|
||||
#include <bcu_types.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user