Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp

@@ -9,7 +9,6 @@
 
 #include <QtNetwork/QHostAddress>
 #include <QtCore/QStringList>
-#include <QtCore/QRegExp>
 #include <QtCore/QString>
 #include "ava_test_server.h"
 
@@ -325,7 +324,7 @@ AvaTestServer::AvaTestServer()
 
 AvaTestServer::~AvaTestServer()
 {
-  for (QTcpSocket *conn : qAsConst(m_Conns))
+  for (QTcpSocket *conn : std::as_const(m_Conns))
   {
     // disconnect before we delete as otherwise closedConnection() would be called wich would
     // also delete the socket.
@@ -366,14 +365,13 @@ void AvaTestServer::closedConnection()
   qDebug() << "connection closed";
   m_PosUpdate->stop();
 
-  QMutableVectorIterator<QTcpSocket *> l_It(m_Conns);
-  while (l_It.hasNext())
+  for (int i = 0; i < m_Conns.size(); ++i)
   {
-    QTcpSocket *l_Conn = l_It.next();
+    QTcpSocket *l_Conn = m_Conns[i];
     if (l_Conn->state() == QAbstractSocket::UnconnectedState)
     {
       l_Conn->disconnect(this);
-      l_It.remove();
+      m_Conns.removeAt(i);
       l_Conn->deleteLater(); // use deleteLater() as we want to delete the object which was emitting the signal
       return;
     }
@@ -404,18 +402,15 @@ void AvaTestServer::sendScriptPosUpdate()
 
   if (m_RelScriptPos >= m_SelStreamFromScript.getDuration())
   {
-    QVectorIterator<ScrEdAVStream> l_Iterator(m_Script.getStreamSequences());
     float l_Duration = 0;
-    while (l_Iterator.hasNext())
+    for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences())
     {
-      ScrEdAVStream l_Stream = l_Iterator.next();
       l_Duration += l_Stream.getDuration();
       qDebug() << "l_Duration " << l_Duration << " abs_scriptpos " << m_AbsScriptPos << " stream " << l_Stream.getName();
       if (l_Duration > m_AbsScriptPos)
       {
         qDebug() << "set stream " << l_Stream.getName();
         m_SelStreamFromScript = l_Stream;
-        l_Iterator.toBack();
         m_RelScriptPos = 0;
       }
     }
@@ -434,11 +429,8 @@ void AvaTestServer::sendScriptPosUpdate()
 void AvaTestServer::readAndAnswer()
 {
 
-  QVectorIterator<QTcpSocket *> l_It(m_Conns);
-  while (l_It.hasNext())
+  for (QTcpSocket *l_Conn : std::as_const(m_Conns))
   {
-    QTcpSocket *l_Conn = l_It.next();
-
     if (l_Conn->state() != QAbstractSocket::ConnectedState)
       continue;
 
@@ -1102,20 +1094,15 @@ void AvaTestServer::processLine(const QByteArray &line)
           qDebug() << l_Parts[4].trimmed();
 
           //check if absolute pos is in current played stream of script, and set corresponding stream as selected Stream
-          QVectorIterator<ScrEdAVStream> l_Iterator(m_Script.getStreamSequences());
           float l_Duration = 0;
-          while (l_Iterator.hasNext())
+          for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences())
           {
-            ScrEdAVStream l_Stream = l_Iterator.next();
             float l_OldDuration = l_Duration;
             l_Duration += l_Stream.getDuration();
             //qDebug() << "l_Duration " << l_Duration.toString("hh:mm:ss") << " abspos " << m_AbsScriptPos.toString("hh:mm:ss") << " l_Stream = " << l_Stream.getName();
             if (l_Duration > m_AbsScriptPos)
             {
-
               m_SelStreamFromScript = l_Stream;
-              l_Iterator.toBack();
-
               m_RelScriptPos = m_AbsScriptPos - l_OldDuration;
               qDebug() << "set stream 2" << l_Stream.getName() << " pos is " << m_RelScriptPos;
               //m_RelScriptPos = QDateTime::fromTime_t(0);
@@ -1328,11 +1315,8 @@ void AvaTestServer::sendData(const QString &data_)
   qDebug() << "Outgoing RCP_AVA: " << data_;
   QString   data = data_;
   data.append(EOL);
-  QVectorIterator<QTcpSocket *> l_It(m_Conns);
-  while (l_It.hasNext())
+  for (QTcpSocket *l_Conn : std::as_const(m_Conns))
   {
-    QTcpSocket *l_Conn = l_It.next();
-
     if (l_Conn->state() == QAbstractSocket::ConnectedState)
     {
       //qDebug() << "sent to conn " << l_Conn;