Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+2
-2
@@ -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
|
||||
|
||||
+3
-2
@@ -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;
|
||||
|
||||
+10
-9
@@ -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())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user