Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+4
-4
@@ -44,9 +44,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(zwmssaab
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(zwmssaab
|
||||
PRIVATE
|
||||
Qt5::Gui
|
||||
Qt5::Xml
|
||||
Qt5::XmlPatterns
|
||||
Qt6::Gui
|
||||
Qt6::Xml
|
||||
Qt6::XmlPatterns
|
||||
PUBLIC
|
||||
svcPpmCommon
|
||||
LtsUtilsSettings
|
||||
@@ -60,7 +60,7 @@ NGL_TARGET_LINK_LIBRARIES(zwmssaab
|
||||
ngltools
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(zwmssaab)
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "saab_export.h"
|
||||
#include <utility>
|
||||
#include "ui_saab_export.h"
|
||||
#include "saab_xml_strings.h"
|
||||
#include "saab_map_type.h"
|
||||
@@ -431,7 +432,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
|
||||
QList<int> keys = remainingParticipants.keys();
|
||||
|
||||
|
||||
for (int key : qAsConst(keys))
|
||||
for (int key : std::as_const(keys))
|
||||
{
|
||||
if (!remainingParticipants.contains(key))
|
||||
continue;
|
||||
|
||||
+10
-9
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "saab_import.h"
|
||||
#include <utility>
|
||||
#include "ui_saab_import.h"
|
||||
#include "saab_logging.h"
|
||||
#include "saab_import_show.h"
|
||||
@@ -205,7 +206,7 @@ void ImportSaab::createNode(const ParticipantManagement::ParticipantData &partic
|
||||
|
||||
SaabPerson ImportSaab::saabPersonByGUID(const QString &guid) const
|
||||
{
|
||||
for (const auto ¤t : qAsConst(m_saabPersons))
|
||||
for (const auto ¤t : std::as_const(m_saabPersons))
|
||||
{
|
||||
if (current.guid == guid)
|
||||
return current;
|
||||
@@ -216,7 +217,7 @@ SaabPerson ImportSaab::saabPersonByGUID(const QString &guid) const
|
||||
|
||||
SaabVehicle ImportSaab::saabVehicleByGUID(const QString &guid) const
|
||||
{
|
||||
for (const auto ¤t : qAsConst(m_saabVehicles))
|
||||
for (const auto ¤t : std::as_const(m_saabVehicles))
|
||||
{
|
||||
if (current.guid == guid)
|
||||
return current;
|
||||
@@ -265,7 +266,7 @@ void ImportSaab::importOrbat()
|
||||
|
||||
if (m_logger.isDebugEnabled())
|
||||
{
|
||||
for (SaabUnit *u : qAsConst(m_rootUnits))
|
||||
for (SaabUnit *u : std::as_const(m_rootUnits))
|
||||
DEBUG_LOG(m_logger) << u->toString();
|
||||
}
|
||||
|
||||
@@ -335,11 +336,11 @@ QVector<SaabPlayer *> ImportSaab::flattenedPlayersWithoutRootUnits() const
|
||||
{
|
||||
QVector<SaabPlayer *> result;
|
||||
|
||||
for (SaabUnit *p : qAsConst(m_rootUnits))
|
||||
for (SaabUnit *p : std::as_const(m_rootUnits))
|
||||
{
|
||||
QVector<SaabPlayer *> inferiorInferiors = inferiors(p);
|
||||
|
||||
for (SaabPlayer *infInf : qAsConst(inferiorInferiors))
|
||||
for (SaabPlayer *infInf : std::as_const(inferiorInferiors))
|
||||
result.append(infInf);
|
||||
}
|
||||
|
||||
@@ -361,10 +362,10 @@ QVector<SaabPlayer *> ImportSaab::inferiors(SaabPlayer *player) const
|
||||
if (!m_rootUnits.contains(unit))
|
||||
result.append(player);
|
||||
|
||||
for (SaabPlayer *inf : qAsConst(unit->inferiors))
|
||||
for (SaabPlayer *inf : std::as_const(unit->inferiors))
|
||||
{
|
||||
QVector<SaabPlayer *> inferiorInferiors = inferiors(inf);
|
||||
for (SaabPlayer *infInf : qAsConst(inferiorInferiors))
|
||||
for (SaabPlayer *infInf : std::as_const(inferiorInferiors))
|
||||
result.append(infInf);
|
||||
}
|
||||
|
||||
@@ -544,7 +545,7 @@ void ImportSaab::importExerciseScenario()
|
||||
importRefData(m_saabVehicles, SAAB_VEHICLES(), SAAB_VEHICLE(), SAAB_REGISTRATION_NUMBER(), SAAB_DESCRIPTION());
|
||||
importOrbat();
|
||||
|
||||
for (SaabUnit *party : qAsConst(m_rootUnits))
|
||||
for (SaabUnit *party : std::as_const(m_rootUnits))
|
||||
insertParty(party);
|
||||
|
||||
QVector<SaabPlayer *> vecUnitsWithValidDISTypes = resolveImportMapping(flattenedPlayersWithoutRootUnits());
|
||||
@@ -772,7 +773,7 @@ QVector<SaabPlayer *> ImportSaab::showMappingDialog(const QMap<QString, QVector<
|
||||
{
|
||||
m_mapSaabSymbolToType.insert(strSaabSymbol, mappedTypeId);
|
||||
|
||||
for (SaabPlayer *participant : qAsConst(vecData))
|
||||
for (SaabPlayer *participant : std::as_const(vecData))
|
||||
{
|
||||
participant->mappedTypeId = mappedTypeId;
|
||||
vecUnitsWithValidSymbols.push_back(participant);
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <nglwidgets/ngldialog.h>
|
||||
#include <utility>
|
||||
#include "saab_logging.h"
|
||||
#include "saab_types.h"
|
||||
#include "zwmssaab_export.h"
|
||||
@@ -148,7 +149,7 @@ private:
|
||||
|
||||
if (m_logger.isDebugEnabled())
|
||||
{
|
||||
for (const T ¤t : qAsConst(vec))
|
||||
for (const T ¤t : std::as_const(vec))
|
||||
DEBUG_LOG(m_logger) << childTag << ": " << current.toString();
|
||||
}
|
||||
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "saab_map_party.h"
|
||||
#include <utility>
|
||||
#include "ui_saab_map_party.h"
|
||||
|
||||
#include "saab_map_type.h"
|
||||
@@ -24,21 +25,21 @@ MapParty::MapParty(const QString &partyName,
|
||||
|
||||
std::sort(forcesList.begin(), forcesList.end());
|
||||
|
||||
for (const QString ¤t : qAsConst(forcesList))
|
||||
for (const QString ¤t : std::as_const(forcesList))
|
||||
m_ui->cbForce->addItem(current);
|
||||
|
||||
QList<SaabEchelon> echelonList = echelons.values();
|
||||
|
||||
sortList(echelonList);
|
||||
|
||||
for (const SaabEchelon ¤t : qAsConst(echelonList))
|
||||
for (const SaabEchelon ¤t : std::as_const(echelonList))
|
||||
m_ui->cbEchelon->addItem(current.text, current.code);
|
||||
|
||||
QList<SaabSymbol> symbolList = symbols.values();
|
||||
|
||||
sortList(symbolList);
|
||||
|
||||
for (const SaabSymbol ¤t : qAsConst(symbolList))
|
||||
for (const SaabSymbol ¤t : std::as_const(symbolList))
|
||||
m_ui->cbSymbol->addItem(current.text, current.code);
|
||||
|
||||
connect(m_ui->pbApply, &QPushButton::clicked,
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "saab_map_type.h"
|
||||
#include <utility>
|
||||
#include "ui_saab_map_type.h"
|
||||
|
||||
namespace saab
|
||||
@@ -29,7 +30,7 @@ MapType::MapType(const QString &text, const QMap<QString, SaabEchelon> &echelons
|
||||
|
||||
sortList(echelonList);
|
||||
|
||||
for (const SaabEchelon ¤t : qAsConst(echelonList))
|
||||
for (const SaabEchelon ¤t : std::as_const(echelonList))
|
||||
m_ui->cbEchelon->addItem(current.text, current.code);
|
||||
}
|
||||
|
||||
@@ -37,7 +38,7 @@ MapType::MapType(const QString &text, const QMap<QString, SaabEchelon> &echelons
|
||||
|
||||
sortList(symbolList);
|
||||
|
||||
for (const SaabSymbol ¤t : qAsConst(symbolList))
|
||||
for (const SaabSymbol ¤t : std::as_const(symbolList))
|
||||
m_ui->cbSymbol->addItem(current.text, current.code);
|
||||
|
||||
connect(m_ui->pbApply, &QPushButton::clicked,
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "saab_mapping_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_saab_mapping_dialog.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
@@ -23,7 +24,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
|
||||
|
||||
|
||||
|
||||
for (const ParticipantManagement::Type &type : qAsConst(m_mapTypes))
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
|
||||
{
|
||||
@@ -77,7 +78,7 @@ void MappingDialog::slotClassTypeChanged()
|
||||
|
||||
int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
|
||||
|
||||
for (const ParticipantManagement::Type &type : qAsConst(m_mapTypes))
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if(type.isDeleted())
|
||||
continue;
|
||||
|
||||
+3
-2
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "saab_types.h"
|
||||
#include <utility>
|
||||
#include <QRegularExpression>
|
||||
#include <QStringList>
|
||||
#include <QXmlStreamWriter>
|
||||
@@ -80,7 +81,7 @@ QString SaabUnit::toStringWithDepth(int depth) const
|
||||
for (int i = 0; i <= depth; ++i)
|
||||
spaces.append(QStringLiteral(" "));
|
||||
|
||||
for (SaabPlayer *current : qAsConst(inferiors))
|
||||
for (SaabPlayer *current : std::as_const(inferiors))
|
||||
{
|
||||
SaabUnit *unit = dynamic_cast<SaabUnit *>(current);
|
||||
QString line = QStringLiteral("%1|\n%1+-- %2\n")
|
||||
@@ -106,7 +107,7 @@ void SaabUnit::writeToXml(QXmlStreamWriter *writer) const
|
||||
|
||||
if (!inferiors.isEmpty())
|
||||
{
|
||||
for (SaabPlayer *player : qAsConst(inferiors))
|
||||
for (SaabPlayer *player : std::as_const(inferiors))
|
||||
player->writeToXml(writer);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user