Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+1
-1
@@ -38,7 +38,7 @@ NGL_TARGET_LINK_LIBRARIES(PreScriptGuiPlugin
|
||||
PreGuiCommon
|
||||
PreGuiScriptCommon
|
||||
svcPreCommon
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
+21
-20
@@ -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))
|
||||
{
|
||||
|
||||
|
||||
|
||||
+4
-3
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user