Adds immediate migration results

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/CMakeLists.txt

@@ -58,8 +58,8 @@ INSTALL_SHARED_FILES(pre_script_common_SRCS
 
 NGL_ADD_LIBRARY2(WS PreGuiScriptCommon SHARED ${pre_script_common_SRCS})
 NGL_TARGET_LINK_LIBRARIES(PreGuiScriptCommon
-  Qt5::Widgets
-  Qt5::Network
+  Qt6::Widgets
+  Qt6::Network
   PreGuiCommon # topic assignments
   NGLLogger
   LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp

@@ -1,6 +1,7 @@
 
 
 #include "db_reader.h"
+#include <utility>
 
 #include <DDS/DDSConnector/dds_connector.h>
 
@@ -78,7 +79,7 @@ bool DbReader::init(const QSqlDatabase &dbFrom, const QSqlDatabase &dbTo)
 
 bool DbReader::createTables()
 {
-  for(RecordReplay::RecordReplayPlugin *recPlugin : qAsConst(m_plugins))
+  for(RecordReplay::RecordReplayPlugin *recPlugin : std::as_const(m_plugins))
   {
     const QVector<QString> tableNames = recPlugin->getRecordTableNames();
     for (const QString &name : tableNames)
@@ -105,7 +106,7 @@ bool DbReader::copyData(qint64 fromTime, qint64 toTime)
   if (!m_queryFrom || !m_queryTo)
     return false;
   
-  for(RecordReplay::RecordReplayPlugin *recPlugin : qAsConst(m_plugins))
+  for(RecordReplay::RecordReplayPlugin *recPlugin : std::as_const(m_plugins))
   {
     if (!recPlugin->copyData(*m_queryFrom, *m_queryTo, fromTime, toTime))
       return false;

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp

@@ -2,6 +2,7 @@
 
 
 #include "export_process.h"
+#include <utility>
 #include "export_step.h"
 #include <QDir>
 #include <QJsonDocument>
@@ -61,10 +62,10 @@ ExportProcess::ExportProcess(LtsSession::LtsSession *pSession,
 
 ExportProcess::~ExportProcess()
 {
-  for (auto e : qAsConst(m_vecExportSteps))
+  for (auto e : std::as_const(m_vecExportSteps))
     e->deleteLater();
 
-  for (auto e : qAsConst(m_vecExportStepsExecuted))
+  for (auto e : std::as_const(m_vecExportStepsExecuted))
     e->deleteLater();
 }
 
@@ -106,7 +107,7 @@ void ExportProcess::slotStartExport()
 
   QVector<TopicReplay::Interface::SituationReplayTime> allSitReplayTimes;
 
-  for (const PresentationManagement::PresentationContent &content : qAsConst(m_contentList))
+  for (const PresentationManagement::PresentationContent &content : std::as_const(m_contentList))
   {
     auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType()));
     if (it == m_trackEntryAssignments.constEnd())
@@ -200,7 +201,7 @@ QVector<ExportStep *> ExportProcess::parseFilterSteps(
   QVector<ExportStep *> ret;
   const QJsonArray filters = detailData.value(QStringLiteral("Filters")).toArray();
   QJsonArray newFilterLines;
-  for (const QJsonValue &filterLineValue : qAsConst(filters))
+  for (const QJsonValue &filterLineValue : std::as_const(filters))
   {
     TopicEditorBase::TopicData data;
     auto temp = filterLineValue.toObject();
@@ -321,9 +322,9 @@ void ExportProcess::slotRunExportStep()
     DEBUG_LOG(m_logger) << "ExportProcess::slotRunExportStep() CALLED, m_vecExportSteps.size(): " << m_vecExportSteps.size()
                         << ", m_vecExportStepsExecuted.size(): " << m_vecExportStepsExecuted.size();
 
-    for (const auto &s : qAsConst(m_vecExportSteps))
+    for (const auto &s : std::as_const(m_vecExportSteps))
       DEBUG_LOG(m_logger) << "m_vecExportSteps: " << s << " compare: " << (s == sender());
-    for (const auto &s : qAsConst(m_vecExportStepsExecuted))
+    for (const auto &s : std::as_const(m_vecExportStepsExecuted))
       DEBUG_LOG(m_logger) << "m_vecExportStepsExecuted: " << s << " compare: " << (s == sender());
   }
 
@@ -365,7 +366,7 @@ void ExportProcess::exportDone()
   copyStaticContent();
 
   QStringList sl;
-  for (const auto &step : qAsConst(m_vecExportStepsExecuted))
+  for (const auto &step : std::as_const(m_vecExportStepsExecuted))
   {
     if (step->exportFailed())
       sl << QStringLiteral("%1 (%2)").arg(step->m_topicData.description, TopicEditorBase::topicTypeTranslation(step->m_topicData.topicType));
@@ -483,7 +484,7 @@ void ExportProcess::createDataJson(const std::shared_ptr<ExerciseManagement::Int
   QJsonArray presentations = obj[QStringLiteral("presentations")].toArray();
   const QString presPath = QString(QString::number(m_scriptId) + QStringLiteral("/presentation.json"));
   bool bPresFound = false;
-  for (const QJsonValue &val : qAsConst(presentations))
+  for (const QJsonValue &val : std::as_const(presentations))
   {
     const QJsonObject arrObj = val.toObject();
     if (arrObj[QStringLiteral("path")].toString() == presPath)
@@ -540,7 +541,7 @@ void ExportProcess::createPresentationTable()
 
   QJsonArray topicArray;
   int topicId = 1;
-  for (const TakeHomePackageGenerator::ExportStep *s : qAsConst(m_vecExportStepsExecuted))
+  for (const TakeHomePackageGenerator::ExportStep *s : std::as_const(m_vecExportStepsExecuted))
   {
     if (s->exportFailed())
     {

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/CMakeLists.txt

@@ -38,7 +38,7 @@ NGL_TARGET_LINK_LIBRARIES(PreScriptGuiPlugin
   PreGuiCommon
   PreGuiScriptCommon
   svcPreCommon
-  Qt5::Widgets
+  Qt6::Widgets
   LtsWidgets
   LtsDataView
   LtsUtilsGuiDds

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_dialog.cpp

@@ -1,4 +1,5 @@
 #include "pre_journal_dialog.h"
+#include <utility>
 #include "ui_pre_journal_dialog.h"
 
 #include <LtsPrinting/printing.h>
@@ -54,7 +55,7 @@ void JournalDialog::fillJournal()
     return;
 
   m_ui->listWidget->addItem(m_journal->getText());
-  for (const Journal *j : qAsConst(m_journal->journalList))
+  for (const Journal *j : std::as_const(m_journal->journalList))
     m_ui->listWidget->addItem(j->getText());
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp

@@ -5,6 +5,7 @@
 
 
 #include "pre_script_dialog.h"
+#include <utility>
 #include "ui_pre_script_dialog.h"
 #include "pre_journal_dialog.h"
 #include "pre_screen.h"
@@ -233,12 +234,12 @@ ScriptDialog::~ScriptDialog()
   deleteProjectionWidget(&m_projectionWidget2);
 
 
-  for (const FilterTopic &ft : qAsConst(m_filterTopicVector))
+  for (const FilterTopic &ft : std::as_const(m_filterTopicVector))
     delete ft.filterTopic;
 
   delete m_sitMapTopicIfc;
 
-  for (const TopicAssignment &ta : qAsConst(m_trackEntryAssignments))
+  for (const TopicAssignment &ta : std::as_const(m_trackEntryAssignments))
     ta.m_topicEditorIfc->finishTopicEditor();
 
   if (m_essentialsViewApp != nullptr)
@@ -326,7 +327,7 @@ void ScriptDialog::slotEditEntry(const int topicId)
   
   QVector<TrackEntry *> tes = m_ui->widget->getTrackEntriesWithFiltersAsEntries(); 
 
-  for (TrackEntry *te : qAsConst(tes))
+  for (TrackEntry *te : std::as_const(tes))
   {
     
     if (te->m_topicId == topicId)
@@ -728,7 +729,7 @@ void ScriptDialog::slotCheckNewTopicLength(int newLength, LtsUtils::Promise *pro
 
 TopicEditorBase::TopicEditor *ScriptDialog::createTopicEditor(TrackEntry *te) 
 {
-  for (const TopicAssignment &ta : qAsConst(m_trackEntryAssignments))
+  for (const TopicAssignment &ta : std::as_const(m_trackEntryAssignments))
   {
     if (ta.m_trackEntryType == te->m_type)
     {
@@ -1626,7 +1627,7 @@ bool ScriptDialog::apply()
 
   int size = 0;
 
-  for (const auto &trackEntryList : qAsConst(trackList))
+  for (const auto &trackEntryList : std::as_const(trackList))
     size += trackEntryList.count();
 
   PresentationModifyRequest req;
@@ -2224,7 +2225,7 @@ void ScriptDialog::setFreestanding(bool freestanding, const ProjectionWidget &pw
   }
   }
 
-  for (PlayingTopic *playingTopic : qAsConst(m_currentlyPlayingTopics))
+  for (PlayingTopic *playingTopic : std::as_const(m_currentlyPlayingTopics))
   {
     if (identifyProjectionWidget(playingTopic->topic) != pw) 
       continue;
@@ -2336,7 +2337,7 @@ void ScriptDialog::playTopic(TrackEntry *topic)
 
   m_currentlyPlayingTopics.append(playingTopic); 
 
-  for (const TopicAssignment &ta : qAsConst(m_trackEntryAssignments))
+  for (const TopicAssignment &ta : std::as_const(m_trackEntryAssignments))
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " ta.m_topicName = " << ta.m_topicName;
 
@@ -2541,11 +2542,11 @@ void ScriptDialog::slotTimerTick()
 
 
   
-  for (TrackEntry *topic : qAsConst(m_topicVector))
+  for (TrackEntry *topic : std::as_const(m_topicVector))
   {
     
     bool found = false;
-    for (const PlayingTopic *pt : qAsConst(m_currentlyPlayingTopics))
+    for (const PlayingTopic *pt : std::as_const(m_currentlyPlayingTopics))
     {
       if (pt->topic->m_topicId == topic->m_topicId)
       {
@@ -2571,12 +2572,12 @@ void ScriptDialog::slotTimerTick()
   else
   {
     
-    for (const FilterTopic &filterTopic : qAsConst(m_filterTopicVector))
+    for (const FilterTopic &filterTopic : std::as_const(m_filterTopicVector))
     {
       TrackEntry *filterTe = filterTopic.filterTopic;
 
       bool found = false;
-      for (const PlayingTopic *pt : qAsConst(m_currentlyPlayingTopics))
+      for (const PlayingTopic *pt : std::as_const(m_currentlyPlayingTopics))
       {
         if (pt->topic->m_topicId == filterTe->m_topicId)
         {
@@ -2629,7 +2630,7 @@ void ScriptDialog::printCurrentlyPlayingTopics()
 {
   m_ui->lwStatus->clear();
 
-  for (const PlayingTopic *playingTopic : qAsConst(m_currentlyPlayingTopics))
+  for (const PlayingTopic *playingTopic : std::as_const(m_currentlyPlayingTopics))
   {
     if (!playingTopic->topicTypeName.isEmpty() && playingTopic->topicReplayIfc != nullptr) 
     {
@@ -2716,7 +2717,7 @@ void ScriptDialog::slotPlay()
 
 
     
-    for (const PlayingTopic *playingTopic : qAsConst(m_currentlyPlayingTopics))
+    for (const PlayingTopic *playingTopic : std::as_const(m_currentlyPlayingTopics))
     {
       if (playingTopic->topicReplayIfc != nullptr && m_ignoreTopicForReplay != playingTopic->topic->m_topicId)
       {
@@ -2862,7 +2863,7 @@ void ScriptDialog::pausePlayingTopics()
 {
   m_ui->lwStatus->clear();
 
-  for (PlayingTopic *playingTopic : qAsConst(m_currentlyPlayingTopics))
+  for (PlayingTopic *playingTopic : std::as_const(m_currentlyPlayingTopics))
   {
     if (playingTopic->topicReplayIfc != nullptr)
     {
@@ -2949,7 +2950,7 @@ void ScriptDialog::fillTopicVector()
   if (m_ignoreChanges)
     return;
 
-  for (const LtsScriptTimeline::TrackEntry *trackEntry : qAsConst(m_topicVector))
+  for (const LtsScriptTimeline::TrackEntry *trackEntry : std::as_const(m_topicVector))
   {
     DEBUG_LOG(m_logger) << "m_topicVector index=" << trackEntry->index
                         << " topicId=" << trackEntry->m_topicId
@@ -2972,7 +2973,7 @@ void ScriptDialog::fillTopicVector()
 
 
 
-  for (const FilterTopic &filterTopic : qAsConst(m_filterTopicVector))
+  for (const FilterTopic &filterTopic : std::as_const(m_filterTopicVector))
   {
     const LtsScriptTimeline::TrackEntry *trackEntry = filterTopic.filterTopic;
     DEBUG_LOG(m_logger) << "m_filterTopicVector mainTopicId=" <<  filterTopic.mainTopicId
@@ -2990,7 +2991,7 @@ void ScriptDialog::fillTopicVector()
 
   m_topicVector.clear();
 
-  for (const FilterTopic &ft : qAsConst(m_filterTopicVector))
+  for (const FilterTopic &ft : std::as_const(m_filterTopicVector))
     delete ft.filterTopic;
   m_filterTopicVector.clear();
 
@@ -2999,7 +3000,7 @@ void ScriptDialog::fillTopicVector()
 
   const QMap<QString, QVector<TrackEntry *> > trackList = m_ui->widget->getTrackEntriesWithFilters(); 
 
-  for (const QVector<TrackEntry *> &trackEntryList : qAsConst(trackList))
+  for (const QVector<TrackEntry *> &trackEntryList : std::as_const(trackList))
   {
     m_topicVector += trackEntryList;
     for (TrackEntry *te : trackEntryList)
@@ -3012,7 +3013,7 @@ void ScriptDialog::fillTopicVector()
   {
     m_ui->lwStatus->addItem(tr("Initialized with %1 Entries").arg(m_topicVector.count()));
 
-    for (const TrackEntry *topic : qAsConst(m_topicVector))
+    for (const TrackEntry *topic : std::as_const(m_topicVector))
     {
       if (topic->m_startTime < m_lowestTime || m_lowestTime == -1)
         m_lowestTime = topic->m_startTime;
@@ -3025,7 +3026,7 @@ void ScriptDialog::fillTopicVector()
     if (m_lowestTime < 0 || m_highestTime < 1 || m_highestTime <= m_lowestTime) 
       m_ui->lwStatus->addItem(tr("ERROR: At least one available topic has invalid timing !"));
 
-    for (const TrackEntry *topic : qAsConst(m_topicVector))
+    for (const TrackEntry *topic : std::as_const(m_topicVector))
     {
       
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_storyboard.cpp

@@ -1,4 +1,5 @@
 #include "pre_storyboard.h"
+#include <utility>
 #include "ui_pre_storyboard.h"
 
 #include <LtsPrinting/printing.h>
@@ -93,7 +94,7 @@ void StoryboardDialog::fillStoryboard()
 
   QVector<FilterTopic> correspondingFilterTopics;
   int ii1 = 1;
-  for (const LtsScriptTimeline::TrackEntry *te : qAsConst(m_topicVector))
+  for (const LtsScriptTimeline::TrackEntry *te : std::as_const(m_topicVector))
   {
     QString itemText = tr("Topic %1:  %2 - %3 (%4 seconds)\n  Type: %5").arg(
                          ii1).arg(QTime::fromMSecsSinceStartOfDay(te->m_startTime * 1000).toString(),
@@ -108,7 +109,7 @@ void StoryboardDialog::fillStoryboard()
 
     
     correspondingFilterTopics.clear();
-    for (const FilterTopic &_ft : qAsConst(m_filterTopicVector))
+    for (const FilterTopic &_ft : std::as_const(m_filterTopicVector))
     {
       if (_ft.mainTopicId != te->m_topicId)
         continue;
@@ -125,7 +126,7 @@ void StoryboardDialog::fillStoryboard()
 
 
     int ii2 = 1;
-    for (const FilterTopic &_ft : qAsConst(correspondingFilterTopics))
+    for (const FilterTopic &_ft : std::as_const(correspondingFilterTopics))
     {
       if (_ft.mainTopicId != te->m_topicId)
         continue;

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/CMakeLists.txt

@@ -65,7 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(PreScriptTimelineGuiPlugin
   PreGuiScriptCommon
   LtsTimeline
   svcPreCommon
-  Qt5::Widgets
+  Qt6::Widgets
   LtsWidgets
   LtsDataView
   LtsSessionData

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.cpp

@@ -1,4 +1,5 @@
 #include "pre_journal_dialog.h"
+#include <utility>
 #include "ui_pre_journal_dialog.h"
 
 #include <LtsPrinting/printing.h>
@@ -54,7 +55,7 @@ void JournalDialog::fillJournal()
     return;
 
   m_ui->listWidget->addItem(m_journal->getText());
-  for (const Journal *j : qAsConst(m_journal->journalList))
+  for (const Journal *j : std::as_const(m_journal->journalList))
     m_ui->listWidget->addItem(j->getText());
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp

@@ -2,6 +2,7 @@
 
 
 #include "pre_screen_recorder.h"
+#include <utility>
 #include "pre_screen.h"
 #include "pre_topic_item.h"
 #include <QProcess>
@@ -22,7 +23,7 @@ ScreenRecorder::ScreenRecorder(QObject *parent)
 
 void ScreenRecorder::cut()
 {
-  for (TopicRecorder *tr : qAsConst(m_topicRecorder))
+  for (TopicRecorder *tr : std::as_const(m_topicRecorder))
   {
     if (tr->isFailed()) 
       continue;
@@ -42,7 +43,7 @@ void ScreenRecorder::cut()
 
 void ScreenRecorder::save(const QString &tmpDirPath)
 {
-  for (TopicRecorder *tr : qAsConst(m_topicRecorder))
+  for (TopicRecorder *tr : std::as_const(m_topicRecorder))
   {
     if (tr->isFailed()) 
       continue;
@@ -118,7 +119,7 @@ void ScreenRecorder::clear()
 {
   DEBUG_LOG(m_logger) << "Clearing TopicRecorder.";
 
-  for (TopicRecorder *currentTopicRecorder : qAsConst(m_topicRecorder))
+  for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
   {
     currentTopicRecorder->killAndClear();
     delete currentTopicRecorder;
@@ -131,7 +132,7 @@ void ScreenRecorder::waitForFinishedRecording()
 {
   DEBUG_LOG(m_logger) << "Waiting for TopicRecorder to finish ...";
 
-  for (TopicRecorder *currentTopicRecorder : qAsConst(m_topicRecorder))
+  for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
     currentTopicRecorder->waitForFinishedRecording();
 
   DEBUG_LOG(m_logger) << "... all TopicRecorder finished.";

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp

@@ -2,6 +2,7 @@
 
 
 #include "pre_screen_shotter.h"
+#include <utility>
 #include <QProcess>
 #include "pre_screen.h"
 #include <limits>
@@ -53,7 +54,7 @@ void ScreenShotter::addTopicsForScreen(Screen *screen, const std::vector<TopicIt
 
 void ScreenShotter::saveRecordings(const QString &tmpDirPath)
 {
-  for (TopicShotter *tr : qAsConst(m_topicShotter))
+  for (TopicShotter *tr : std::as_const(m_topicShotter))
   {
     if (tr->isFailed())
       continue;

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp

@@ -2,6 +2,7 @@
 
 
 #include "pre_script_dialog.h"
+#include <utility>
 #include "LtsMultiMonitor/lts_screen_base.h"
 #include "ui_pre_script_dialog.h"
 #include "pre_journal_dialog.h"
@@ -212,7 +213,7 @@ ScriptTimelineDialog::~ScriptTimelineDialog()
   deleteProjectionWidget(&m_projectionWidget1);
   deleteProjectionWidget(&m_projectionWidget2);
 
-  for (const TopicAssignment &topicAssignment : qAsConst(m_topicAssignments))
+  for (const TopicAssignment &topicAssignment : std::as_const(m_topicAssignments))
     topicAssignment.topicEditorIfc->finishTopicEditor();
 
   if (m_essentialsViewApp)
@@ -640,7 +641,7 @@ bool ScriptTimelineDialog::apply()
   try
   {
     size_t i = 0;
-    for (const int &topicItemId : qAsConst(mainTopicItemIds))
+    for (const int &topicItemId : std::as_const(mainTopicItemIds))
     {
       TopicItem &topicItem = m_model->topicItem(topicItemId);
       DEBUG_LOG(m_logger) << "Adding topic item: id=" << topicItem.id() << ", start=" << topicItem.startTime() / 1000
@@ -1837,7 +1838,7 @@ void ScriptTimelineDialog::setReplayWidgetFreestanding(int topicItemId, bool fre
 void ScriptTimelineDialog::displayPlaylist()
 {
   m_ui->lwStatus->clear();
-  for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+  for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
   {
     QString status;
     try
@@ -1898,7 +1899,7 @@ void ScriptTimelineDialog::setProjectionWidgetFreestanding(bool freestanding, co
   }
   try
   {
-    for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+    for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
     {
       if (identifyProjectionWidget(m_model->topicItem(topicItemId)) != projectionWidget)
         continue;
@@ -2141,7 +2142,7 @@ void ScriptTimelineDialog::setTopicDescription(int topicItemId)
 void ScriptTimelineDialog::enableTopicEditors(bool enable)
 {
   const QVector<int> itemIds = m_model->itemIds();
-  for (const int &itemId : qAsConst(itemIds))
+  for (const int &itemId : std::as_const(itemIds))
   {
     try
     {
@@ -2227,7 +2228,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
     SituationMap::SitMapUpdatesEnabledHelper sitMapHelper(sitMapIfc);
 
     m_playlistTopicItemIds.append(topicItemId);
-    for (const TopicAssignment &topicAssignment : qAsConst(m_topicAssignments))
+    for (const TopicAssignment &topicAssignment : std::as_const(m_topicAssignments))
     {
       if (topicAssignment.topicType != topicItem.topicType())
         continue;
@@ -2391,7 +2392,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
 void ScriptTimelineDialog::pause()
 {
   m_ui->lwStatus->clear();
-  for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+  for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
   {
     try
     {
@@ -2439,7 +2440,7 @@ void ScriptTimelineDialog::stop(bool ended, bool ignoreFireEventFlashing)
   m_ui->pbInitScreen2->setEnabled(true);
   m_ignoreTopicForReplay = -1;
   LtsWidgets::LtsGlobalWaitDialog::getInstance()->rearm();
-  for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+  for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
     removeTopicItemFromPlaylist(topicItemId);
   m_playlistTopicItemIds.clear();
 
@@ -3500,7 +3501,7 @@ compiler_warning("TODO: percentage? 0-100?")
     std::shared_ptr<ReportManagement::ForeignGuiInterface> repIfc;
     if (m_this.m_exerciseSession->getForeignGuiInterface<ReportManagement::ForeignGuiInterface>(repIfc))
     {
-      for (const QPair<int,int> exportReportInfo : qAsConst(topicItemIdsToExportReport))
+      for (const QPair<int,int> exportReportInfo : std::as_const(topicItemIdsToExportReport))
       {
         const int topicItemId = exportReportInfo.first;
         const int reportId = exportReportInfo.second;
@@ -3521,7 +3522,7 @@ compiler_warning("TODO: percentage? 0-100?")
     else
     {
       
-      for (const QPair<int,int> exportReportInfo : qAsConst(topicItemIdsToExportReport))
+      for (const QPair<int,int> exportReportInfo : std::as_const(topicItemIdsToExportReport))
       {
         const int topicItemId = exportReportInfo.first;
         addFailedTopicId(topicItemId);
@@ -3537,7 +3538,7 @@ compiler_warning("TODO: percentage? 0-100?")
     setStatusText(tr("Exporting audio / video clips"));
 
     int currentTopicNumber = 0;
-    for (const int topicItemId : qAsConst(topicItemIdsToExportAudioVideo))
+    for (const int topicItemId : std::as_const(topicItemIdsToExportAudioVideo))
     {
       currentTopicNumber++;
       setStatusText(tr("Exporting audio / video clip #%1").arg(currentTopicNumber));
@@ -4433,7 +4434,7 @@ void ScriptTimelineDialog::onRemoveSelectedTopics()
   QVector<int> topicItemIds = m_ui->timeline->view()->selectedItemIds();
   QVector<int> mainTopicItemIds;
   mainTopicItemIds.reserve(topicItemIds.size());
-  for (const int &topicItemId : qAsConst(topicItemIds))
+  for (const int &topicItemId : std::as_const(topicItemIds))
   {
     try
     {
@@ -4447,7 +4448,7 @@ void ScriptTimelineDialog::onRemoveSelectedTopics()
     catch (const QString &str) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << str; }
     catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
   }
-  for (const int &topicItemId : qAsConst(mainTopicItemIds))
+  for (const int &topicItemId : std::as_const(mainTopicItemIds))
   {
     try
     {
@@ -4489,7 +4490,7 @@ void ScriptTimelineDialog::onTimeout()
 
   QVector<int> playlist;
   playlist.reserve(m_playlistTopicItemIds.size());
-  for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+  for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
   {
     try
     {
@@ -4508,7 +4509,7 @@ void ScriptTimelineDialog::onTimeout()
   }
   m_playlistTopicItemIds = playlist;
 
-  for (const int &topicItemId : qAsConst(m_mainTopicItemIds))
+  for (const int &topicItemId : std::as_const(m_mainTopicItemIds))
   {
     if (m_playlistTopicItemIds.contains(topicItemId))
       continue;
@@ -4530,7 +4531,7 @@ void ScriptTimelineDialog::onTimeout()
     m_isFirstPlayAfterStop = false;
   else
   {
-    for (const int &topicItemId : qAsConst(m_filterTopicItemIds))
+    for (const int &topicItemId : std::as_const(m_filterTopicItemIds))
     {
       if (m_playlistTopicItemIds.contains(topicItemId))
         continue;
@@ -4611,7 +4612,7 @@ void ScriptTimelineDialog::onPlay()
   }
 
   bool hasBuilding = false;
-  for (const auto &it : qAsConst(m_mainTopicItemIds))
+  for (const auto &it : std::as_const(m_mainTopicItemIds))
   {
     const TopicItem &topicItem = m_model->topicItem(it);
     if (topicItem.topicType() == TopicEditorBase::TopicType::Building)
@@ -4657,7 +4658,7 @@ void ScriptTimelineDialog::onPlay()
   {
     QVector<int> playlist;
     playlist.reserve(m_playlistTopicItemIds.size());
-    for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+    for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
     {
       try
       {
@@ -4675,7 +4676,7 @@ void ScriptTimelineDialog::onPlay()
       }
     }
     m_playlistTopicItemIds = playlist;
-    for (const int &topicItemId : qAsConst(m_playlistTopicItemIds))
+    for (const int &topicItemId : std::as_const(m_playlistTopicItemIds))
     {
       try
       {

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_drag_handler.cpp

@@ -1,4 +1,5 @@
 #include "pre_script_dialog_drag_handler.h"
+#include <utility>
 #include "pre_script_model.h"
 
 #include <LtsTimeline/item_delegate.h>
@@ -431,7 +432,7 @@ void ScriptDialogDragHandler::adjustRight(qint64 end) noexcept(false)
 
 void ScriptDialogDragHandler::addFilterItemsToDragItems()
 {
-  for (const int &itemId : qAsConst(m_dragItemIds))
+  for (const int &itemId : std::as_const(m_dragItemIds))
   {
     try
     {
@@ -442,7 +443,7 @@ void ScriptDialogDragHandler::addFilterItemsToDragItems()
         for (const TrackPtr &trackPtr : track.tracks())
         {
           const QVector<int> itemIds = trackPtr->itemIdsBetween(item.startTime(), item.startTime() + item.duration(), false, true);
-          for (const int &id : qAsConst(itemIds))
+          for (const int &id : std::as_const(itemIds))
             if (!m_dragItemIds.contains(id))
               m_dragItemIds.append(id);
         }
@@ -455,7 +456,7 @@ void ScriptDialogDragHandler::addFilterItemsToDragItems()
 void ScriptDialogDragHandler::setCanDropTopicTypes()
 {
   m_canDropTopicTypes = true;
-  for (const int &itemId : qAsConst(m_dragItemIds))
+  for (const int &itemId : std::as_const(m_dragItemIds))
   {
     try
     {

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp

@@ -1,5 +1,6 @@
 #include "pre_script_model.h"
 #include "pre_script_dialog.h"
+#include <utility>
 #include "pre_script_dialog_drag_handler.h"
 #include "pre_utils.h"
 
@@ -687,7 +688,7 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
 
   
   qint64 duration = 0;
-  for (const PresentationContent &content : qAsConst(contents))
+  for (const PresentationContent &content : std::as_const(contents))
     duration = std::max(duration, content.startTime() + content.duration());
   duration *= 1000LL;
 
@@ -714,7 +715,7 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
     return false;
   }
 
-  for (const PresentationContent &content : qAsConst(contents))
+  for (const PresentationContent &content : std::as_const(contents))
     addItem(QString::fromStdString(content.channel()), TopicItem(content), pasteTime);
 
   m_dialog->timeline()->setCurrentTime(pasteTime);
@@ -1093,7 +1094,7 @@ void ScriptModel::cutToClipboard(const QVector<int> &_itemIds) noexcept(false)
   copyToClipboard(_itemIds); 
   QVector<int> _mainItemIds;
   _mainItemIds.reserve(_itemIds.size());
-  for (const int &_itemId : qAsConst(_itemIds))
+  for (const int &_itemId : std::as_const(_itemIds))
   {
     const Item &_item = item(_itemId);
     if (isMainTrack(_item.parentTrackId())) 
@@ -1103,7 +1104,7 @@ void ScriptModel::cutToClipboard(const QVector<int> &_itemIds) noexcept(false)
     }
     removeItem(_itemId);
   }
-  for (const int &_itemId : qAsConst(_mainItemIds))
+  for (const int &_itemId : std::as_const(_mainItemIds))
     removeItem(_itemId);
   m_dialog->timeline()->view()->clearSelectedItems();
 }
@@ -1118,7 +1119,7 @@ void ScriptModel::pasteFromClipboard(qint64 time) noexcept(false)
 
   QVector<int> _clipboardTrackIds;
   _clipboardTrackIds.reserve(m_clipboard.size());
-  for (const ItemPtr &_itemPtr : qAsConst(m_clipboard))
+  for (const ItemPtr &_itemPtr : std::as_const(m_clipboard))
     if (!_clipboardTrackIds.contains(_itemPtr->parentTrackId()))
       _clipboardTrackIds.append(_itemPtr->parentTrackId());
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp

@@ -1,4 +1,5 @@
 #include "pre_topic_item.h"
+#include <utility>
 #include "pre_script_model.h"
 
 #include <PresentationManagement/pre.hpp>
@@ -100,7 +101,7 @@ qint64 TopicItem::replayTime(qint64 time) const
 
       qint64 relTime = time - m_startTime;
       qint64 relSequenceStart = 0;
-      for (const QJsonValue &sequence : qAsConst(sequences))
+      for (const QJsonValue &sequence : std::as_const(sequences))
       {
         QJsonObject obj = sequence.toObject();
         qint64 start = obj.value(s_startKey).toDouble();