Adds immediate migration results

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

@@ -4,6 +4,8 @@
 # $Author$
 #
 
+IF(BUILD_RTI)
+
 INCLUDE(MacroRTIDDSGen)
 INCLUDE(MacroCodeGenIdl)
 
@@ -47,7 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
   PRIVATE
     RTI::nddscpp2
   PUBLIC
-    Qt5::Core
+    Qt6::Core
     ddscore
     NGLLogger
     LtsUtilsCore
@@ -144,7 +146,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcProjectDataManagement ${SRCS_exe})
 NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
-  Qt5::Core
+  Qt6::Core
   svcCoreClient
   svcPdmCommon
   svcPdmServer
@@ -164,3 +166,5 @@ NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
 # Uncomment if necessary
 #ADD_SUBDIRECTORY(UnitTests)
 ADD_SUBDIRECTORY(ModuleTests)
+
+ENDIF(BUILD_RTI)

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/CMakeLists.txt

@@ -17,8 +17,8 @@ IF(BUILD_TESTING)
    # Testing DataTopic Functionality (DTC)
    ADD_EXECUTABLE(pdmTests ${SRCS_DT_TEST} ${HDRS_DT_TEST})
    TARGET_LINK_LIBRARIES(pdmTests
-     Qt5::Core
-     Qt5::Test
+     Qt6::Core
+     Qt6::Test
      RTI::nddscpp2
      svcPdmClient
      LtsCommandLineParser

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "pdm_dtc_impl_custom.h"
+#include <utility>
 #include "NGLLogger/INGLLogger.h"
 #include "pdm_translation.h"
 #include <QJsonArray>
@@ -1159,7 +1160,7 @@ QStringList DtcImplCustom::chargeNames(std::vector<int> &chargeIds)
     QStringList sl;
     auto uleisClassOffsets = it.value();
     sl.reserve(uleisClassOffsets.size());
-    for (UleisClassOffset o : qAsConst(uleisClassOffsets))
+    for (UleisClassOffset o : std::as_const(uleisClassOffsets))
       sl << offsetName(o);
 
     if (sl.size() == 6)
@@ -1615,7 +1616,7 @@ ProjectDataManagement::BuildingChargeEffect DtcImplCustom::getBuildingChargeEffe
     waitForHistoricalDataBuildingChargeEffect(2000);
   }
 
-  for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : qAsConst(m_buildingChargeEffectCont))
+  for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : std::as_const(m_buildingChargeEffectCont))
   {
     if (bcEffect.chargeTypeId() == chargeTypeId)
     {
@@ -1675,7 +1676,7 @@ QString DtcImplCustom::adlerLoadTypeName(int loadTypeId)
 
 QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
 {
-  for (const ProjectDataManagement::TargetType &targetTyp : qAsConst(m_targetTypeCont))
+  for (const ProjectDataManagement::TargetType &targetTyp : std::as_const(m_targetTypeCont))
   {
     const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetTyp.properties().c_str(),
                                                                             targetTyp.properties().size())).object();
@@ -1687,7 +1688,7 @@ QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
 
 QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId)
 {
-  for (const ProjectDataManagement::TargetSubType &targetSubTyp : qAsConst(m_targetSubTypeCont))
+  for (const ProjectDataManagement::TargetSubType &targetSubTyp : std::as_const(m_targetSubTypeCont))
   {
     const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetSubTyp.properties().c_str(),
                                                                             targetSubTyp.properties().size())).object();

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp

@@ -1,4 +1,5 @@
 #include "static_pvsan_import.h"
+#include <utility>
 
 #include <QFile>
 #include <QTextStream>
@@ -293,7 +294,7 @@ bool PvSanImport::addProcedures(const QVector<QString> &procedures)
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : qAsConst(translations))
+  for (const auto &tr : std::as_const(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -418,7 +419,7 @@ bool PvSanImport::addMaterial(const QVector<QString> &material)
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : qAsConst(translations))
+  for (const auto &tr : std::as_const(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -481,7 +482,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : qAsConst(translations))
+  for (const auto &tr : std::as_const(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -495,7 +496,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryKind injuryKindDb;
-  for (const QString &kd : qAsConst(kind))
+  for (const QString &kd : std::as_const(kind))
  {
     QStringList kde = kd.split(QStringLiteral(";"));
     if (kde.size() < 3 )
@@ -526,7 +527,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   myContext = QStringLiteral("SanitationInjuryPlace1");
   m_db->truncatePdmSanitationInjuryPlace1();
   idsToRemove.clear();
-  for (const auto &tr : qAsConst(translations))
+  for (const auto &tr : std::as_const(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -540,7 +541,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryPlace1 placeDb;
-  for (const QString &place : qAsConst(place1))
+  for (const QString &place : std::as_const(place1))
  {
     QStringList pl = place.split(QStringLiteral(";"));
     if (pl.size() < 3 )
@@ -572,7 +573,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   myContext = QStringLiteral("SanitationInjuryPlace2");
   m_db->truncatePdmSanitationInjuryPlace2();
   idsToRemove.clear();
-  for (const auto &tr : qAsConst(translations))
+  for (const auto &tr : std::as_const(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -586,7 +587,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryPlace2 place2Db;
-  for (const QString &place : qAsConst(place2))
+  for (const QString &place : std::as_const(place2))
  {
     QStringList pl = place.split(QStringLiteral(";"));
     if (pl.size() < 3 )
@@ -633,7 +634,7 @@ bool PvSanImport::addInjuries(const QVector<QString> &injuries)
   trans.context = myContext;
   Database::PdmSanitationInjury injuryDb;
   int id = 1;
-  for (const QString &injury : qAsConst(injuries))
+  for (const QString &injury : std::as_const(injuries))
  {
     QStringList kde = injury.split(QStringLiteral(";"));
     if (kde.size() <  29 )

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp

@@ -6,6 +6,7 @@
   */
 
 #include "translation.h"
+#include <utility>
 #include "dds_handler.h"
 #include <QTimer>
 #include <QJsonArray>
@@ -61,7 +62,7 @@ void Translation::collectAndPublishData()
 void Translation::publishData()
 {
   QJsonArray arr;
-  for (const QJsonObject &obj : qAsConst(m_jsonData))
+  for (const QJsonObject &obj : std::as_const(m_jsonData))
     arr += obj;
 
   const QJsonObject jObj{ {QStringLiteral("translations"), arr} };