Session 026: Lts/Services Qt5:: to Qt6:: migration

- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp

@@ -7,13 +7,12 @@
   */
 
 #include "unit_test.h"
-#include <utility>
 
 #include <TargetManagement/shootback_controller.h>
 
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>
 
 #include <nglapplication/nglapplication.h>
 #include <nglapplication/nglcoreapplication.h>
@@ -21,8 +20,8 @@
 
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QtCore/QTimer>
-#include <QtCore/QFlags>
+#include <QTimer>
+#include <QFlags>
 #include <iostream>
 
 
@@ -100,7 +99,7 @@ tgtTestShootbackTarget::~tgtTestShootbackTarget()
 
 void tgtTestShootbackTarget::initTestCase()
 {
-  NOTICE_LOG(m_logger) << Q_FUNC_INFO << " do testing with"
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " do testing with"
                        << " domainId=" << m_domainId
                        << " exerciseId=" << m_exerciseId;
 
@@ -128,7 +127,7 @@ void tgtTestShootbackTarget::initTestCase()
   removeTestObjects();
 
   if (!bRet)
-    FATAL_LOG(m_logger) << Q_FUNC_INFO << " init failed!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " init failed!!!";
 }
 
 
@@ -155,7 +154,7 @@ void tgtTestShootbackTarget::testShootbackArea()
 
   // time to process reply
   QTest::qWait(100);
-  NOTICE_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
 
 
   // modify
@@ -169,7 +168,7 @@ void tgtTestShootbackTarget::testShootbackArea()
     // verify mod
     {
       TargetManagement::ShootbackArea modData = m_dtcTgt->shootbackArea(m_replyShootbackAreaId);
-      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << LOGFUNCTION << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyShootbackAreaId), " shootbackArea failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -207,7 +206,7 @@ void tgtTestShootbackTarget::testShootbackTarget()
 
   // time to process reply
   QTest::qWait(100);
-  NOTICE_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
 
 
   // modify
@@ -220,13 +219,13 @@ void tgtTestShootbackTarget::testShootbackTarget()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::shootbackTargetChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << LOGFUNCTION << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // verify mod
     {
       TargetManagement::ShootbackTarget modData = m_dtcTgt->shootbackTarget(m_replyShootbackTargetId);
-      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << LOGFUNCTION << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyShootbackTargetId), " shootbackTarget failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -268,7 +267,7 @@ void tgtTestShootbackTarget::testTargetAreaAssignment()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::targetAreaAssignmentChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << LOGFUNCTION << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // time to process reply
@@ -288,13 +287,13 @@ void tgtTestShootbackTarget::testTargetAreaAssignment()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::targetAreaAssignmentChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << LOGFUNCTION << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // verify mod
     {
       TargetManagement::TargetAreaAssignment modData = m_dtcTgt->targetAreaAssignment(m_replyTargetAreaAssignmentId);
-      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << LOGFUNCTION << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyTargetAreaAssignmentId), " targetAreaAssignment failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -321,38 +320,38 @@ void tgtTestShootbackTarget::removeTestObjects()
   // first, remove all TargetAreaAssignments:
   {
     QMap<qint32, TargetManagement::TargetAreaAssignment> allObj = m_dtcTgt->targetAreaAssignments();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove... (" << allObj.size() << " TargetAreaAssignments)";
-    for (auto item: std::as_const(allObj))
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " TargetAreaAssignments)";
+    for (auto item: qAsConst(allObj))
       if (item.name().substr(0, 8).compare("UnitTest") == 0)
         removeAssignment(item.id());
     QTest::qWait(250); // time to process reply
     allObj = m_dtcTgt->targetAreaAssignments();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove targetAreaAssignments finished -> " << allObj.size() << " TargetAreaAssignments";
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove targetAreaAssignments finished -> " << allObj.size() << " TargetAreaAssignments";
   }
 
   // remove all Areas:
   {
     QMap<qint32, TargetManagement::ShootbackArea> allObj = m_dtcTgt->shootbackAreas();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove... (" << allObj.size() << " Areas)";
-    for (auto item: std::as_const(allObj))
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " Areas)";
+    for (auto item: qAsConst(allObj))
       if (item.name().substr(0, 8).compare("UnitTest") == 0)
         removeArea(item.id());
     QTest::qWait(250); // time to process reply
     allObj = m_dtcTgt->shootbackAreas();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove shootbackAreas finished -> " << allObj.size() << " Areas";
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove shootbackAreas finished -> " << allObj.size() << " Areas";
   }
 
   // remove all Targets:
   {
     QMap<qint32, TargetManagement::ShootbackTarget> allObj = m_dtcTgt->shootbackTargets();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove... (" << allObj.size() << " Targets)";
-    for (auto item: std::as_const(allObj))
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " Targets)";
+    for (auto item: qAsConst(allObj))
       if (item.name().substr(0, 8).compare("UnitTest") == 0)
         removeTarget(item.id());
     QTest::qWait(250); // time to process reply
 
     allObj = m_dtcTgt->shootbackTargets();
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " remove shootbackTargets finished -> " << allObj.size() << " Targets";
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " remove shootbackTargets finished -> " << allObj.size() << " Targets";
   }
   QTest::qWait(1000);        // time to process
 }
@@ -387,7 +386,7 @@ void tgtTestShootbackTarget::createArea(int &areaIdInOut, const QString &name, d
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
+  INFO_LOG(m_logger) << LOGFUNCTION << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
 
   areaIdInOut = m_replyShootbackAreaId;
 }
@@ -447,7 +446,7 @@ void tgtTestShootbackTarget::createTarget(int &targetIdOut, int targetParticipan
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
+  INFO_LOG(m_logger) << LOGFUNCTION << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
 
   targetIdOut = m_replyShootbackTargetId;
 }
@@ -515,7 +514,7 @@ void tgtTestShootbackTarget::createAssignment(int areaId, int targetParticipantI
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyTargetAreaAssignmentId: " << m_replyTargetAreaAssignmentId;
+  INFO_LOG(m_logger) << LOGFUNCTION << " got m_replyTargetAreaAssignmentId: " << m_replyTargetAreaAssignmentId;
 
   assignmentIdOut = m_replyTargetAreaAssignmentId;
 }
@@ -564,7 +563,7 @@ void tgtTestShootbackTarget::moveParticipant(int participantId, double lon, doub
   if (!m_dtsPpm)
     return;
 
-  NOTICE_LOG(m_logger) << Q_FUNC_INFO << " move Participant: id = " << participantId;
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " move Participant: id = " << participantId;
   ParticipantManagement::ParticipantPosition posReq;
   posReq.participantId(participantId);
   posReq.sampleTime(currentSampleTime());
@@ -572,7 +571,7 @@ void tgtTestShootbackTarget::moveParticipant(int participantId, double lon, doub
   posReq.partyId(2);                                // 0 and 1 will be skipped
   if (!m_dtsPpm->publish(posReq))
   {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error publish posReq";
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error publish posReq";
     return;
   }
 }
@@ -727,7 +726,7 @@ void tgtTestShootbackTarget::testPlayerMovesLos()
 
   // move assigned target 1 slightly:
   {
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " move target1 ...";
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " move target1 ...";
     modifyTarget(m_targetDataId1, g_targetParticipantId_1, QStringLiteral("UnitTest-TargetDataId1_Moved"), 0.149, 0.926, 55.0);
 
     QTest::qWait(250);        // time to process
@@ -736,7 +735,7 @@ void tgtTestShootbackTarget::testPlayerMovesLos()
 
   // move (z) assigned target 1 to interrupt line of sight:
   {
-    NOTICE_LOG(m_logger) << Q_FUNC_INFO << " move target1 ...";
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " move target1 ...";
     modifyTarget(m_targetDataId1, g_targetParticipantId_1, QStringLiteral("UnitTest-TargetDataId1_Moved"), 0.152, 0.926, 2.0);
 
     QTest::qWait(250);        // time to process

qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h

@@ -18,7 +18,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
@@ -70,8 +70,6 @@ private Q_SLOTS:
   void cleanupTestCase(); // one time at the end
 
 protected:
-
-NGL::INGLLogger &m_logger;
   void onShootbackAreaModifyReply(const Core::FunctionReplyObject &reply) override final;
   void onShootbackAreaRemoveReply(const Core::FunctionReplyObject &reply) override final;
 
@@ -126,5 +124,8 @@ private:
   int m_replyShootbackAreaId = -1;
   int m_replyShootbackTargetId = -1;
   int m_replyTargetAreaAssignmentId = -1;
+
+  NGL::INGLLogger &m_logger;
+
 };
 } // namespace