Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+1
-1
@@ -65,7 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(PreScriptTimelineGuiPlugin
|
||||
PreGuiScriptCommon
|
||||
LtsTimeline
|
||||
svcPreCommon
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsSessionData
|
||||
|
||||
+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());
|
||||
}
|
||||
|
||||
|
||||
+5
-4
@@ -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.";
|
||||
|
||||
+2
-1
@@ -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;
|
||||
|
||||
+20
-19
@@ -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
|
||||
{
|
||||
|
||||
+4
-3
@@ -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
|
||||
{
|
||||
|
||||
+6
-5
@@ -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());
|
||||
|
||||
|
||||
+2
-1
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user