Adds immediate migration results

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt

@@ -63,8 +63,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsScriptTimeline
 )
 
 NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
-  Qt5::Core
-  Qt5::Widgets
+  Qt6::Core
+  Qt6::Widgets
   LtsWidgets
   LtsSessionData
 )

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.cpp

@@ -1,4 +1,5 @@
 #include "script_timeline.h"
+#include <utility>
 #include "ui_script_timeline.h"
 #include "track_widget.h"
 #include "tools.h"
@@ -437,7 +438,7 @@ TrackEntry *ScriptTimeline::getTrackEntryWithFiltersAsEntries(int topicId)
   for (const TrackWidget *tw : trackWidgetList)
   {
     const QVector<TrackEntry *> trackEntries = tw->getTrackEntriesFiltersAsEntries();
-    for (TrackEntry *te : qAsConst(trackEntries))
+    for (TrackEntry *te : std::as_const(trackEntries))
     {
       if (te->m_topicId == topicId)
         return te;
@@ -507,7 +508,7 @@ bool ScriptTimeline::importTrackEntries(const QVector<LtsScriptTimeline::TrackEn
 {
   
   int importLength = 0;
-  for (TrackEntry *te : qAsConst(importTes))
+  for (TrackEntry *te : std::as_const(importTes))
   {
     int teLen = te->m_startTime + te->m_length;
     if (teLen > importLength)
@@ -519,7 +520,7 @@ bool ScriptTimeline::importTrackEntries(const QVector<LtsScriptTimeline::TrackEn
   const QVector<TrackEntry *> tes = getTrackEntries();
   int pasteTime = m_time;
 
-  for (TrackEntry *te : qAsConst(tes))
+  for (TrackEntry *te : std::as_const(tes))
   {
     int start = te->m_startTime;
     int sum = start + te->m_length;
@@ -536,7 +537,7 @@ bool ScriptTimeline::importTrackEntries(const QVector<LtsScriptTimeline::TrackEn
 
 
   
-  for (TrackEntry *te : qAsConst(tes))
+  for (TrackEntry *te : std::as_const(tes))
   {
     if (te->m_startTime >= m_time)
       te->m_startTime += importLength + diff;
@@ -608,7 +609,7 @@ QVector<TrackEntry *> ScriptTimeline::getSelectedEntriesWithFilterEntries() cons
 
   const QList<TrackWidget *> tws = getTrackWidgets();
 
-  for (const TrackWidget *tw : qAsConst(tws))
+  for (const TrackWidget *tw : std::as_const(tws))
     tes += tw->getTrackEntriesFiltersAsEntries(true);
 
   return tes;
@@ -655,7 +656,7 @@ QVector<TrackEntry *> ScriptTimeline::getSelectedFilterEntries() const
   QVector<TrackEntry *> result;
 
   const QList<TrackWidget *> tws = getTrackWidgets();
-  for (const TrackWidget *tw : qAsConst(tws))
+  for (const TrackWidget *tw : std::as_const(tws))
   {
     result += tw->getSelectedFilterEntries();
   }
@@ -669,7 +670,7 @@ void ScriptTimeline::slotDeleteSelectedTopics()
   int topicCount = 0;
 
   const QList<TrackWidget *> tws = getTrackWidgets();
-  for (const TrackWidget *tw : qAsConst(tws))
+  for (const TrackWidget *tw : std::as_const(tws))
   {
     topicCount += tw->getSelectedFilterEntries().count();
 
@@ -689,12 +690,12 @@ void ScriptTimeline::slotDeleteSelectedTopics()
           this, [this]()
   {
     const QList<TrackWidget *> tws = getTrackWidgets();
-    for (const TrackWidget *tw : qAsConst(tws))
+    for (const TrackWidget *tw : std::as_const(tws))
     {
       
       const QVector<FilterTrackWidget *> &ftws = tw->filterLines();
 
-      for (const FilterTrackWidget *ftw : qAsConst(ftws))
+      for (const FilterTrackWidget *ftw : std::as_const(ftws))
       {
         const FilterBackgroundWidget *fbw = ftw->fbw();
         const QMap<int , TrackContentWidget *> &fcws = fbw->filterContentWidgets();
@@ -715,7 +716,7 @@ void ScriptTimeline::slotCutTopics()
   slotCopyTopics();
 
   const QList<TrackWidget *> tws = getTrackWidgets();
-  for (const TrackWidget *tw : qAsConst(tws))
+  for (const TrackWidget *tw : std::as_const(tws))
   {
     TrackContentWidget *tcw = tw->getTrackContentWidget();
     tcw->deleteSelectedTopics();
@@ -730,7 +731,7 @@ void ScriptTimeline::slotCopyTopics()
 
 
   
-  for (const TrackWidget *tw : qAsConst(tws))
+  for (const TrackWidget *tw : std::as_const(tws))
   {
     TrackContentWidget *tcw = tw->getTrackContentWidget();
 
@@ -739,7 +740,7 @@ void ScriptTimeline::slotCopyTopics()
     if (tcw->getSelectedEntries().isEmpty())
       continue;
 
-    for (const TrackEntry *te : qAsConst(selected))
+    for (const TrackEntry *te : std::as_const(selected))
     {
       if (firstTeTime > te->m_startTime || firstTeTime == -1)
         firstTeTime = te->m_startTime;
@@ -824,7 +825,7 @@ void ScriptTimeline::slotMoveAll(int direction)
   QList<TrackWidget *> tws = getTrackWidgets();
 
   
-  for (TrackWidget *tw : qAsConst(tws))
+  for (TrackWidget *tw : std::as_const(tws))
   {
     TrackContentWidget *tcw = tw->getTrackContentWidget();
     if (!tcw->canMoveAll(direction * factor))
@@ -836,7 +837,7 @@ void ScriptTimeline::slotMoveAll(int direction)
   }
 
   
-  for (TrackWidget *tw : qAsConst(tws))
+  for (TrackWidget *tw : std::as_const(tws))
   {
     TrackContentWidget *tcw = tw->getTrackContentWidget();
     tcw->forceMoveAll(direction * factor);
@@ -1153,7 +1154,7 @@ void ScriptTimeline::slotTrackEntrySelectionChanged(TrackEntry *)
   }
 
   
-  for (TrackWidget *tw : qAsConst(tws))
+  for (TrackWidget *tw : std::as_const(tws))
     tw->getTrackContentWidget()->setMultiLineMultiSelectionMode(activateMultiLineMultiSelectionMode);
 
   emit signalTrackEntrySelectionChanged(nullptr); 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp

@@ -1,4 +1,5 @@
 #include "track_content_widget.h"
+#include <utility>
 #include "track_entry.h"
 #include "tools.h"
 #include "track_entry_painters.h"
@@ -170,7 +171,7 @@ bool TrackContentWidget::checkForCollisions(const TrackContentWidget *tcw, const
   {
     
     const QVector<TrackEntry *> &selectedEntries = tcw->getSelectedEntries();
-    for (TrackEntry *te : qAsConst(trackEntries))
+    for (TrackEntry *te : std::as_const(trackEntries))
     {
       if (!selectedEntries.contains(te))
         vecEntriesToCheck.append(te);
@@ -192,7 +193,7 @@ bool TrackContentWidget::checkForCollisions(const TrackContentWidget *tcw, const
   int startOffset_s = dropTime_s - startTimeMostLeft_s;
 
   
-  for (TrackEntry *previewEntry : qAsConst(_preview))
+  for (TrackEntry *previewEntry : std::as_const(_preview))
   {
     int startPreview_s = previewEntry->m_startTime + startOffset_s;
 
@@ -204,7 +205,7 @@ bool TrackContentWidget::checkForCollisions(const TrackContentWidget *tcw, const
 
     int endPreview_s = startPreview_s + previewEntry->m_length;
 
-    for (const TrackEntry *checkTe : qAsConst(vecEntriesToCheck))
+    for (const TrackEntry *checkTe : std::as_const(vecEntriesToCheck))
     {
       if (checkTe->m_topicId == previewEntry->m_topicId && !ignoreSelfCheck)
       {
@@ -300,7 +301,7 @@ bool TrackContentWidget::checkForParallelTopics(const TrackContentWidget *tcw, c
 
 
         
-        for (TrackEntry *previewEntry : qAsConst(previewCopy))
+        for (TrackEntry *previewEntry : std::as_const(previewCopy))
         {
           
 
@@ -311,7 +312,7 @@ bool TrackContentWidget::checkForParallelTopics(const TrackContentWidget *tcw, c
 
           
 
-          for (TrackEntry *pTrackEntry : qAsConst(vecTrackEntries))
+          for (TrackEntry *pTrackEntry : std::as_const(vecTrackEntries))
           {
             
             
@@ -443,7 +444,7 @@ bool TrackContentWidget::checkForParallelTopics(const TrackContentWidget *tcw, c
 
     QVector<TrackEntryType> correspondingDifferentTopicTypes;
     
-    for (TrackEntry *previewEntry : qAsConst(previewCopy))
+    for (TrackEntry *previewEntry : std::as_const(previewCopy))
     {
       correspondingDifferentTopicTypes.clear();
       
@@ -454,7 +455,7 @@ bool TrackContentWidget::checkForParallelTopics(const TrackContentWidget *tcw, c
         startOffset_s -= startTimeMostLeft_s;
 
 
-      for (const QPair<TrackEntryType, TrackEntryType> &pair : qAsConst(differentParallelForbidden))
+      for (const QPair<TrackEntryType, TrackEntryType> &pair : std::as_const(differentParallelForbidden))
       {
         if (pair.first == previewEntry->m_type)
           correspondingDifferentTopicTypes += pair.second;
@@ -468,11 +469,11 @@ bool TrackContentWidget::checkForParallelTopics(const TrackContentWidget *tcw, c
       if (correspondingDifferentTopicTypes.isEmpty())
         continue;
 
-      for (const TrackEntryType correspondingDifferentTopicType : qAsConst(correspondingDifferentTopicTypes))
+      for (const TrackEntryType correspondingDifferentTopicType : std::as_const(correspondingDifferentTopicTypes))
       {
         
 
-        for (TrackEntry *pTrackEntry : qAsConst(vecTrackEntries))
+        for (TrackEntry *pTrackEntry : std::as_const(vecTrackEntries))
         {
           
 
@@ -769,7 +770,7 @@ void TrackContentWidget::paintEvent(QPaintEvent *event)
   {
     int firstTeTime = -1;
 
-    for (const TrackEntry *te : qAsConst(m_preview))
+    for (const TrackEntry *te : std::as_const(m_preview))
     {
       if (firstTeTime > te->m_startTime || firstTeTime == -1)
         firstTeTime = te->m_startTime;
@@ -863,7 +864,7 @@ void TrackContentWidget::selectAll()
 {
   m_selected.clear(); 
 
-  for (TrackEntry *te : qAsConst(m_entryList))
+  for (TrackEntry *te : std::as_const(m_entryList))
   {
     m_selected.append(te);
     m_mainSelected = te;
@@ -1035,7 +1036,7 @@ bool TrackContentWidget::canMoveAll(int offset) const
   checkForCollisions(this, m_selected, newTime, cols, true);
 
   QVector<TrackEntry *> parls;
-  for (const auto &tcw : qAsConst(m_tcwCorresponding))
+  for (const auto &tcw : std::as_const(m_tcwCorresponding))
     checkForParallelTopics(tcw, m_selected, newTime, parls);
 
   if (!cols.isEmpty() || !parls.isEmpty()) 
@@ -1168,7 +1169,7 @@ void TrackContentWidget::selectEntriesAtPositions(int fromPos, int toPos)
 {
   m_unselectAllImmune = true; 
 
-  for (TrackEntry *te : qAsConst(m_entryList))
+  for (TrackEntry *te : std::as_const(m_entryList))
   {
     int start = m_tools->getPos(te->m_startTime);
     int end   = m_tools->getPos(te->m_startTime + te->m_length);
@@ -1215,7 +1216,7 @@ bool TrackContentWidget::canPasteTopics(const QVector<TrackEntry *> &topics, int
   TemporaryPointerVector<TrackEntry *> newTes;
 
   newTes.reserve(topics.size());
-  for (TrackEntry *te : qAsConst(topics))
+  for (TrackEntry *te : std::as_const(topics))
   {
     TrackEntry *newTe = new TrackEntry(te);
     newTe->m_startTime = (newTe->m_startTime - offsetTime + pasteTime);
@@ -1228,7 +1229,7 @@ bool TrackContentWidget::canPasteTopics(const QVector<TrackEntry *> &topics, int
 
   bool parl = false;
 
-  for (const auto &tcw : qAsConst(m_tcwCorresponding))
+  for (const auto &tcw : std::as_const(m_tcwCorresponding))
   {
     parl = checkForParallelTopics(tcw, newTes, pasteTime, true );
     if (parl)
@@ -1252,7 +1253,7 @@ void TrackContentWidget::forcePasteTopics(const QVector<TrackEntry *> &topics, i
   m_selected.clear();
 
   
-  for (TrackEntry *te : qAsConst(topics))
+  for (TrackEntry *te : std::as_const(topics))
   {
     TrackEntry *newTe = new TrackEntry(te);
     newTe->m_topicId = m_scriptTimeline->nextUniqueId();
@@ -1345,7 +1346,7 @@ bool TrackContentWidget::dragEnter(const QByteArray &itemData)
   if (tes.isEmpty())
     return false;
 
-  for (TrackEntry *te : qAsConst(tes))
+  for (TrackEntry *te : std::as_const(tes))
   {
     if (!allowedByType(te))
     {
@@ -1370,11 +1371,11 @@ bool TrackContentWidget::dragEnter(const QByteArray &itemData)
   
   if (m_isMultiLineMultiSelectionMode)
   {
-    for (TrackEntry *te : qAsConst(tes))
+    for (TrackEntry *te : std::as_const(tes))
     {
       bool found = false;
 
-      for (TrackEntry *thisTe : qAsConst(thisTes))
+      for (TrackEntry *thisTe : std::as_const(thisTes))
       {
         if (thisTe->m_topicId == te->m_topicId)
         {
@@ -1397,7 +1398,7 @@ bool TrackContentWidget::dragEnter(const QByteArray &itemData)
     TrackEntry *pPreview = tes.front();
     bool hasJustBeenAddedByUser = true;
 
-    for (auto pTE : qAsConst(m_entryList))
+    for (auto pTE : std::as_const(m_entryList))
     {
       if (pPreview->m_topicId == pTE->m_topicId)
       {
@@ -1407,9 +1408,9 @@ bool TrackContentWidget::dragEnter(const QByteArray &itemData)
     }
 
     
-    for (const auto &tcw : qAsConst(m_tcwCorresponding))
+    for (const auto &tcw : std::as_const(m_tcwCorresponding))
     {
-      for (auto pTE : qAsConst(tcw->m_entryList))
+      for (auto pTE : std::as_const(tcw->m_entryList))
       {
         if (pPreview->m_topicId == pTE->m_topicId)
         {
@@ -1424,7 +1425,7 @@ bool TrackContentWidget::dragEnter(const QByteArray &itemData)
       
       m_selected.clear();
 
-      for (const auto &tcw : qAsConst(m_tcwCorresponding))
+      for (const auto &tcw : std::as_const(m_tcwCorresponding))
         tcw->m_selected.clear();
     }
   }
@@ -1472,7 +1473,7 @@ bool TrackContentWidget::dragDrop(int pos)
 
   int firstTeTime = -1;
 
-  for (const TrackEntry *te : qAsConst(m_preview))
+  for (const TrackEntry *te : std::as_const(m_preview))
   {
     if (firstTeTime > te->m_startTime || firstTeTime == -1)
       firstTeTime = te->m_startTime;
@@ -1509,7 +1510,7 @@ bool TrackContentWidget::dragDrop(int pos)
     update();
 
     
-    for (const auto &tcw : qAsConst(m_tcwCorresponding))
+    for (const auto &tcw : std::as_const(m_tcwCorresponding))
       tcw->removeTrackEntryByTopicId(prevTe);
 
     m_unselectAllImmune = false; 
@@ -1520,7 +1521,7 @@ bool TrackContentWidget::dragDrop(int pos)
   if (m_isMultiLineMultiSelectionMode)
   {
     
-    for (TrackEntry *oldSel : qAsConst(selectedOld))
+    for (TrackEntry *oldSel : std::as_const(selectedOld))
       emit signalTrackEntryDeleted(oldSel->m_topicId); 
     qDeleteAll(selectedOld);
 
@@ -1540,7 +1541,7 @@ bool TrackContentWidget::dragMove(int pos)
   checkForCollisions(this, m_preview, dropTime_s, m_dragHandler->m_vecCollisions, true);
 
   m_dragHandler->m_vecParallel.clear();
-  for (const auto &tcw : qAsConst(m_tcwCorresponding))
+  for (const auto &tcw : std::as_const(m_tcwCorresponding))
     checkForParallelTopics(tcw, m_preview, dropTime_s, m_dragHandler->m_vecParallel);
 
   m_moveValid = m_dragHandler->m_vecCollisions.isEmpty() && m_dragHandler->m_vecParallel.isEmpty();

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp

@@ -1,4 +1,5 @@
 #include "track_drag_handler.h"
+#include <utility>
 
 #include "track_content_widget.h"
 #include "track_entry.h"
@@ -33,7 +34,7 @@ void DragHandler::dragEnterEvent(QDragEnterEvent *event)
     }
     else
     {
-      for (const auto &tcw : qAsConst(m_tcwCorresponding))
+      for (const auto &tcw : std::as_const(m_tcwCorresponding))
         tcw->dragEnter(tcw->selectedItemsToData(tcw->m_tools->getTime(m_dragStartPos.x())));
     }
   }
@@ -53,7 +54,7 @@ void DragHandler::dragLeaveEvent(QDragLeaveEvent *event)
   if (m_tcw->isMultiLineMultiSelectionMode())
   {
     event->ignore();
-    for (const auto &tcw : qAsConst(m_tcwCorresponding))
+    for (const auto &tcw : std::as_const(m_tcwCorresponding))
       tcw->dragEnd();
   }
 
@@ -68,7 +69,7 @@ void DragHandler::dropEvent(QDropEvent *event)
 
   
 
-  for (const auto &tcw : qAsConst(m_tcwCorresponding))
+  for (const auto &tcw : std::as_const(m_tcwCorresponding))
   {
     bool hasParallelTopicsOfSameType = TrackContentWidget::checkForParallelTopics(tcw, m_tcw->m_preview, dropTime);
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp

@@ -1,4 +1,5 @@
 #include "track_resize_handler.h"
+#include <utility>
 #include "track_entry.h"
 #include "track_widget.h"
 #include "track_content_widget.h"
@@ -40,7 +41,7 @@ void ResizeHandler::mouseReleaseEvent(QMouseEvent *)
   QVector<TrackEntry *> vecPreviewTrackEntries = {m_trackContentWidget->m_mainSelected};
 
   bool msg = true;
-  for (TrackContentWidget *tcw : qAsConst(m_tcwCorresponding))
+  for (TrackContentWidget *tcw : std::as_const(m_tcwCorresponding))
   {
     if (TrackContentWidget::checkForParallelTopics(tcw, vecPreviewTrackEntries, m_trackContentWidget->m_mainSelected->m_startTime))
     {
@@ -74,7 +75,7 @@ bool ResizeHandler::isCollision(int newLength) const
 
   
   const QVector<FilterTrackWidget *> &filterTrackWidgets = m_trackContentWidget->trackWidget()->filterLines();
-  for (const FilterTrackWidget *filterTrackWidget : qAsConst(filterTrackWidgets))
+  for (const FilterTrackWidget *filterTrackWidget : std::as_const(filterTrackWidgets))
   {
     for (auto iFilterContentWidget = filterTrackWidget->fbw()->filterContentWidgets().begin(); iFilterContentWidget != filterTrackWidget->fbw()->filterContentWidgets().end(); ++iFilterContentWidget)
     {

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp

@@ -1,4 +1,5 @@
 #include "track_widget.h"
+#include <utility>
 #include "ui_track_widget.h"
 #include "track_entry.h"
 #include "filter_track_widget.h"
@@ -115,7 +116,7 @@ QVector<TrackEntry *> TrackWidget::getSelectedFilterEntries() const
   QVector<TrackEntry *> result;
   const QVector<FilterTrackWidget *> &ftws = filterLines();
 
-  for (const FilterTrackWidget *ftw : qAsConst(ftws))
+  for (const FilterTrackWidget *ftw : std::as_const(ftws))
   {
     const FilterBackgroundWidget *fbw = ftw->fbw();
     const QMap<int , TrackContentWidget *> &fcws = fbw->filterContentWidgets();
@@ -197,7 +198,7 @@ void TrackWidget::slotTrackEntryAdded(TrackEntry *te)
 {
   
 
-  for (FilterTrackWidget *ftw : qAsConst(m_filterLines))
+  for (FilterTrackWidget *ftw : std::as_const(m_filterLines))
     ftw->fbw()->trackEntryAdded(te);
 
   emit signalTrackEntryAdded(te);
@@ -208,7 +209,7 @@ void TrackWidget::slotTrackEntryDeleted(const int topicId)
 {
   
 
-  for (FilterTrackWidget *ftw : qAsConst(m_filterLines))
+  for (FilterTrackWidget *ftw : std::as_const(m_filterLines))
     ftw->fbw()->trackEntryDeleted(topicId);
 
   emit signalTrackEntryDeleted(topicId);
@@ -291,7 +292,7 @@ QVector<TrackEntry *> TrackWidget::getTrackEntriesWithFilters(bool selectedEntri
     QJsonArray jsonFilterLines;
 
     
-    for (const FilterTrackWidget *ftw : qAsConst(m_filterLines))
+    for (const FilterTrackWidget *ftw : std::as_const(m_filterLines))
     {
       const FilterBackgroundWidget *fbw = ftw->fbw();
       const QMap<int , TrackContentWidget *> &filterContentWidgets = fbw->filterContentWidgets();
@@ -381,7 +382,7 @@ void TrackWidget::setBaseWidth(int width)
   ui->mainLeft->setMinimumWidth(width);
   ui->mainLeft->setMaximumWidth(width); 
 
-  for (FilterTrackWidget *ftw : qAsConst(m_filterLines))
+  for (FilterTrackWidget *ftw : std::as_const(m_filterLines))
     ftw->setBaseWidth(m_baseWidth);
 }
 
@@ -493,7 +494,7 @@ void TrackWidget::unselectAll()
 {
   ui->mainTrack->unselectAll();
 
-  for (FilterTrackWidget *ftw : qAsConst(m_filterLines))
+  for (FilterTrackWidget *ftw : std::as_const(m_filterLines))
   {
     const auto fcw = ftw->fbw()->filterContentWidgets();
     for (TrackContentWidget *tcw : fcw)
@@ -514,7 +515,7 @@ void TrackWidget::setIndicatorTime(int time)
 {
   ui->mainTrack->setIndicatorTime(time);
 
-  for (FilterTrackWidget *ftw : qAsConst(m_filterLines))
+  for (FilterTrackWidget *ftw : std::as_const(m_filterLines))
   {
     const auto filterContentWidgets = ftw->fbw()->filterContentWidgets();