From 3aa0b04ebd1acc5d200dbd4266cf56fd5c19e9ca Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 11 Sep 2026 15:14:11 +0000 Subject: [PATCH] Cleans up only warnings and specific CMake/include path error in the Qt6 migration tree, using strictly minimal changes with minimal side effects. --- qt6-after/qt6-migrated-legatus/.envrc | 1 + .../Lts/Common/CodeGen/XmlReader.cpp | 12 +++++------- .../Lts/DDS/DDSConnector/dds_connector.cpp | 4 ++-- .../Lts/DDS/Generic/subscriber_listener.cpp | 2 +- .../Z/src/NGLLogger/CMakeLists.txt | 1 - .../Z/src/NGLLogger/NGLLogger.cpp | 2 ++ qt6-after/qt6-migrated-legatus/docker_build.sh | 4 ++-- .../include/DDS/Generic/generic_base.h | 10 +++++----- 8 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 qt6-after/qt6-migrated-legatus/.envrc diff --git a/qt6-after/qt6-migrated-legatus/.envrc b/qt6-after/qt6-migrated-legatus/.envrc new file mode 100644 index 000000000..547159bcc --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/.envrc @@ -0,0 +1 @@ +export MIGRATE_PIPELINE_ROOT=/home/torsten/sandbox/qt6-migration-pipeline \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp index 21eb7c47a..e475804eb 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp @@ -82,15 +82,13 @@ bool XmlReader::readServiceFile(const QString& svcFile, const QString& idlServic INFO_LOG(m_logger) << "SvcFile: " << svcFile; - QString errMsg; - int errLine = 0; - int errColumn = 0; QDomDocument doc; - if (!doc.setContent(&f, &errMsg, &errLine, &errColumn)) + auto parseResult = doc.setContent(&f); + if (!parseResult) { - m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("': ") + errMsg + - QLatin1String(" at ") + QString::number(errLine) + QLatin1Char(':') + - QString::number(errColumn); + m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("' at line ") + + QString::number(parseResult.errorLine) + QLatin1Char(':') + + QString::number(parseResult.errorColumn); ERROR_LOG(m_logger) << m_errorString; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp index c3f0ddbec..78c5be576 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp @@ -22,7 +22,8 @@ DdsConnector::DdsConnector(int domainId, int exerciseId, DDS::QosProfile::ConnectionType connectionType, const QUrl &tcpConnectionUrl) - : m_domainId(domainId) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector")) + , m_domainId(domainId) , m_defaultPartitionType(defaultPartitionType) , m_partitionId(partitionId) , m_exerciseId(exerciseId) @@ -32,7 +33,6 @@ DdsConnector::DdsConnector(int domainId, , m_publisher(nullptr) , m_subscriber(nullptr) , m_wsHandler(nullptr) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector")) { initInternal(); DEBUG_LOG(m_logger) << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << "," << m_exerciseId << "," diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp index d13db8c8b..d7f8ff6a2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp @@ -23,7 +23,7 @@ void SubscriberListener::addCallback(const std::string& topicName, const std::st QWriteLocker l(&m_accessLock); if (m_bPrepareForShutdown) return; - m_droCallbacks.insertMulti(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb)); + m_droCallbacks.insert(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb)); } void SubscriberListener::removeCallback(const std::string& topicName, const std::string& topicTypeName, diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt index 8be14d629..0aaece8b0 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt @@ -23,7 +23,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(NGLLogger ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/Z/src/NGLLogger ) # Export headers for other modules building in the same tree (e.g., TetraIF) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp index 172f8cd95..485fbabe7 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp @@ -300,6 +300,7 @@ NGL::NGLLogger &NGL::NGLLogger::getNGLRootLogger() +#ifdef HAVE_LOG4QT static QString findConfigFile(const QString &configfilename) { if (configfilename.isEmpty()) @@ -318,6 +319,7 @@ static QString findConfigFile(const QString &configfilename) return QString(); } +#endif diff --git a/qt6-after/qt6-migrated-legatus/docker_build.sh b/qt6-after/qt6-migrated-legatus/docker_build.sh index 894aa36ad..52f7f65aa 100755 --- a/qt6-after/qt6-migrated-legatus/docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/docker_build.sh @@ -3,8 +3,8 @@ set -e # Run CMake configuration and build inside Docker docker run --rm \ - -v /home/torsten/swy/sandbox:/workspace \ - -v /home/torsten/swy/sandbox/rti_license.dat:/workspace/rti_license.dat \ + -v ${MIGRATE_PIPELINE_ROOT}:/workspace \ + -v ${MIGRATE_PIPELINE_ROOT}/rti_license.dat:/workspace/rti_license.dat \ -w /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus \ ubuntu:26.04 bash -c " apt-get update -qq && \ diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h index 10d5f944d..8819487c9 100644 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h +++ b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h @@ -38,11 +38,11 @@ DDSGEN_EXPORT inline std::string getShortTopicName(const std::string &fqName) { } // Stub for getMethod - returns default-constructed QMetaMethod -DDSGEN_EXPORT inline QMetaMethod getMethod(NGL::INGLLogger &logger, - QObject *objectToInform, - const char *slotToExecute, - const char *signalSignature, - bool bWarnOnEmptySlot = true) { +DDSGEN_EXPORT inline QMetaMethod getMethod(NGL::INGLLogger & /*logger*/, + QObject * /*objectToInform*/, + const char * /*slotToExecute*/, + const char * /*signalSignature*/, + bool /*bWarnOnEmptySlot*/ = true) { // Stub implementation - returns default QMetaMethod return QMetaMethod(); }