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/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;
     }

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 << ","

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,