Migrates remaining services and plugins to generated rtiddsgen API

Converts accessor calls to plain member access across the residual service set.

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp

@@ -96,8 +96,8 @@ void PdmTests::tryGetAllVulnerabilityKinds()
     m_id = map.firstKey();
     for(auto it = map.begin(); it != map.end(); ++it)
     {
-      const ProjectDataManagement::VulnerabilityClass &vc = it.value().vulnerabilityClassId();
-      INFO_LOG(m_logger) << "VulnerabilityKind(" << it.key() << ") : " << it.value().name()
+      const ProjectDataManagement::VulnerabilityClass &vc = it.value().vulnerabilityClassId;
+      INFO_LOG(m_logger) << "VulnerabilityKind(" << it.key() << ") : " << it.value().name
                          << ", translation " << m_dtc->trVulnerabilityKindName(it.key(), vc);
     }
   }
@@ -111,15 +111,15 @@ void PdmTests::tryGetVulnerabilityKind()
   INFO_LOG(m_logger) << "trying get itemData for Vulnerability kind " << m_id;
   ProjectDataManagement::VulnerabilityKind data = m_dtc->vulnerabilityKind(m_id);
 
-  if (data.taVulnerabilityKind() <= 0)
+  if (data.taVulnerabilityKind <= 0)
   {
     ERROR_LOG(m_logger) << "Error receiving data for id " << m_id;
     failExit();
   }
   else
   {
-    const ProjectDataManagement::VulnerabilityClass &vc = data.vulnerabilityClassId();
-    INFO_LOG(m_logger) << "## VulnerabilityKind: (" << data.taVulnerabilityKind() << "), name: " << data.name()
+    const ProjectDataManagement::VulnerabilityClass &vc = data.vulnerabilityClassId;
+    INFO_LOG(m_logger) << "## VulnerabilityKind: (" << data.taVulnerabilityKind << "), name: " << data.name
                        << ", translation " << m_dtc->trVulnerabilityKindName(m_id, vc);
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
   }
@@ -141,7 +141,7 @@ void PdmTests::tryGetAllBiteComponentTexts()
     INFO_LOG(m_logger) << "Amount of bite component texts = " << map.size();
     m_id = map.firstKey();
     for(auto it = map.begin(); it != map.end(); ++it)
-      INFO_LOG(m_logger) << "BiteComponent(" << it.key() << ") : " << it.value().name()
+      INFO_LOG(m_logger) << "BiteComponent(" << it.key() << ") : " << it.value().name
                          << ", translation " << m_dtc->trBiteComponentTextName(it.key());
   }
 }

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp

@@ -23,26 +23,26 @@ ChargeTypeRename::ChargeTypeRename(const std::shared_ptr<DdsHandler> &dds, const
 
 void ChargeTypeRename::onUpdateChargeNamesRequest(const rti::core::SampleIdentity &cookie, const UpdateChargeNamesRequest &request)
 {
-  Core::FunctionReplyObject fro(request.id());
-  if (request.id() <= 0)
+  Core::FunctionReplyObject fro(request.id);
+  if (request.id <= 0)
   {
-    fro = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Name update on ChargeType, but no Charge Type Id given"));
+    fro = Core::FunctionReplyObject(request.id, tr_lts("dds", "Name update on ChargeType, but no Charge Type Id given"));
     m_dds->fts()->updateChargeNamesReply(cookie, fro);
     return;
   }
   Database::PdmChargeType ct;
-  if (!m_db->selectPdmChargeType(request.id(), ct))
+  if (!m_db->selectPdmChargeType(request.id, ct))
   {
-    fro = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Name update on ChargeType, Charge Type could not be fetched from DB"));
+    fro = Core::FunctionReplyObject(request.id, tr_lts("dds", "Name update on ChargeType, Charge Type could not be fetched from DB"));
     m_dds->fts()->updateChargeNamesReply(cookie, fro);
     return;
   }
-  ct.name = QString::fromStdString(request.name());
-  ct.shortName = QString::fromStdString(request.shortName());
+  ct.name = QString::fromStdString(request.name);
+  ct.shortName = QString::fromStdString(request.shortName);
 
   if (!m_db->update(ct))
   {
-    fro = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Name update on ChargeType, Cannot update DB (select worked before)"));
+    fro = Core::FunctionReplyObject(request.id, tr_lts("dds", "Name update on ChargeType, Cannot update DB (select worked before)"));
     m_dds->fts()->updateChargeNamesReply(cookie, fro);
     return;
   }
@@ -55,12 +55,12 @@ void ChargeTypeRename::onUpdateChargeNamesRequest(const rti::core::SampleIdentit
 void ChargeTypeRename::onUpdateChargeTypeRequest(const rti::core::SampleIdentity &cookie, const ChargeType &request)
 {
   Database::PdmChargeType ct;
-  ct.disEntity = QString::fromStdString(request.disEntity());
-  ct.id = request.id();
-  ct.name = QString::fromStdString(request.name());
-  ct.predefinedName = QString::fromStdString(request.predefinedName());
-  ct.properties = QString::fromStdString(request.properties());
-  ct.shortName = QString::fromStdString(request.shortName());
+  ct.disEntity = QString::fromStdString(request.disEntity);
+  ct.id = request.id;
+  ct.name = QString::fromStdString(request.name);
+  ct.predefinedName = QString::fromStdString(request.predefinedName);
+  ct.properties = QString::fromStdString(request.properties);
+  ct.shortName = QString::fromStdString(request.shortName);
   m_db->update(ct);
   m_dds->fts()->updateChargeTypeReply(cookie, Core::FunctionReplyObject(ct.id));
   m_dds->dts()->publish(request);

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/convert_db_to_dds.h

@@ -18,13 +18,13 @@ namespace Database
 inline BuildingChargeEffect convert(const PdmBuildingChargeEffect &data)
 {
   BuildingChargeEffect ddsData;
-  ddsData.id(data.id);
-  ddsData.chargeTypeId(data.chargeTypeId);
-  ddsData.destructiveFactor(data.destructiveFactor);
-  ddsData.penetrationFactor(data.penetrationFactor);
-  ddsData.hitSound(data.hitSound);
-  ddsData.difcueLight(data.difcueLight);
-  ddsData.difcuePyro(data.difcuePyro);
+  ddsData.id = data.id;
+  ddsData.chargeTypeId = data.chargeTypeId;
+  ddsData.destructiveFactor = data.destructiveFactor;
+  ddsData.penetrationFactor = data.penetrationFactor;
+  ddsData.hitSound = data.hitSound;
+  ddsData.difcueLight = data.difcueLight;
+  ddsData.difcuePyro = data.difcuePyro;
 
   return ddsData;
 }
@@ -32,14 +32,14 @@ inline BuildingChargeEffect convert(const PdmBuildingChargeEffect &data)
 inline ChargeType convert(const PdmChargeType &data)
 {
   ChargeType ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.shortName(data.shortName.toStdString());
-  ddsData.predefinedName(data.predefinedName.toStdString());
-  ddsData.properties(data.properties.toStdString());
-  ddsData.legacyId(data.chargeLegacyId);
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.shortName = data.shortName.toStdString();
+  ddsData.predefinedName = data.predefinedName.toStdString();
+  ddsData.properties = data.properties.toStdString();
+  ddsData.legacyId = data.chargeLegacyId;
   if (!data.disEntity.isEmpty())
-    ddsData.disEntity(data.disEntity.toStdString());
+    ddsData.disEntity = data.disEntity.toStdString();
 
   return ddsData;
 }
@@ -47,24 +47,24 @@ inline ChargeType convert(const PdmChargeType &data)
 inline SanitationMaterial convert(const PdmSanitationMaterial &data)
 {
   SanitationMaterial ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.description(data.description.toStdString());
-  ddsData.version(data.version.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.description = data.description.toStdString();
+  ddsData.version = data.version.toStdString();
   return ddsData;
 }
 
 inline SanitationProcedure convert(const PdmSanitationProcedures &data)
 {
   SanitationProcedure ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.longName(data.longName.toStdString());
-  ddsData.type(data.type.toStdString());
-  ddsData.typeId(data.typeId);
-  ddsData.minimumQualification(data.minimumQualification);
-  ddsData.dataCode(data.dataCode);
-  ddsData.version(data.version.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.longName = data.longName.toStdString();
+  ddsData.type = data.type.toStdString();
+  ddsData.pdm_typeId = data.typeId;
+  ddsData.minimumQualification = data.minimumQualification;
+  ddsData.dataCode = data.dataCode;
+  ddsData.version = data.version.toStdString();
 
   return ddsData;
 }
@@ -72,12 +72,12 @@ inline SanitationProcedure convert(const PdmSanitationProcedures &data)
 inline SanitationInjury convert(const PdmSanitationInjury &data)
 {
   SanitationInjury ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.kind(data.kind);
-  ddsData.place1(data.place1);
-  ddsData.place2(data.place2);
-  ddsData.vbg(data.vbg);
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.kind = data.kind;
+  ddsData.place1 = data.place1;
+  ddsData.place2 = data.place2;
+  ddsData.vbg = data.vbg;
 
   return ddsData;
 }
@@ -85,27 +85,27 @@ inline SanitationInjury convert(const PdmSanitationInjury &data)
 inline SanitationInjuryKind convert(const PdmSanitationInjuryKind &data)
 {
   SanitationInjuryKind ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.version(data.version.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.version = data.version.toStdString();
   return ddsData;
 }
 
 inline SanitationInjuryPlace1 convert(const PdmSanitationInjuryPlace1 &data)
 {
   SanitationInjuryPlace1 ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.version(data.version.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.version = data.version.toStdString();
   return ddsData;
 }
 
 inline SanitationInjuryPlace2 convert(const PdmSanitationInjuryPlace2 &data)
 {
   SanitationInjuryPlace2 ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.version(data.version.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.version = data.version.toStdString();
   return ddsData;
 }
 
@@ -113,11 +113,11 @@ inline SanitationInjuryPlace2 convert(const PdmSanitationInjuryPlace2 &data)
 inline GearTypeChargeType convert(const PdmGearTypeChargeType &data)
 {
   GearTypeChargeType ddsData;
-  ddsData.id(data.id);
-  ddsData.gearTypeId(data.gearTypeId);
-  ddsData.chargeTypeId(data.chargeTypeId);
-  ddsData.maxRange(data.maxRange);
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.gearTypeId = data.gearTypeId;
+  ddsData.chargeTypeId = data.chargeTypeId;
+  ddsData.maxRange = data.maxRange;
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -125,11 +125,11 @@ inline GearTypeChargeType convert(const PdmGearTypeChargeType &data)
 inline GearType convert(const PdmGearType &data)
 {
   GearType ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.gearClassId(data.gearClassId);
-  ddsData.tasCode(data.tasCode);
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.gearClassId = data.gearClassId;
+  ddsData.tasCode = data.tasCode;
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -137,10 +137,10 @@ inline GearType convert(const PdmGearType &data)
 inline IgniterType convert(const PdmIgniterType &data)
 {
   IgniterType ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.shortName(data.shortName.toStdString());
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.shortName = data.shortName.toStdString();
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -148,10 +148,10 @@ inline IgniterType convert(const PdmIgniterType &data)
 inline IgniterFunction convert(const PdmIgniterFunction &data)
 {
   IgniterFunction ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.shortName(data.shortName.toStdString());
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.shortName = data.shortName.toStdString();
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -159,10 +159,10 @@ inline IgniterFunction convert(const PdmIgniterFunction &data)
 inline LoadType convert(const PdmLoadType &data)
 {
   LoadType ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.shortName(data.shortName.toStdString());
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.shortName = data.shortName.toStdString();
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -170,16 +170,16 @@ inline LoadType convert(const PdmLoadType &data)
 inline ChargeTypeIgniterTypeIgniterFunction convert(const PdmChargeTypeIgniterTypeIgniterFunction &data)
 {
   ChargeTypeIgniterTypeIgniterFunction ddsData;
-  ddsData.id(data.id);
-  ddsData.chargeTypeId(data.chargeTypeId);
-  ddsData.igniterTypeId(data.igniterTypeId);
-  ddsData.igniterFunctionId(data.igniterFunctionId);
-  ddsData.igniterFunctionBaseId(data.igniterFunctionBaseId);
-  ddsData.impactArea(data.impactArea.toStdString());
-  ddsData.impactRadius(data.impactRadius);
-  ddsData.hazardDistance(data.hazardDistance);
-  ddsData.chargeLegacyId(data.chargeLegacyId);
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.chargeTypeId = data.chargeTypeId;
+  ddsData.igniterTypeId = data.igniterTypeId;
+  ddsData.igniterFunctionId = data.igniterFunctionId;
+  ddsData.igniterFunctionBaseId = data.igniterFunctionBaseId;
+  ddsData.impactArea = data.impactArea.toStdString();
+  ddsData.impactRadius = data.impactRadius;
+  ddsData.hazardDistance = data.hazardDistance;
+  ddsData.chargeLegacyId = data.chargeLegacyId;
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -187,11 +187,11 @@ inline ChargeTypeIgniterTypeIgniterFunction convert(const PdmChargeTypeIgniterTy
 inline ChargeTypeLoadType convert(const PdmChargeTypeLoadType &data)
 {
   ChargeTypeLoadType ddsData;
-  ddsData.id(data.id);
-  ddsData.chargeTypeId(data.chargeTypeId);
-  ddsData.loadTypeId(data.loadTypeId);
-  ddsData.numbers(data.numbers());
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.chargeTypeId = data.chargeTypeId;
+  ddsData.loadTypeId = data.loadTypeId;
+  ddsData.numbers = data.numbers();
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -199,10 +199,10 @@ inline ChargeTypeLoadType convert(const PdmChargeTypeLoadType &data)
 inline LanguageHmi convert(const PdmLanguage &data)
 {
   LanguageHmi ddsData;
-  ddsData.id(data.id);
-  ddsData.dbLocale(data.dbLocale.toStdString());
-  ddsData.name(data.name.toStdString());
-  ddsData.isoCode(data.isoCode.toStdString());
+  ddsData.id = data.id;
+  ddsData.dbLocale = data.dbLocale.toStdString();
+  ddsData.name = data.name.toStdString();
+  ddsData.isoCode = data.isoCode.toStdString();
 
   return ddsData;
 }
@@ -210,9 +210,9 @@ inline LanguageHmi convert(const PdmLanguage &data)
 inline LanguageXdu convert(const PdmLanguageXdu &data)
 {
   LanguageXdu ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.isoCode(data.isoCode.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.isoCode = data.isoCode.toStdString();
 
   return ddsData;
 }
@@ -220,16 +220,16 @@ inline LanguageXdu convert(const PdmLanguageXdu &data)
 inline RadioGroup convert(const PdmRadioGroup &data)
 {
   RadioGroup ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.issi(data.issi);
-  ddsData.group_issi1(data.groupIssi1);
-  ddsData.group_issi2(data.groupIssi2);
-  ddsData.base_group(data.baseGroup);
-  ddsData.radioHostname(data.radioHostname.toStdString());
-  ddsData.radioPort(data.radioPort);
-  ddsData.radioBackupHostname(data.radioBackupHostname.toStdString());
-  ddsData.radioBackupPort(data.radioBackupPort);
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.issi = data.issi;
+  ddsData.group_issi1 = data.groupIssi1;
+  ddsData.group_issi2 = data.groupIssi2;
+  ddsData.base_group = data.baseGroup;
+  ddsData.radioHostname = data.radioHostname.toStdString();
+  ddsData.radioPort = data.radioPort;
+  ddsData.radioBackupHostname = data.radioBackupHostname.toStdString();
+  ddsData.radioBackupPort = data.radioBackupPort;
 
   return ddsData;
 }
@@ -237,11 +237,11 @@ inline RadioGroup convert(const PdmRadioGroup &data)
 inline VulnerabilityKind convert(const PdmVulnerabilityKind &data)
 {
   VulnerabilityKind ddsData;
-  ddsData.id(data.taVulnerabilityKind); // in db there is no id anymore, IO 2021-03-10
-  ddsData.playerTypeClassId(data.playerTypeClassId);
-  ddsData.taVulnerabilityKind(data.taVulnerabilityKind);
-  ddsData.vulnerabilityClassId(data.vulnerabilityClassId);
-  ddsData.name(data.name.toStdString());
+  ddsData.id = data.taVulnerabilityKind; // in db there is no id anymore, IO 2021-03-10
+  ddsData.playerTypeClassId = data.playerTypeClassId;
+  ddsData.taVulnerabilityKind = data.taVulnerabilityKind;
+  ddsData.vulnerabilityClassId = data.vulnerabilityClassId;
+  ddsData.name = data.name.toStdString();
 
   return ddsData;
 }
@@ -249,10 +249,10 @@ inline VulnerabilityKind convert(const PdmVulnerabilityKind &data)
 inline FirePurpose convert(const PdmFirePurpose &data)
 {
   FirePurpose ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.description(data.description.toStdString());
-  ddsData.properties(data.properties.toStdString());
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.description = data.description.toStdString();
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
@@ -260,12 +260,12 @@ inline FirePurpose convert(const PdmFirePurpose &data)
 inline NuclearPreset convert(const PdmNuclearPreset &data)
 {
   NuclearPreset ddsData;
-  ddsData.id(data.id);
-  ddsData.name(data.name.toStdString());
-  ddsData.detonationValue(data.detonationValue);
-  ddsData.impactRadius(data.impactRadius);
-  ddsData.borderLengthInner(data.borderLengthInner);
-  ddsData.borderLengthOuter(data.borderLengthOuter);
+  ddsData.id = data.id;
+  ddsData.name = data.name.toStdString();
+  ddsData.detonationValue = data.detonationValue;
+  ddsData.impactRadius = data.impactRadius;
+  ddsData.borderLengthInner = data.borderLengthInner;
+  ddsData.borderLengthOuter = data.borderLengthOuter;
 
   return ddsData;
 }
@@ -273,11 +273,11 @@ inline NuclearPreset convert(const PdmNuclearPreset &data)
 inline CanComponentString convert(const PdmCanComponentString &data)
 {
   CanComponentString ddsData;
-  ddsData.id(data.id);
-  ddsData.bitMask(data.bitMask);
-  ddsData.canDeviceId(data.canDeviceId);
-  ddsData.subDeviceId(data.subDeviceId);
-  ddsData.name(data.name.toStdString());
+  ddsData.id = data.id;
+  ddsData.pdm_bitMask = data.bitMask;
+  ddsData.canDeviceId = data.canDeviceId;
+  ddsData.subDeviceId = data.subDeviceId;
+  ddsData.name = data.name.toStdString();
 
   return ddsData;
 }
@@ -285,11 +285,11 @@ inline CanComponentString convert(const PdmCanComponentString &data)
 inline BiteComponentText convert(const PdmBiteComponentText &data)
 {
   BiteComponentText ddsData;
-  ddsData.id(data.id);
-  ddsData.canDeviceId(data.canDeviceId);
-  ddsData.subDeviceId(data.subDeviceId);
-  ddsData.errorNumber(data.errorNumber);
-  ddsData.name(data.name.toStdString());
+  ddsData.id = data.id;
+  ddsData.canDeviceId = data.canDeviceId;
+  ddsData.subDeviceId = data.subDeviceId;
+  ddsData.errorNumber = data.errorNumber;
+  ddsData.name = data.name.toStdString();
 
   return ddsData;
 }
@@ -297,10 +297,10 @@ inline BiteComponentText convert(const PdmBiteComponentText &data)
 inline EquipmentSystemEventFilter convert(const PdmEquipmentSystemEventFilter &data)
 {
   EquipmentSystemEventFilter ddsData;
-  ddsData.id(data.id);
-  ddsData.equipmentFunctionId(data.equipmentFunctionalId);
-  ddsData.subDeviceId(data.subDeviceId);
-  ddsData.deviceSpecificCode(data.deviceSpecificCode);
+  ddsData.id = data.id;
+  ddsData.equipmentFunctionId = data.equipmentFunctionalId;
+  ddsData.subDeviceId = data.subDeviceId;
+  ddsData.deviceSpecificCode = data.deviceSpecificCode;
 
   return ddsData;
 }
@@ -308,9 +308,9 @@ inline EquipmentSystemEventFilter convert(const PdmEquipmentSystemEventFilter &d
 inline EventFilterHgrMineSearch convert(const PdmEventFilterHgrMineSearch &data)
 {
   EventFilterHgrMineSearch ddsData;
-  ddsData.id(data.id);
-  ddsData.chargeTypeId(data.chargeTypeId);
-  ddsData.hgrMineSearchFilterType(data.hgrMineSearchFilterTypeId);
+  ddsData.id = data.id;
+  ddsData.chargeTypeId = data.chargeTypeId;
+  ddsData.hgrMineSearchFilterType = data.hgrMineSearchFilterTypeId;
 
   return ddsData;
 }
@@ -319,10 +319,10 @@ inline TargetType convert(const PdmTargetType &data)
  {
    TargetType ddsData;
 
-   ddsData.id(data.id);
-   ddsData.name(data.name.toStdString());
-   ddsData.abbreviation(data.abbreviation.toStdString());
-   ddsData.properties(data.properties.toStdString());
+   ddsData.id = data.id;
+   ddsData.name = data.name.toStdString();
+   ddsData.abbreviation = data.abbreviation.toStdString();
+   ddsData.properties = data.properties.toStdString();
 
    return ddsData;
  }
@@ -331,10 +331,10 @@ inline TargetSubType convert(const PdmTargetSubType &data)
  {
    TargetSubType ddsData;
 
-   ddsData.id(data.id);
-   ddsData.name(data.name.toStdString());
-   ddsData.abbreviation(data.abbreviation.toStdString());
-   ddsData.properties(data.properties.toStdString());
+   ddsData.id = data.id;
+   ddsData.name = data.name.toStdString();
+   ddsData.abbreviation = data.abbreviation.toStdString();
+   ddsData.properties = data.properties.toStdString();
 
    return ddsData;
  }
@@ -342,10 +342,10 @@ inline TargetTypeTargetSubType convert(const PdmTargetTypeTargetSubType &data)
  {
    TargetTypeTargetSubType ddsData;
 
-   ddsData.id(data.id);
-   ddsData.targetTypeId(data.targetTypeId);
-   ddsData.targetSubTypeId(data.targetSubtypeId);
-   ddsData.properties(data.properties.toStdString());
+   ddsData.id = data.id;
+   ddsData.targetTypeId = data.targetTypeId;
+   ddsData.targetSubTypeId = data.targetSubtypeId;
+   ddsData.properties = data.properties.toStdString();
 
    return ddsData;
  }

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp

@@ -65,7 +65,7 @@ void DtcImplCustom::fillChargeTypeIgniterTypeIgniterFunctionProps()
     props.chargeTypeId = ctitif.chargeTypeId;
     props.igniterTypeId = ctitif.igniterTypeId;
     props.igniterFunctionId = ctitif.igniterFunctionId;
-    props.igniterFunctionBase = ctitif.igniterFunctionBase;
+    props.igniterFunctionBase = ctitif.igniterFunctionBaseId;
     props.impactRadius = ctitif.impactRadius;
     props.hazardDistance = ctitif.hazardDistance;
     props.chargeLegacyId = ctitif.chargeLegacyId;
@@ -210,16 +210,16 @@ void DtcImplCustom::mergeProperties(QHash<int, ChargeTypeIgniterTypeIgniterFunct
 
 void DtcImplCustom::onChargeTypeChanged(const ChargeType &ct)
 {
-  if (ct.id() <= 0)
+  if (ct.id <= 0)
     return;
 
   QHash<int, ChargeTypeIgniterTypeIgniterFunctionProps>::iterator it;
   for (it = m_ctItIfProps.begin(); it != m_ctItIfProps.end(); ++it)
   {
-    if (it->chargeTypeId != ct.id())
+    if (it->chargeTypeId != ct.id)
       continue;
 
-    QJsonObject ctProps = propertiesToJson(ct.properties());
+    QJsonObject ctProps = propertiesToJson(ct.properties);
     QJsonObject itProps = propertiesToJson(igniterType(it->igniterTypeId).properties);
     QJsonObject ifProps = propertiesToJson(igniterFunction(it->igniterFunctionId).properties);
     QJsonObject ctitifProps = propertiesToJson(chargeTypeIgniterTypeIgniterFunction(it.key()).properties);
@@ -242,7 +242,7 @@ void DtcImplCustom::onChargeTypeIgniterTypeIgniterFunctionChanged(const ChargeTy
     it->chargeTypeId = ctitif.chargeTypeId;
     it->igniterTypeId = ctitif.igniterTypeId;
     it->igniterFunctionId = ctitif.igniterFunctionId;
-    it->igniterFunctionBase = ctitif.igniterFunctionBase;
+    it->igniterFunctionBase = ctitif.igniterFunctionBaseId;
     it->impactRadius = ctitif.impactRadius;
     it->hazardDistance = ctitif.hazardDistance;
     it->chargeLegacyId = ctitif.chargeLegacyId;
@@ -257,9 +257,9 @@ void DtcImplCustom::onChargeTypeIgniterTypeIgniterFunctionChanged(const ChargeTy
   }
 }
 
-QVector<ProjectDataManagement::ChargeTypeData> DtcImplCustom::chargesForGearClass(GearClass gearClass)
+QVector<ProjectDataManagement::ChargeType> DtcImplCustom::chargesForGearClass(GearClass gearClass)
 {
-  QVector<ProjectDataManagement::ChargeTypeData> ret;
+  QVector<ProjectDataManagement::ChargeType> ret;
 
   if (!isGearTypeEnabled())
   {
@@ -277,9 +277,9 @@ QVector<ProjectDataManagement::ChargeTypeData> DtcImplCustom::chargesForGearClas
   const auto gearTypesList = gearTypes();
   for (const auto &gearType : gearTypesList)
   {
-    if (gearType.gearClassId() != gearClass.id())
+    if (gearType.gearClassId != gearClass)
       continue;
-    const int gearTypeId = gearType.id();
+    const int gearTypeId = gearType.id;
     for (auto gIt = gear2ChargeMap.begin(); gIt != gear2ChargeMap.end(); ++gIt)
     {
       if (gIt->gearTypeId == gearTypeId)
@@ -395,10 +395,10 @@ int DtcImplCustom::getTargetTypeIdFromAdlerTargetType(const QString &typ)
 
   for (const auto &targetType : targetTypeMap)
   {
-    if (adlerTargetTypeName(targetType) != typ)
+    if (adlerTargetTypeName(targetType.id) != typ)
       continue;
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " - adlerTargetTypeName: " << typ << ", targetTypeId:" << targetType;
-    return targetType;
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " - adlerTargetTypeName: " << typ << ", targetTypeId:" << targetType.id;
+    return targetType.id;
   }
 
   return 0;
@@ -419,10 +419,10 @@ int DtcImplCustom::getTargetSubTypeIdFromAdlerTargetSubType(const QString &subTy
 
   for (const auto &targetSubType : targetSubTypeMap)
   {
-    if (adlerTargetSubTypeName(targetSubType.targetSubTypeId) != subTyp)
+    if (adlerTargetSubTypeName(targetSubType.id) != subTyp)
       continue;
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " - adlerTargetSubTypName: " << subTyp << ", targetSubTypeId:" << targetSubType.targetSubTypeId;
-    return targetSubType.targetSubTypeId;
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " - adlerTargetSubTypName: " << subTyp << ", targetSubTypeId:" << targetSubType.id;
+    return targetSubType.id;
   }
 
   return 0;
@@ -444,10 +444,10 @@ int DtcImplCustom::getChargeTypeIdFromAdlerCharges(const QString &geschosssorte)
 
   for (const auto &charge : chargeMap)
   {
-    if (adlerChargeTypeName(charge.chargeTypeId) != geschosssorte)
+    if (adlerChargeTypeName(charge.id) != geschosssorte)
       continue;
-    INFO_LOG(m_logger) << "---- geschosssorte: " << geschosssorte << ", chargeTypeId:" << charge.chargeTypeId;
-    return charge.chargeTypeId;
+    INFO_LOG(m_logger) << "---- geschosssorte: " << geschosssorte << ", chargeTypeId:" << charge.id;
+    return charge.id;
   }
 
   return 0;
@@ -795,9 +795,9 @@ GearClass DtcImplCustom::gearClassFromChargeTypeId(int chargeTypeId)
       const auto &gearType = gearTypesMap.value(gearType2ChargeType.gearTypeId);
 
       // update cache:
-      s_gearClassChargeTypeCache[requestedCTID] = gearType.gearClassId();
+      s_gearClassChargeTypeCache[requestedCTID] = gearType.gearClassId;
 
-      return gearType.gearClassId();
+      return gearType.gearClassId;
     }
   }
 
@@ -952,7 +952,7 @@ QStringList DtcImplCustom::sanitationProceduresList(qint64 procedures)
       return ret << tr("DCU Connected");
     ret.reserve(proc.size());
     for (const auto &s : proc)
-      ret << trSanitationProcedureName(s.name);
+      ret << ProjectDataManagement::trSanitationProcedureName(s.name);
   }
   return ret;
 }
@@ -969,9 +969,9 @@ int DtcImplCustom::chargeTypeIdFromLegacyId(GearClass gearClass, int legacyId)
   for (const auto &charge : chargeMap)
   {
     // igniterType/igniterFunction default 0
-    auto chargeIgniterFunction = getChargeTypeIgniterTypeIgniterFunction(charge.chargeTypeId, 0, 0);
+    auto chargeIgniterFunction = getChargeTypeIgniterTypeIgniterFunction(charge.id, 0, 0);
     if (chargeIgniterFunction.chargeLegacyId == legacyId)
-      return charge.chargeTypeId;
+      return charge.id;
   }
 
   return 0;
@@ -991,7 +991,7 @@ bool DtcImplCustom::isRocket(int chargeTypeId)
 {
   const GearClass gearClass = gearClassFromChargeTypeId(chargeTypeId);
 
-  return gearClass.underlying() == GearClass::GearClass_Rocket;
+  return gearClass == GearClass::GearClass_Rocket;
 }
 
 ChargeTypeIgniterTypeIgniterFunction DtcImplCustom::getChargeTypeIgniterTypeIgniterFunction(int chargeTypeId, int igniterTypeId, int igniterFunctionId)
@@ -1283,7 +1283,7 @@ QString DtcImplCustom::trRadioGroupName(int radioGroupId) { return translate(&Dt
 QString DtcImplCustom::trVulnerabilityKindName(int vulnerabilityKindId, VulnerabilityClass vulnerabilityClassId)
 {
   ProjectDataManagement::VulnerabilityKind vk = DtcImpl::vulnerabilityKind(vulnerabilityKindId);
-  if (vk.vulnerabilityClassId() == vulnerabilityClassId)
+  if (vk.vulnerabilityClassId == vulnerabilityClassId)
     return translate(&DtcImpl::vulnerabilityKind, &ProjectDataManagement::trVulnerabilityKindName, vulnerabilityKindId);
   else
   {
@@ -1317,9 +1317,18 @@ QString DtcImplCustom::trSanitationInjuryPlace2Name(int sanitationInjuryPlace2Id
   return translate(&DtcImpl::sanitationInjuryPlace2, &ProjectDataManagement::trSanitationInjuryPlace2Name, sanitationInjuryPlace2Id);
 }
 
-QJsonObject DtcImplCustom::propertiesToJson(const QJsonObject &properties)
+QJsonObject DtcImplCustom::propertiesToJson(const std::string &properties)
 {
-  return properties;
+  QJsonParseError parserError;
+  const QByteArray props(QByteArray::fromRawData(properties.c_str(), properties.size()));
+  const QJsonDocument doc(QJsonDocument::fromJson(props, &parserError));
+  if (parserError.error != QJsonParseError::NoError)
+  {
+    ERROR_LOG(m_logger) << "Cannot parse properties: no valid json:" << properties;
+    return {};
+  }
+
+  return doc.object();
 }
 
 void DtcImplCustom::setProps(ChargeTypeIgniterTypeIgniterFunctionProps &props, QJsonObject obj)
@@ -1328,10 +1337,10 @@ void DtcImplCustom::setProps(ChargeTypeIgniterTypeIgniterFunctionProps &props, Q
   const int tmp = obj.value(QStringLiteral("volatilityTypeId")).toInt(0);
   switch (tmp)
   {
-    case VolatilityType_def::Floating:
+    case static_cast<int>(VolatilityType::Floating):
       props.volatilityTypeId = VolatilityType::Floating;
       break;
-    case VolatilityType_def::Resident:
+    case static_cast<int>(VolatilityType::Resident):
       props.volatilityTypeId = VolatilityType::Resident;
       break;
     default:
@@ -1378,12 +1387,12 @@ void DtcImplCustom::setProps(ChargeTypeIgniterTypeIgniterFunctionProps &props, Q
   {
     QJsonObject objFt = it->toObject();
     CasEffect ce;
-    ce.severityType(static_cast<SeverityType::inner_enum>(objFt.value(QStringLiteral("severityType")).toInt()));
-    ce.iedClass(objFt.value(QStringLiteral("iedClass")).toInt());
-    ce.impactRadius(objFt.value(QStringLiteral("impactRadius")).toInt());
+    ce.severityType = static_cast<SeverityType>(objFt.value(QStringLiteral("severityType")).toInt());
+    ce.iedClass = objFt.value(QStringLiteral("iedClass")).toInt();
+    ce.impactRadius = objFt.value(QStringLiteral("impactRadius")).toInt();
     props.casEffects.append(ce);
   }
-  std::sort(props.casEffects.begin(), props.casEffects.end(), [](const CasEffect &a, const CasEffect &b) { return a.severityType < b.severityType; });
+  std::sort(props.casEffects.begin(), props.casEffects.end(), [](const CasEffect &a, const CasEffect &b) { return static_cast<int>(a.severityType) < static_cast<int>(b.severityType); });
 
   // Caution: Negate as suppressVisibility is negation of isVisible!
   props.isVisible = !obj.value(QStringLiteral("suppressVisibility")).toBool(false);
@@ -1486,14 +1495,14 @@ DtcImplCustom::GearTypeProps DtcImplCustom::gearTypeProps(int gearTypeId)
 
 void DtcImplCustom::onGearTypeChargeTypeChanged(const GearTypeChargeType &gtct)
 {
-  if (gtct.id() <= 0)
+  if (gtct.id <= 0)
     return;
   QJsonParseError parserError;
-  const QByteArray props(QByteArray::fromRawData(gtct.properties().c_str(), gtct.properties().size()));
+  const QByteArray props(QByteArray::fromRawData(gtct.properties.c_str(), gtct.properties.size()));
   const QJsonDocument doc(QJsonDocument::fromJson(props, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    m_gtctProps.remove(gtct.id());
+    m_gtctProps.remove(gtct.id);
     return;
   }
 
@@ -1503,7 +1512,7 @@ void DtcImplCustom::onGearTypeChargeTypeChanged(const GearTypeChargeType &gtct)
   gtctp.factoryDefault = obj.value(QStringLiteral("factoryDefault")).toInt(0);
   gtctp.maxCharge = obj.value(QStringLiteral("maxCharge")).toInt(0);
 
-  m_gtctProps.insert(gtct.id(), gtctp);
+  m_gtctProps.insert(gtct.id, gtctp);
 }
 
 DtcImplCustom::GearTypeChargeTypeProps DtcImplCustom::gearTypeChargeTypeProps(int gearTypeChargeTypeId)
@@ -1592,7 +1601,7 @@ double DtcImplCustom::getLethalRadius(int chargeTypeId, int igniterTypeId, int i
   const auto &vec = casEffects(chargeTypeId, igniterTypeId, igniterFunctionId);
   for (const ProjectDataManagement::CasEffect &casEffect : vec)
   {
-    if (casEffect.severityType == SeverityType_def::lethal)
+    if (casEffect.severityType == SeverityType::lethal)
       return casEffect.impactRadius;
   }
   return 0.0;
@@ -1603,7 +1612,7 @@ double DtcImplCustom::getNonLethalRadius(int chargeTypeId, int igniterTypeId, in
   const auto &vec = casEffects(chargeTypeId, igniterTypeId, igniterFunctionId);
   for (const ProjectDataManagement::CasEffect &casEffect : vec)
   {
-    if (casEffect.severityType == SeverityType_def::medium)
+    if (casEffect.severityType == SeverityType::medium)
       return casEffect.impactRadius;
   }
   return 0.0;
@@ -1709,7 +1718,6 @@ QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId)
   }
   return {};
 }
-}
 
 int DtcImplCustom::getAmountFireMarkers(int firePurposeId)
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h

@@ -54,7 +54,7 @@ class DtcImplCustom final : public Interface::DtcImpl
 
   // custom procs, body must be implemented by user
   // Might need a "baseChargesForGearClass" later on...
-  QVector<ProjectDataManagement::ChargeTypeData> chargesForGearClass(GearClass gearClass) override;
+  QVector<ProjectDataManagement::ChargeType> chargesForGearClass(GearClass gearClass) override;
   QVector<ProjectDataManagement::IgniterType> ignitersForChargeType(int chargeTypeId) override;
   QVector<ProjectDataManagement::ChargeTypeIgniterTypeIgniterFunction> igniterFunctionsForChargeTypeIgniterType(int chargeTypeId, int igniterTypeId) override;
   QVector<ProjectDataManagement::LoadType> loadsForChargeType(int chargeTypeId) override;
@@ -252,7 +252,6 @@ class DtcImplCustom final : public Interface::DtcImpl
 
   ChargeTypeIgniterTypeIgniterFunctionProps chargeTypeIgniterTypeIgniterFunctionProps(int chargeTypeId, int igniterTypeId, int igniterFunctionId);
   DtcImplCustom::ChargeTypeLoadTypeProps chargeTypeLoadTypeProps(int chargeTypeId, int loadTypeId);
-  ChargeTypeIgniterTypeIgniterFunction chargeTypeIgniterTypeIgniterFunction(int id) const;
 
   QString suffix(int chargeTypeId, bool omitBaseSuffix = false);
   static QString offsetName(UleisClassOffset o);
@@ -266,21 +265,13 @@ class DtcImplCustom final : public Interface::DtcImpl
   void setProps(ChargeTypeIgniterTypeIgniterFunctionProps &props, QJsonObject obj);
   void setProps(ChargeTypeLoadTypeProps &props, QJsonObject obj);
 
-  QJsonObject propertiesToJson(const QJsonObject &properties);
+  QJsonObject propertiesToJson(const std::string &properties);
   void mergeProperties(QHash<int, ChargeTypeIgniterTypeIgniterFunctionProps>::iterator &it,
                        const QJsonObject &ifProps,
                        const QJsonObject &ctProps,
                        const QJsonObject &ctitifProps,
                        const QJsonObject &itProps);
 
-  // enable* methods
-  void enableIgniterType(bool enable) override;
-  void enableChargeTypeIgniterTypeIgniterFunction(bool enable) override;
-  void enableIgniterFunction(bool enable) override;
-  void enableLoadType(bool enable) override;
-  void enableChargeTypeLoadType(bool enable) override;
-  void enableTargetType(bool enable) override;
-
   private:
   QHash<int, ChargeTypeIgniterTypeIgniterFunctionProps> m_ctItIfProps;
   QHash<int, ChargeTypeLoadTypeProps> m_ctLtProps;

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp

@@ -65,7 +65,7 @@ void Translation::publishData()
     arr += obj;
 
   const QJsonObject jObj{ {QStringLiteral("translations"), arr} };
-  const QByteArray data = QJsonDocument(jObj).toBinaryData();
+  const QByteArray data = QJsonDocument(jObj).toJson(QJsonDocument::Compact);
   const QByteArray compressed = qCompress(data, 9);
   const QByteArray md5Sum = QCryptographicHash::hash(compressed, QCryptographicHash::Md5).toHex();
 
@@ -95,11 +95,11 @@ void Translation::onInsertUpdateTranslationRequest(const rti::core::SampleIdenti
                                                    const InsertUpdateTranslationRequest &request)
 {
   Database::PdmTranslation te;
-  te.isoCode = QString::fromStdString(request.isoCode());
-  te.context = QString::fromStdString(request.ctx());
-  te.key = QString::fromStdString(request.key());
-  te.disambiguation = QString::fromStdString(request.disambiguation());
-  te.translation = QString::fromStdString(request.translation());
+  te.isoCode = QString::fromStdString(request.isoCode);
+  te.context = QString::fromStdString(request.ctx);
+  te.key = QString::fromStdString(request.key);
+  te.disambiguation = QString::fromStdString(request.disambiguation);
+  te.translation = QString::fromStdString(request.translation);
 
   // not fast but also not really needed ...
   te.id = -1;