lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes .IDL warnings: multiple enum definitons and builtin-type collisions

Browse Source
This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
+8 -8
View File
@@ -183,7 +183,7 @@ void ExplosionEdit::retranslate()
switch (m_gearClass.underlying())
{
case ProjectDataManagement::GearClass::Artillery:
case ProjectDataManagement::GearClass::GearClass_Artillery:
if (m_type == etSingle)
title = tr("Single Artillery");
else if (m_type == etArea)
@@ -191,7 +191,7 @@ void ExplosionEdit::retranslate()
else
title = tr ("Single Artillery Central");
break;
case ProjectDataManagement::GearClass::Mortar:
case ProjectDataManagement::GearClass::GearClass_Mortar:
if (m_type == etSingle)
title = tr("Single Mortar");
else if (m_type == etArea)
@@ -364,7 +364,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
bool readable = false;
switch (m_gearClass.underlying())
{
case ProjectDataManagement::GearClass::Artillery:
case ProjectDataManagement::GearClass::GearClass_Artillery:
m_editable = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditArtillery) && m_type == etSingle) ||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditArtillery) && m_type == etArea) ||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsCentralEditArtillery) && m_type == etSingleCentral) ||
@@ -380,7 +380,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
else if (m_type == etSingleCentral)
setOnlineHelpFilename(QStringLiteral("Situation-Add_Single_Central_Artillery"));
break;
case ProjectDataManagement::GearClass::Mortar:
case ProjectDataManagement::GearClass::GearClass_Mortar:
m_editable = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditMortar) && m_type == etSingle) ||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditMortar) && m_type == etArea) ||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsCentralEditMortar) && m_type == etSingleCentral) ;
@@ -481,14 +481,14 @@ QString ExplosionEdit::dialogIdentifier() const
{
switch (m_gearClass.underlying())
{
case ProjectDataManagement::GearClass::Artillery:
case ProjectDataManagement::GearClass::GearClass_Artillery:
if (m_type == etSingle)
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleArtillery") : QStringLiteral("EditExplosionSingleArtillery%1").arg(m_aesItem.id());
else if (m_type == etArea)
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionAreaArtillery") : QStringLiteral("EditExplosionAreaArtillery%1").arg(m_aesItem.id());
else
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleCentralArtillery") : QStringLiteral("EditExplosionSingleCentralArtillery%1").arg(m_aesItem.id());
case ProjectDataManagement::GearClass::Mortar:
case ProjectDataManagement::GearClass::GearClass_Mortar:
if (m_type == etSingle)
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleMortar") : QStringLiteral("EditExplosionSingleMortar%1").arg(m_aesItem.id());
else if (m_type == etArea)
@@ -716,7 +716,7 @@ void ExplosionEdit::onPartyChanged()
int partyId = m_ui->cbParty->currentData().toInt();
int chargeTypeId = m_ui->cbChargeType->currentData().toInt();
if (chargeTypeId <= 0)
chargeTypeId = m_gearClass == ProjectDataManagement::GearClass::Artillery ? s_lastChargeTypeA : s_lastChargeTypeM;
chargeTypeId = m_gearClass == ProjectDataManagement::GearClass::GearClass_Artillery ? s_lastChargeTypeA : s_lastChargeTypeM;
QSignalBlocker sb(m_ui->cbChargeType);
m_ui->cbChargeType->clear();
@@ -736,7 +736,7 @@ bool ExplosionEdit::apply()
std::string name = m_ui->leIdentifier->text().toStdString();
qint64 effectStart = m_ui->dteEffectStart->msecsSinceEpoch();
int chargeType = m_ui->cbChargeType->currentData().toInt();
if (m_gearClass == ProjectDataManagement::GearClass::Artillery)
if (m_gearClass == ProjectDataManagement::GearClass::GearClass_Artillery)
s_lastChargeTypeA = chargeType;
else
s_lastChargeTypeM = chargeType;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
+11 -11
View File
@@ -45,7 +45,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Single Artillery"),
QLatin1String("ShowExplosionSingleArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings_single.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::SingleExplosionsShowArtillery,
LtsWidgets::ExercisePart::eExecution));
@@ -55,7 +55,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Add Single Artillery"),
QLatin1String("AddExplosionSingleArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings_single_add.svg")),
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::SingleExplosionsShowArtillery,
LtsWidgets::ExercisePart::eExecution,
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
@@ -68,7 +68,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Single Artillery Central"),
QLatin1String("ShowExplosionSingleCentralArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings_single.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(true, true, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(true, true, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::SingleExplosionsShowArtillery,
LtsWidgets::ExercisePart::eExecution));
@@ -79,7 +79,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Add Single Artillery Central"),
QLatin1String("AddExplosionSingleCentralArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings_single_add.svg")),
[this](QWidget *parent) { return onShowAddExplosionDialog(true, true, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowAddExplosionDialog(true, true, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::SingleExplosionsShowArtillery,
LtsWidgets::ExercisePart::eExecution,
@@ -97,7 +97,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Single Mortar"),
QLatin1String("ShowExplosionSingleMortar"),
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::Mortar, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
OperatorRights::SingleExplosionsShowMortar,
LtsWidgets::ExercisePart::eExecution));
@@ -107,7 +107,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Add Single Mortar"),
QLatin1String("AddExplosionSingleMortar"),
QIcon(QLatin1String("icon:add_mortar_ammunition_firings_single.svg")),
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::Mortar, parent); },
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
OperatorRights::SingleExplosionsEditMortar,
LtsWidgets::ExercisePart::eExecution,
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
@@ -121,7 +121,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Single NASAT Impacts"),
QLatin1String("ShowExplosionSingleAerial"),
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::AirSupport, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_AirSupport, parent); },
OperatorRights::AirSupportShow,
LtsWidgets::ExercisePart::eExecution));
}
@@ -136,7 +136,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Area Artillery"),
QLatin1String("ShowExplosionAreaArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::AreaExplosionsShowArtillery,
LtsWidgets::ExercisePart::eExecution));
@@ -146,7 +146,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Add Area Artillery"),
QLatin1String("AddExplosionAreaArtillery"),
QIcon(QLatin1String("icon:arti_ammunition_firings_add.svg")),
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::Artillery, parent); },
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
OperatorRights::AreaExplosionsEditArtillery,
LtsWidgets::ExercisePart::eExecution,
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
@@ -161,7 +161,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Area Mortar"),
QLatin1String("ShowExplosionAreaMortar"),
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::Mortar, parent); },
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
OperatorRights::AreaExplosionsShowMortar,
LtsWidgets::ExercisePart::eExecution));
@@ -171,7 +171,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
tr("Add Area Mortar"),
QLatin1String("AddExplosionAreaMortar"),
QIcon(QLatin1String("icon:add_mortar_ammunition_firings.svg")),
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::Mortar, parent); },
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
OperatorRights::AreaExplosionsEditMortar,
LtsWidgets::ExercisePart::eExecution,
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
m_bHasAddEditOperatorRights = false;
switch (m_gearClass.underlying())
{
case ProjectDataManagement::GearClass::Artillery:
case ProjectDataManagement::GearClass::GearClass_Artillery:
switch (m_type)
@@ -66,7 +66,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
break;
case ProjectDataManagement::GearClass::Mortar:
case ProjectDataManagement::GearClass::GearClass_Mortar:
m_bHasAddEditOperatorRights = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditMortar) && m_type == etSingle)
|| (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditMortar) && m_type == etArea);
if (m_type == etSingle)
@@ -80,7 +80,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
m_windowTitle = tr("Area Mortar");
}
break;
case ProjectDataManagement::GearClass::AirSupport:
case ProjectDataManagement::GearClass::GearClass_AirSupport:
Q_ASSERT(m_type == etSingle);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
+2 -2
View File
@@ -248,11 +248,11 @@ ExplosionsEdit::ExplosionsEdit(const QString &menuGroup, QWidget *parent)
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
m_geometrieButtonGroup->setExclusive(true);
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
if (enableRocket)
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
m_uiRequirements->addRequirement({m_ui->lblRadiusBreite, [this]() { return (m_ui->sbDimensionX_BreiteRadius->value() >= s_minWidth); }});
m_uiRequirements->addRequirement({m_ui->lblDimensionY_Tiefe, [this]() { return (m_ui->sbDimensionY_Tiefe->value() >= s_minHeight); }});
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
+2 -2
View File
@@ -86,11 +86,11 @@ ExplosionsEditAdler::ExplosionsEditAdler(const QString &menuGroup, QWidget *pare
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
m_geometrieButtonGroup->setExclusive(true);
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
if (enableRocket)
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
m_uiRequirements->addRequirement(
{m_ui->lbxActors,
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
+3 -3
View File
@@ -269,11 +269,11 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
m_geometrieButtonGroup->setExclusive(true);
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
if (enableRocket)
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
m_uiRequirements->addRequirement({m_ui->lblRadiusBreite, [this]() { return (m_ui->sbDimensionX_BreiteRadius->value() >= s_minWidth); }});
m_uiRequirements->addRequirement({m_ui->lblDimensionY_Tiefe, [this]() { return (m_ui->sbDimensionY_Tiefe->value() >= s_minHeight); }});
@@ -2157,7 +2157,7 @@ bool ExplosionsEditAdlerStandAlone::apply()
const QVariant currentData = m_ui->cbGearClass->currentData();
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
RocketUtility::addRocketPropertiesToRequest(request, m_ppmDtc);
m_requestHelper->addRequest([this, request]() { return m_ftc->effectClusterModifyRequest(request, this); });
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
+2 -2
View File
@@ -41,7 +41,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type
const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
{
QStandardItem *item = cboModel->item(indexCounter);
@@ -64,7 +64,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type
const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
{
QStandardItem *item = cboModel->item(indexCounter);