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

Migrates AreaEffectSimulation to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:07 +02:00
1 parent e8d07af320
commit 472f537313
102 files changed
+3307 -3313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ void TestAirSupportImpact::tryModify()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_asData.name("chris2");
m_asData.effectStart(m_asData.effectStart().get() + 2000);
m_asData.effectStart(m_asData.effectStart.get() + 2000);
m_asData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_asData.impactPosition(Core::GeoPosition2D(0.15525, 0.92607));
m_asData.partyId(8);
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
+11 -11
View File
@@ -22,7 +22,7 @@ TestBase::TestBase(const char *loggerName, QObject *parent)
, m_replyError(false)
, m_bTestsSuccessful(true)
, m_testId(0)
, m_aesTypeName(QString::fromLatin1(loggerName).splitRef(QLatin1Char('.')).last().toString())
, m_aesTypeName(QString::fromLatin1(loggerName).split(QLatin1Char('.')).last().toString())
, m_logger(getLogger(loggerName))
{}
@@ -65,29 +65,29 @@ bool TestBase::waitForData(const std::function<bool()> &func)
bool TestBase::checkAesItem(const AreaEffectSimulation::AesItem &a,
const AreaEffectSimulation::AesItem &b) const
{
if (a.name() != b.name())
if (a.name != b.name)
{
WARNING_LOG(m_logger) << "name does not match: " << a.name() << " - " << b.name();
WARNING_LOG(m_logger) << "name does not match: " << a.name << " - " << b.name;
return false;
}
if (a.effectStart() != b.effectStart())
if (a.effectStart != b.effectStart)
{
WARNING_LOG(m_logger) << "effectStart does not match: " << a.effectStart() << " - " << b.effectStart();
WARNING_LOG(m_logger) << "effectStart does not match: " << a.effectStart << " - " << b.effectStart;
return false;
}
if (a.chargeStruct().chargeTypeId() != b.chargeStruct().chargeTypeId())
if (a.chargeStruct.chargeTypeId != b.chargeStruct.chargeTypeId)
{
WARNING_LOG(m_logger) << "chargeTypeId does not match: " << a.chargeStruct().chargeTypeId() << " - " << b.chargeStruct().chargeTypeId();
WARNING_LOG(m_logger) << "chargeTypeId does not match: " << a.chargeStruct.chargeTypeId << " - " << b.chargeStruct.chargeTypeId;
return false;
}
if (a.partyId() != b.partyId())
if (a.partyId != b.partyId)
{
WARNING_LOG(m_logger) << "partyId does not match: " << a.partyId() << " - " << b.partyId();
WARNING_LOG(m_logger) << "partyId does not match: " << a.partyId << " - " << b.partyId;
return false;
}
if (a.participantId() != b.participantId())
if (a.participantId != b.participantId)
{
WARNING_LOG(m_logger) << "participantId does not match: " << a.participantId() << " - " << b.participantId();
WARNING_LOG(m_logger) << "participantId does not match: " << a.participantId << " - " << b.participantId;
return false;
}
return true;
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ void TestBCContamination::tryModifyBCContamination()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_bcData.name("chris2");
m_bcData.effectStart(m_bcData.effectStart().get() + 2000);
m_bcData.effectStart(m_bcData.effectStart.get() + 2000);
m_bcData.effectDuration(3200); // msec
m_bcData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_bcData.impactPosition(Core::GeoPosition2D(0.17, 0.93));
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
+17 -17
View File
@@ -89,10 +89,10 @@ void TestBoobyTrap::tryCreateBoobyTrap()
btData.impactPosition(),
btData.impactRadius(),
btData.triggerRadius(),
btData.rotationAngle().get(),
btData.centralAngle().get(),
btData.effectStart().get(),
btData.partyId().get()),
btData.rotationAngle.get(),
btData.centralAngle.get(),
btData.effectStart.get(),
btData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during BoobyTrapCreateRequest()";
@@ -122,10 +122,10 @@ void TestBoobyTrap::tryCreateBoobyTrap()
btData.impactPosition(),
btData.impactRadius(),
btData.triggerRadius(),
btData.rotationAngle().get(),
btData.centralAngle().get(),
btData.effectStart().get(),
btData.partyId().get()),
btData.rotationAngle.get(),
btData.centralAngle.get(),
btData.effectStart.get(),
btData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during BoobyTrapCreateRequest()";
@@ -153,7 +153,7 @@ void TestBoobyTrap::tryModifyBoobyTrap()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_btData.name("Booby Trap 2");
m_btData.effectStart(m_btData.effectStart().get() + 2000);
m_btData.effectStart(m_btData.effectStart.get() + 2000);
m_btData.effectDuration(3200); // msec
m_btData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_btData.impactPosition(Core::GeoPosition2D(0.1547, 0.926));
@@ -173,10 +173,10 @@ void TestBoobyTrap::tryModifyBoobyTrap()
btData.impactPosition(),
btData.impactRadius(),
btData.triggerRadius(),
btData.rotationAngle().get(),
btData.centralAngle().get(),
btData.effectStart().get(),
btData.partyId().get()),
btData.rotationAngle.get(),
btData.centralAngle.get(),
btData.effectStart.get(),
btData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error requesting modify data";
@@ -252,10 +252,10 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
btData.impactPosition(),
btData.impactRadius(),
btData.triggerRadius(),
btData.rotationAngle().get(),
btData.centralAngle().get(),
btData.effectStart().get(),
btData.partyId().get()),
btData.rotationAngle.get(),
btData.centralAngle.get(),
btData.effectStart.get(),
btData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during BoobyTrapModifyRequest()";
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ void TestExplosionArea::tryModifyExplosionArea()
{
INFO_LOG(m_logger) << "tryModifyExplosionArea start";
m_eaData.name("af2");
m_eaData.effectStart(m_eaData.effectStart().get() + 3000);
m_eaData.effectStart(m_eaData.effectStart.get() + 3000);
m_eaData.effectDuration(9000); // 9 sec
m_eaData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70));
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ void TestExplosionAreaBulk::tryModifyExplosionArea()
{
INFO_LOG(m_logger) << "tryModifyExplosionArea start";
m_eaData.name("af2");
m_eaData.effectStart(m_eaData.effectStart().get() + 3000);
m_eaData.effectStart(m_eaData.effectStart.get() + 3000);
m_eaData.effectDuration(9000); // 9 sec
m_eaData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70));
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
+2 -2
View File
@@ -69,7 +69,7 @@ void TestExplosionCluster::tryCreateExplosionCluster()
eaData.effectStart((time(nullptr) + 30) * 1000); // msec
QString name(QStringLiteral("ec__"));
name += QString::number(eaData.effectStart().get());
name += QString::number(eaData.effectStart.get());
eaData.name(name.toStdString());
eaData.effectDuration(10000); // 10 seconds
@@ -214,7 +214,7 @@ void TestExplosionCluster::tryModifyExplosionCluster()
{
INFO_LOG(m_logger) << "tryModifyExplosionCluster start";
m_ecData.name("af2");
m_ecData.effectStart(m_ecData.effectStart().get() + 3000);
m_ecData.effectStart(m_ecData.effectStart.get() + 3000);
m_ecData.effectDuration(9000); // 9 sec
m_ecData.chargeTypeId(s_ChargeTypeId2);
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ void TestExplosionSingle::tryModifyExplosionSingle()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_esData.name("chris2");
m_esData.effectStart(m_esData.effectStart().get() + 2000);
m_esData.effectStart(m_esData.effectStart.get() + 2000);
m_esData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_esData.impactPosition(Core::GeoPosition2D(0.17, 0.93));
m_esData.partyId(3);
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
+2 -2
View File
@@ -433,7 +433,7 @@ void TestMineArea::tryModifyMineArea()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_maData.name("chris2");
m_maData.effectStart(m_maData.effectStart().get() + 2000);
m_maData.effectStart(m_maData.effectStart.get() + 2000);
m_maData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_maData.effectDuration(4 * 1000);
m_maData.density(0.2);
@@ -645,7 +645,7 @@ void TestMineArea::tryTriggerDusMineInBoth()
INFO_LOG(m_logger) << "trying to send mineTriggeredRequest()";
m_replyError = true;
if (!m_ftc->mineTriggeredRequest(MineTriggeredRequest(mtr.mineAreaId(), mtr.mineId(), mtr.position().get(), mtr.chargeTypeId().get()), this))
if (!m_ftc->mineTriggeredRequest(MineTriggeredRequest(mtr.mineAreaId(), mtr.mineId(), mtr.position.get(), mtr.chargeTypeId.get()), this))
{
ERROR_LOG(m_logger) << "Error during mineTriggeredRequest()";
failExit();
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
+13 -13
View File
@@ -87,9 +87,9 @@ void TestOffRouteMine::tryCreateOffRouteMine()
ormData.effectDuration(),
ormData.chargeStruct().chargeTypeId(),
ormData.area(),
ormData.impactRadius().get(),
ormData.effectStart().get(),
ormData.partyId().get()),
ormData.impactRadius.get(),
ormData.effectStart.get(),
ormData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during OffRouteMineCreateRequest()";
@@ -117,9 +117,9 @@ void TestOffRouteMine::tryCreateOffRouteMine()
ormData.effectDuration(),
ormData.chargeStruct().chargeTypeId(),
ormData.area(),
ormData.impactRadius().get(),
ormData.effectStart().get(),
ormData.partyId().get()),
ormData.impactRadius.get(),
ormData.effectStart.get(),
ormData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during OffRouteMineCreateRequest()";
@@ -147,7 +147,7 @@ void TestOffRouteMine::tryModifyOffRouteMine()
{
INFO_LOG(m_logger) << "trying to send modify request";
m_ormData.name("OffRouteMine 2");
m_ormData.effectStart(m_ormData.effectStart().get() + 2000);
m_ormData.effectStart(m_ormData.effectStart.get() + 2000);
m_ormData.effectDuration(3200); // msec
m_ormData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
m_ormData.area().cornerBottomLeft(Core::GeoPosition2D(0.154, 0.926));
@@ -168,9 +168,9 @@ void TestOffRouteMine::tryModifyOffRouteMine()
ormData.effectDuration(),
ormData.chargeStruct().chargeTypeId(),
ormData.area(),
ormData.impactRadius().get(),
ormData.effectStart().get(),
ormData.partyId().get()),
ormData.impactRadius.get(),
ormData.effectStart.get(),
ormData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error requesting modify data";
@@ -243,9 +243,9 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
ormData.effectDuration(),
ormData.chargeStruct().chargeTypeId(),
ormData.area(),
ormData.impactRadius().get(),
ormData.effectStart().get(),
ormData.partyId().get()),
ormData.impactRadius.get(),
ormData.effectStart.get(),
ormData.partyId.get()),
this))
{
ERROR_LOG(m_logger) << "Error during OffRouteMineModifyRequest()";