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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
+69 -69
View File
@@ -169,10 +169,10 @@ void WhgTests::tryModify()
EquipmentTypeWh data;
getEqtTypeWhModifyRequestData(data);
INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id;
if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id;
failExit();
}
} // end of tryModify()
@@ -183,12 +183,12 @@ void WhgTests::tryRemove()
m_eTestStep = eRemove;
RemoveEquipmentTypeWhRequest data;
data.id(m_equipmentTypeWhId);
data.id = m_equipmentTypeWhId;
INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id;
if (!m_ftc->removeEquipmentTypeWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id;
failExit();
}
} // end of tryRemove()
@@ -213,10 +213,10 @@ void WhgTests::tryGetAllEquipmentTypesWh()
for (auto it = map.begin(); it != map.end(); ++it)
{
INFO_LOG(m_logger) << "whg(" << it.key() << ") :"
<< " name:" << it.value().name()
<< " minEquipNo:" << it.value().minEquipNo()
<< " maxEquipNo:" << it.value().maxEquipNo()
<< " vbAgdus:" << it.value().vbAgdusId();
<< " name:" << it.value().name
<< " minEquipNo:" << it.value().minEquipNo
<< " maxEquipNo:" << it.value().maxEquipNo
<< " vbAgdus:" << it.value().vbAgdusId;
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -240,18 +240,18 @@ void WhgTests::tryGetEquipmentTypeWh()
m_dtc->waitForHistoricalDataEquipmentTypeWh();
WarehouseGuez::EquipmentTypeWh data = m_dtc->equipmentTypeWh(m_equipmentTypeWhId);
if (data.id() < 0)
if (data.id < 0)
{
ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id;
failExit();
}
else
{
INFO_LOG(m_logger) << "whg(" << data.id() << ") :"
<< " name:" << data.name()
<< " minEquipNo:" << data.minEquipNo()
<< " maxEquipNo:" << data.maxEquipNo()
<< " vbAgdus:" << data.vbAgdusId();
INFO_LOG(m_logger) << "whg(" << data.id << ") :"
<< " name:" << data.name
<< " minEquipNo:" << data.minEquipNo
<< " maxEquipNo:" << data.maxEquipNo
<< " vbAgdus:" << data.vbAgdusId;
}
if (m_testId == 0)
@@ -379,21 +379,21 @@ void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
//-----------------------------------------------------------------------------
void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModification modType)
{
INFO_LOG(m_logger) << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id()
INFO_LOG(m_logger) << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id
<< " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id;
break;
case DataModification::eModified:
INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id;
break;
case DataModification::eRemoved:
INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id;
break;
default:
@@ -405,51 +405,51 @@ void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModifica
//-----------------------------------------------------------------------------
void WhgTests::getEqtTypeWhCreateRequestData(EquipmentTypeWh &data)
{
data.id(); // -1 for add, 0 is a valid id // 0 should be valid though?!?
data.name("TestEqtTypeCreate");
data.minEquipNo(1000);
data.maxEquipNo(3000);
data.vbAgdusId(1);
data.configurationAgdusHV(ConfigurationAgdusHV_def::AgdusHWNoHelmetNoWest);
data.id; // -1 for add, 0 is a valid id // 0 should be valid though?!?
data.name = "TestEqtTypeCreate";
data.minEquipNo = 1000;
data.maxEquipNo = 3000;
data.vbAgdusId = 1;
data.configurationAgdusHV = ConfigurationAgdusHV::AgdusHWNoHelmetNoWest;
} // end of getEqtTypeWhCreateRequestData()
//-----------------------------------------------------------------------------
void WhgTests::getEqtTypeWhModifyRequestData(EquipmentTypeWh &data)
{
data.id(m_equipmentTypeWhId);
data.name("TestEqtTypeModify");
data.maxEquipNo(3100);
data.minEquipNo(1100);
data.vbAgdusId(2);
data.configurationAgdusHV(ConfigurationAgdusHV_def::AgdusHWWithHelmetWithVest);
data.id = m_equipmentTypeWhId;
data.name = "TestEqtTypeModify";
data.maxEquipNo = 3100;
data.minEquipNo = 1100;
data.vbAgdusId = 2;
data.configurationAgdusHV = ConfigurationAgdusHV::AgdusHWWithHelmetWithVest;
} // end of getEqtTypeWhModifyRequestData()
//-----------------------------------------------------------------------------
void WhgTests::getInjuryModelWhCreateRequestData(InjuryModelAgdusWh &data)
{
data.name("TestInjuryModelCreate");
data.version("1.0");
data.description("This is the description");
data.id(0);
data.name = "TestInjuryModelCreate";
data.version = "1.0";
data.description = "This is the description";
data.id = 0;
} // end of getInjuryModelWhCreateRequestData()
//-----------------------------------------------------------------------------
void WhgTests::getInjuryModelWhModifyRequestData(InjuryModelAgdusWh &data)
{
data.id(m_injuryModelWhId);
data.name("TestInjuryModelWhModify");
data.version("2.0");
data.description("Description Modify");
data.id = m_injuryModelWhId;
data.name = "TestInjuryModelWhModify";
data.version = "2.0";
data.description = "Description Modify";
} // end of getInjuryModelWhModifyRequestData()
//-----------------------------------------------------------------------------
bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -457,27 +457,27 @@ bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
getEqtTypeWhCreateRequestData(createData);
if (createData.name() != data.name())
if (createData.name != data.name)
return false;
if (createData.minEquipNo() != data.minEquipNo())
if (createData.minEquipNo != data.minEquipNo)
return false;
if (createData.maxEquipNo() != data.maxEquipNo())
if (createData.maxEquipNo != data.maxEquipNo)
return false;
if (createData.vbAgdusId() != data.vbAgdusId())
if (createData.vbAgdusId != data.vbAgdusId)
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()
bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -485,16 +485,16 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
getInjuryModelWhCreateRequestData(createData);
if (createData.name() != data.name())
if (createData.name != data.name)
return false;
if (createData.version() != data.version())
if (createData.version != data.version)
return false;
if (createData.description() != data.description())
if (createData.description != data.description)
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()
@@ -502,28 +502,28 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
//-----------------------------------------------------------------------------
bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
EquipmentTypeWh modifyData;
getEqtTypeWhModifyRequestData(modifyData);
if (modifyData.id() != data.id())
if (modifyData.id != data.id)
return false;
if (modifyData.name() != data.name())
if (modifyData.name != data.name)
return false;
if (modifyData.minEquipNo() != data.minEquipNo())
if (modifyData.minEquipNo != data.minEquipNo)
return false;
if (modifyData.maxEquipNo() != data.maxEquipNo())
if (modifyData.maxEquipNo != data.maxEquipNo)
return false;
if (modifyData.vbAgdusId() != data.vbAgdusId())
if (modifyData.vbAgdusId != data.vbAgdusId)
return false;
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id;
return true;
} // end of onCompareModifiedData()
@@ -531,25 +531,25 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
//-----------------------------------------------------------------------------
bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
InjuryModelAgdusWh modifyData;
getInjuryModelWhModifyRequestData(modifyData);
if (modifyData.id() != data.id())
if (modifyData.id != data.id)
return false;
if (modifyData.name() != data.name())
if (modifyData.name != data.name)
return false;
if (modifyData.version() != data.version())
if (modifyData.version != data.version)
return false;
if (modifyData.description() != data.description())
if (modifyData.description != data.description)
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id;
return true;
} // end of onCompareModifiedData()
@@ -577,10 +577,10 @@ void WhgTests::tryModifyInjuryModel()
InjuryModelAgdusWh data;
getInjuryModelWhModifyRequestData(data);
ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id;
if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id;
failExit();
}
} // end of tryModifyInjuryModel()
@@ -591,12 +591,12 @@ void WhgTests::tryRemoveInjuryModel()
m_eTestStep = eRemoveInjuryModel;
Core::RemoveElementRequest data;
data.id(m_injuryModelWhId);
data.id = m_injuryModelWhId;
INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id;
if (!m_ftc->removeInjuryModelAgdusWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id;
failExit();
}
} // end of tryRemoveInjuryModel()