Adds immediate migration results

This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524

No files matched your search

@@ -10,7 +10,7 @@
#
NGL_ADD_LIBRARY(WS AesDataPlugin MODULE aes_data_plugin.cpp aes_data_plugin.h)
NGL_TARGET_LINK_LIBRARIES(AesDataPlugin
Qt5::Core
Qt6::Core
AesDataPluginInterface
svcAesClient
NGLLogger
@@ -35,7 +35,7 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
AesMineAreaGuiPluginInterface
AesDangerAreaGuiPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsSession
LtsSessionData
@@ -2,6 +2,7 @@
#include "aes_danger_area_aes_item_info.h"
#include <utility>
#include "ui_aes_danger_area_aes_item_info.h"
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
#include <BCContamination/aes_bccontamination_gui_plugin_interface.h>
@@ -31,7 +32,7 @@ DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget *parent)
DangerAreaAesItemInfo::~DangerAreaAesItemInfo()
{
for (const auto &item : qAsConst(m_aesItems))
for (const auto &item : std::as_const(m_aesItems))
delete item.item;
delete m_ui;
}
@@ -134,11 +135,11 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
void DangerAreaAesItemInfo::setText()
{
for (const DangerArea &dangerArea : qAsConst(m_dangerAreas))
for (const DangerArea &dangerArea : std::as_const(m_dangerAreas))
aesItemInfo(&dangerArea);
for(const AesStruct &aesStruct : qAsConst(m_aesItems))
for(const AesStruct &aesStruct : std::as_const(m_aesItems))
{
if(aesStruct.item->effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
aesItemInfo(aesStruct.item);
@@ -50,7 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
ngltools
PpmDataPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
)
NGL_INSTALL_TARGET(AesAirSupportGuiPlugin)
@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
LtsSession
AesDataPluginInterface
AesInfoGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsUtilsSettings
)
@@ -3,6 +3,7 @@
#include "aes_bccontamination_edit.h"
#include <utility>
#include "ui_aes_bccontamination_edit.h"
#include "../AesInfo/aes_danger_area_aes_item_info.h"
@@ -226,7 +227,7 @@ void BCContaminationEdit::setPbDangerAreaText()
{
QStringList sl;
sl.reserve(m_dangerAreaIds.size());
for (int idx : qAsConst(m_dangerAreaIds))
for (int idx : std::as_const(m_dangerAreaIds))
{
sl << QString::fromStdString(m_dtc->dangerArea(idx).name());
}
@@ -46,7 +46,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBaseGui
LtsSessionData
LtsUtilsGuiDds
LtsWidgets
Qt5::Widgets
Qt6::Widgets
)
NGL_INSTALL_TARGET(AesBaseGui)
@@ -2,6 +2,7 @@
#include "aes_base_model.h"
#include <utility>
#include <LtsSession/lts_session_data.h>
#include <LtsSession/lts_session.h>
@@ -138,7 +139,7 @@ void AesGuiBasHelpers::updateComboboxFilterData(const QSet<int> &availablePartyI
{
LtsWidgets::ComboboxFilterContent cfc;
LtsWidgets::ComboboxFilterData cfd;
for (const int i : qAsConst(availabelChargeIds))
for (const int i : std::as_const(availabelChargeIds))
{
cfd.data = i;
cfd.text = chargeTypeName(i).toString();
@@ -148,7 +149,7 @@ void AesGuiBasHelpers::updateComboboxFilterData(const QSet<int> &availablePartyI
m_cbxFilterChargeType = cfc.toVariant();
cfc.data.clear();
for (const int i : qAsConst(availablePartyIds))
for (const int i : std::as_const(availablePartyIds))
{
cfd.data = i;
cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name());
@@ -191,10 +192,10 @@ void AesGuiBasHelpers::fillAvailableChargeIds(const QVector<ProjectDataManagemen
{
m_availableChargeIds.clear();
for (auto gc : qAsConst(gcs))
for (auto gc : std::as_const(gcs))
{
const QVector<ProjectDataManagement::ChargeType> &availableCharges = m_pdmDtc->chargesForGearClass(gc);
for (const auto &charge : qAsConst(availableCharges))
for (const auto &charge : std::as_const(availableCharges))
m_availableChargeIds += charge.id();
}
@@ -4,6 +4,7 @@
#pragma once
#include "aes_base_exports.h"
#include <utility>
#include <AreaEffectSimulation/aes.hpp>
@@ -138,7 +139,7 @@ protected:
{
QSet<int> availabelChargeIds;
QSet<int> availablePartyIds;
for (const T &data : qAsConst(AesGuiBaseModel::m_vecData))
for (const T &data : std::as_const(AesGuiBaseModel::m_vecData))
{
availabelChargeIds.insert(data.chargeStruct().chargeTypeId());
if (data.partyId().is_set())
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
AesInfoGuiPluginInterface
FlmDataPluginInterface
NGLLogger
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsSession
LtsSessionData
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
AesDataPluginInterface
PpmGuiComboboxPluginInterface
svcPdmCommon
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsUtilsSettings
)
@@ -2,6 +2,7 @@
#include "aes_charge_administration_adler_model.h"
#include <utility>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
#include <LtsSession/lts_session.h>
@@ -84,7 +85,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
}
for (const ParticipantManagement::Party &p : qAsConst(parties))
for (const ParticipantManagement::Party &p : std::as_const(parties))
{
updateItem(p.id());
}
@@ -184,7 +185,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
qint64 sampleTime=0;
ChargeAdministrationAdler item;
for (const ChargeStruct &participantCharges : qAsConst(m_participantChargeTypeMap))
for (const ChargeStruct &participantCharges : std::as_const(m_participantChargeTypeMap))
{
if (participantCharges.partyId != partyId)
continue;
@@ -2,6 +2,7 @@
#include "aes_charge_administration_list.h"
#include <utility>
#include "CustomView/aes_charge_administration.h"
#include "aes_charge_administration_model.h"
#include "aes_charge_edit.h"
@@ -101,7 +102,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
if (!reqs.isEmpty())
{
for (const ChargeAdministrationModifyRequest &req : qAsConst(reqs))
for (const ChargeAdministrationModifyRequest &req : std::as_const(reqs))
{
m_requestHelper->addRequest([this, req]() { return m_ftc->chargeAdministrationModifyRequest(req, this); });
}
@@ -2,6 +2,7 @@
#include "aes_charge_administration_model.h"
#include <utility>
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/json_object.h>
@@ -112,9 +113,9 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
if (enableRocket)
chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass_def::Rocket);
for (const ParticipantManagement::Party &p : qAsConst(parties))
for (const ParticipantManagement::Party &p : std::as_const(parties))
{
for (const ProjectDataManagement::ChargeType &ct : qAsConst(chargesForGearClass))
for (const ProjectDataManagement::ChargeType &ct : std::as_const(chargesForGearClass))
{
if (chargesInserted.contains(qMakePair(ct.id(), p.id())) || isDummy(ct) || m_pdmDtc->isAdlerChargeType(ct.id()))
continue;
@@ -33,7 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
PpmGuiComboboxPluginInterface
PpmDataPluginInterface
PpmParticipantSelectionGui
Qt5::Widgets
Qt6::Widgets
LtsWidgets
AsbDataPluginInterface
advancedSymbologyGui
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
PdmGuiPluginInterface
AesInfoGuiPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -3,6 +3,7 @@
#include "aes_danger_area_edit.h"
#include <utility>
#include "ui_aes_danger_area_edit.h"
#include <LtsSession/lts_session_data.h>
@@ -131,7 +132,7 @@ bool DangerAreaEdit::init(int aesItemId, bool copy,
void DangerAreaEdit::setPbAesItemsText()
{
QStringList sl;
for (int idx : qAsConst(m_otherAesItemIds))
for (int idx : std::as_const(m_otherAesItemIds))
{
AesItem item;
m_dtc->aesItemFromId(idx, item);
@@ -25,7 +25,7 @@ NGL_TARGET_LINK_LIBRARIES(AesEffectClusterModel
ngltools
PUBLIC
NGLLogger
Qt5::Core
Qt6::Core
)
NGL_TARGET_INCLUDE_DIRECTORIES(AesEffectClusterModel
@@ -96,7 +96,7 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
PpmParticipantSelectionGui
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -3,6 +3,7 @@
#include "aes_explosion_edit.h"
#include <utility>
#include "ui_aes_explosion_edit.h"
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -719,7 +720,7 @@ void ExplosionEdit::onPartyChanged()
QSignalBlocker sb(m_ui->cbChargeType);
m_ui->cbChargeType->clear();
for (const Charges &charge : qAsConst(m_chargeTypeMap))
for (const Charges &charge : std::as_const(m_chargeTypeMap))
{
if (charge.available.contains(partyId) && charge.available[partyId] > 0)
m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(charge.chargeType.id(), true), charge.chargeType.id());
@@ -2,6 +2,7 @@
#include "aes_explosions_edit.h"
#include <utility>
#include "ui_aes_explosions_edit.h"
@@ -1850,7 +1851,7 @@ void ExplosionsEdit::enableUiElements(bool enable)
const QList<QAbstractButton *> &geoButtons = m_geometrieButtonGroup->buttons();
for (QAbstractButton *btn : qAsConst(geoButtons))
for (QAbstractButton *btn : std::as_const(geoButtons))
btn->setEnabled(enable);
@@ -2597,7 +2598,7 @@ void ExplosionsEdit::fillCharges()
QSignalBlocker locked(m_ui->cbChargeType);
m_ui->cbChargeType->clear();
for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass))
for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
{
const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
@@ -2627,7 +2628,7 @@ void ExplosionsEdit::fillCharges()
void ExplosionsEdit::fillGearClasses()
{
const auto &gearClasses = m_pdmDtc->gearTypes();
for (auto type : qAsConst(gearClasses))
for (auto type : std::as_const(gearClasses))
{
if (m_gearClassFilter.contains(type.gearClassId()) && m_pdmDtc->getAdlerWeaponSystemId(type.id()) <= 3)
m_ui->cbGearClass->addItem(m_pdmDtc->trGearTypeName(type.id()), type.gearClassId().underlying());
@@ -2,6 +2,7 @@
#include "aes_explosions_edit_adler_standalone.h"
#include <utility>
#include "aes_rocket_utility.h"
#include "aes_effector.h"
#include "ui_aes_explosions_edit_adler_standalone.h"
@@ -1759,7 +1760,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
const QList<QAbstractButton *> &geoButtons = m_geometrieButtonGroup->buttons();
for (QAbstractButton *btn : qAsConst(geoButtons))
for (QAbstractButton *btn : std::as_const(geoButtons))
btn->setEnabled(enable);
@@ -2747,7 +2748,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges()
m_ui->cbChargeType->clear();
m_ui->cbChargeType->addItem(emptyEntryComboBox, -1);
for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass))
for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
{
const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
@@ -2793,7 +2794,7 @@ void ExplosionsEditAdlerStandAlone::fillGearClasses()
int index = 0;
m_ui->cbGearClass->insertItem(index, emptyEntryComboBox, -1);
for (auto type : qAsConst(gearClasses))
for (auto type : std::as_const(gearClasses))
{
if (m_gearClassFilter.contains(type.gearClassId()))
{
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
PpmGuiComboboxPluginInterface
PpmDataPluginInterface
PpmParticipantSelectionGui
Qt5::Widgets
Qt6::Widgets
LtsWidgets
AsbDataPluginInterface
advancedSymbologyGui
@@ -3,6 +3,7 @@
#include "aes_functional_area_edit.h"
#include <utility>
#include "ui_aes_functional_area_edit.h"
#include <LtsSession/lts_session_data.h>
@@ -277,7 +278,7 @@ bool FunctionalAreaEdit::init(int areaId, bool copy,
m_ui->cbFunctionalAreaType->clear();
m_functionalAreaTypes = m_dtc->functionalAreaTypes();
for (const auto &type : qAsConst(m_functionalAreaTypes))
for (const auto &type : std::as_const(m_functionalAreaTypes))
m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name()), type.id());
bool editable = LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FunctionalAreasEdit) ||
@@ -733,7 +734,7 @@ void FunctionalAreaEdit::setVisableFaButtons()
DEBUG_LOG(m_logger) << "setVisableFaButtons!!!!!!!!!!!!!!!!!!!!!!!! Type=" << functionalAreaType;
const QList<QWidget *> children = findChildren<QWidget *>();
for (QWidget *w : qAsConst(children))
for (QWidget *w : std::as_const(children))
{
@@ -763,7 +764,7 @@ QStringList FunctionalAreaEdit::toStringList(const QList<QByteArray> &list)
QStringList stringList;
stringList.reserve(list.size());
for (const QByteArray &ba : qAsConst(list))
for (const QByteArray &ba : std::as_const(list))
stringList.append(QString::fromLocal8Bit(ba));
return stringList;
@@ -39,7 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
PdmGuiPluginInterface
AesInfoGuiPluginInterface
NGLLogger
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsSession
LtsSessionData
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
AesMineAreaGuiPluginInterface
PdmGuiPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsUtilsGuiDds
LtsDataView
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
AesInfoGuiPluginInterface
PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -55,7 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
LtsSession
AesDataPluginInterface
AesInfoGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsUtilsSettings
)
@@ -3,6 +3,7 @@
#include "aes_off_route_mine_edit.h"
#include <utility>
#include "ui_aes_off_route_mine_edit.h"
#include <LtsWidgets/lts_message_dialog.h>
@@ -386,7 +387,7 @@ void OffRouteMineEdit::onPolylineData(const QPolygonF &polyline)
m_previewPolygon.clear();
m_previewPolygon.reserve(relativeRect.size());
for (const QPointF &item : qAsConst(relativeRect))
for (const QPointF &item : std::as_const(relativeRect))
m_previewPolygon.append(utm1.geographic(item));
showPreviewObject();
@@ -39,7 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
AesNContaminationGuiPluginInterface
PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -3,6 +3,7 @@
#include "aes_ncontamination_edit.h"
#include <utility>
#include "ui_aes_ncontamination_edit.h"
#include <LtsSession/lts_session_data.h>
@@ -281,7 +282,7 @@ bool NContaminationEdit::init(int aesItemId, bool copy,
if (m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
{
m_presets = pdmDtc->nuclearPresets();
for (const ProjectDataManagement::NuclearPreset &preset : qAsConst(m_presets))
for (const ProjectDataManagement::NuclearPreset &preset : std::as_const(m_presets))
m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id()), preset.id());
connect(m_ui->cbStandardValues, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NContaminationEdit::onPresetChanged);
}
@@ -37,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
NGLLogger
LtsSessionData
AesDataPluginInterface
Qt5::Widgets
Qt6::Widgets
LtsWidgets
LtsUtilsSettings
)