Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt

@@ -5,9 +5,9 @@
 #
 
 IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
-  FIND_PACKAGE(Boost REQUIRED COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
+  FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
 ELSE()
-  FIND_PACKAGE(Boost REQUIRED)
+  FIND_PACKAGE(Boost)
 ENDIF()
 INCLUDE(MacroRTIDDSGen)
 INCLUDE(MacroCodeGenIdl)
@@ -154,7 +154,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
     $<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
     $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
     ngldb
-    Boost::boost
+    $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
 )
 NGL_INSTALL_TARGET(svcAvmCommon)
 
@@ -310,7 +310,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAudioVideoManagement
     nglcoreapplication
     ngltools
     LtsUtilsCoreHeaderOnly
-    Boost::boost
+    $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
     svcCnrHelper
 )
 

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/CMakeLists.txt

@@ -71,7 +71,7 @@ IF(BUILD_TESTING)
       avaTestServer_static
       nglcoreapplication
       NGLLogger
-      Boost::boost
+      $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
     )
     ADD_TEST(NAME avmTests COMMAND $<TARGET_FILE:avmTests>)
   ENDIF()

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp

@@ -77,9 +77,10 @@ QString StreamNameMapping::internalName(const QString &displayName)
 
 QString StreamNameMapping::displayName(const QString &internalName) const
 {
-  bool            matched = m_extractor.exactMatch(internalName);
-  const QString   effectiveStreamName = matched ? m_extractor.cap(1) : internalName;
-  const QString   sourceSpecifier = matched ? m_extractor.cap(2) : QString();
+  QRegularExpressionMatch match = m_extractor.match(internalName);
+  bool            matched = match.hasMatch();
+  const QString   effectiveStreamName = matched ? match.captured(1) : internalName;
+  const QString   sourceSpecifier = matched ? match.captured(2) : QString();
 
   const auto  &found = m_internalToDisplay.find(effectiveStreamName);
   if (found == m_internalToDisplay.end())

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.h

@@ -12,7 +12,7 @@
 #include "avm_export.h"
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtCore/QRegExp>
+#include <QtCore/QRegularExpression>
 #include <cstdint>
 #include <map>
 #include <vector>
@@ -85,7 +85,7 @@ private:
   void remove(int32_t mountingPointId);
 
   /** Used to extract the effective streamName if it contains a source specifier "(S)" or "(L)". */
-  const QRegExp                m_extractor{QStringLiteral("(.*)(\\([SL]\\))"), Qt::CaseInsensitive};
+  const QRegularExpression       m_extractor{QStringLiteral("(.*)(\\([SL]\\))")};
   std::map<int32_t, Names>     m_mpToNames;         //!< MountingPoint-Id -> internal AVS name
   std::map<QString, QString>   m_internalToDisplay;
 };