Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,373 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Template for idl struct definitions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hanna E. Rathje, SLSE, 2015-08-05
|
||||
*/
|
||||
|
||||
|
||||
// filename: pdm.idl
|
||||
#ifndef pdm_idl_included
|
||||
#define pdm_idl_included
|
||||
|
||||
//@copy #include <ProjectDataManagement/pdm_export.h> // #define NDDSUSERDllExport for linux
|
||||
|
||||
//@copy #include "pdm_enums.hpp"
|
||||
#include "pdm_enums.idl"
|
||||
|
||||
|
||||
//@copy #include </workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/DDS/Core/core.hpp>
|
||||
#include </workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/DDS/Core/core.idl>
|
||||
|
||||
|
||||
module ProjectDataManagement
|
||||
{
|
||||
|
||||
|
||||
|
||||
struct PdmBase
|
||||
{
|
||||
long id; //@key
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct PdmBaseName : PdmBase
|
||||
{
|
||||
string name;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct BiteComponentText : PdmBaseName
|
||||
{
|
||||
long canDeviceId;
|
||||
long subDeviceId;
|
||||
long errorNumber;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct BuildingChargeEffect : PdmBase
|
||||
{
|
||||
long chargeTypeId;
|
||||
long destructiveFactor;
|
||||
long penetrationFactor;
|
||||
long hitSound;
|
||||
boolean difcueLight;
|
||||
boolean difcuePyro;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct CanComponentString : PdmBaseName
|
||||
{
|
||||
long long pdm_bitMask;
|
||||
long canDeviceId;
|
||||
long subDeviceId;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct CasEffect
|
||||
{
|
||||
SeverityType severityType;
|
||||
long iedClass;
|
||||
long impactRadius;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct ChargeType : PdmBaseName
|
||||
{
|
||||
string shortName;
|
||||
string predefinedName;
|
||||
string disEntity;
|
||||
string properties;
|
||||
long legacyId;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct ChargeTypeIgniterTypeIgniterFunction : PdmBase
|
||||
{
|
||||
long chargeTypeId;
|
||||
long igniterTypeId;
|
||||
long igniterFunctionId;
|
||||
IgniterFunctionBase igniterFunctionBaseId;
|
||||
string impactArea;
|
||||
long impactRadius;
|
||||
long hazardDistance;
|
||||
long chargeLegacyId;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct ChargeTypeLoadType : PdmBase
|
||||
{
|
||||
long chargeTypeId;
|
||||
long loadTypeId;
|
||||
sequence<long> numbers;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct EquipmentSystemEventFilter : PdmBase
|
||||
{
|
||||
long equipmentFunctionId;
|
||||
long subDeviceId;
|
||||
long deviceSpecificCode;
|
||||
HgrMineSearchFilterType hgrMineSearchFilterType;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct EventFilterHgrMineSearch : PdmBase
|
||||
{
|
||||
long chargeTypeId;
|
||||
HgrMineSearchFilterType hgrMineSearchFilterType;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct FirePurpose : PdmBaseName
|
||||
{
|
||||
string description;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct GearType : PdmBaseName
|
||||
{
|
||||
GearClass gearClassId;
|
||||
long tasCode;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct GearTypeChargeType : PdmBase
|
||||
{
|
||||
long chargeTypeId;
|
||||
long maxRange;
|
||||
long gearTypeId;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct IgniterFunction : PdmBaseName
|
||||
{
|
||||
string shortName;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct IgniterType : PdmBaseName
|
||||
{
|
||||
string shortName;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct InsertUpdateTranslationRequest
|
||||
{
|
||||
string isoCode;
|
||||
string ctx;
|
||||
string key;
|
||||
string disambiguation;
|
||||
string translation;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct LanguageHmi : PdmBaseName
|
||||
{
|
||||
string isoCode;
|
||||
string dbLocale;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct LanguageXdu : PdmBaseName
|
||||
{
|
||||
string isoCode;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct LoadType : PdmBaseName
|
||||
{
|
||||
string shortName;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct NuclearPreset : PdmBaseName
|
||||
{
|
||||
double detonationValue;
|
||||
double impactRadius;
|
||||
double borderLengthInner;
|
||||
double borderLengthOuter;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct RadioGroup : PdmBaseName
|
||||
{
|
||||
boolean base_group;
|
||||
long issi;
|
||||
long group_issi1;
|
||||
long group_issi2;
|
||||
string radioHostname;
|
||||
long radioPort;
|
||||
string radioBackupHostname;
|
||||
long radioBackupPort;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationInjury : PdmBaseName
|
||||
{
|
||||
long kind;
|
||||
long place1;
|
||||
long place2;
|
||||
long vbg;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationInjuryKind : PdmBaseName
|
||||
{
|
||||
string version;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationInjuryPlace1 : PdmBaseName
|
||||
{
|
||||
string version;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationInjuryPlace2 : PdmBaseName
|
||||
{
|
||||
string version;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationMaterial : PdmBaseName
|
||||
{
|
||||
string description;
|
||||
string version;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct SanitationProcedure : PdmBaseName
|
||||
{
|
||||
string type;
|
||||
long pdm_typeId;
|
||||
long minimumQualification;
|
||||
string longName;
|
||||
long long dataCode;
|
||||
string version;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct TargetSubType : PdmBaseName
|
||||
{
|
||||
string abbreviation;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct TargetType : PdmBaseName
|
||||
{
|
||||
string abbreviation;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct TargetTypeTargetSubType : PdmBase
|
||||
{
|
||||
long targetTypeId;
|
||||
long targetSubTypeId;
|
||||
string properties;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct TranslationBlob : PdmBase
|
||||
{
|
||||
sequence<octet> payload;
|
||||
string md5sum;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct UpdateChargeNamesRequest : PdmBaseName
|
||||
{
|
||||
string shortName;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
|
||||
|
||||
struct VulnerabilityKind : PdmBaseName
|
||||
{
|
||||
long playerTypeClassId;
|
||||
long taVulnerabilityKind;
|
||||
VulnerabilityClass vulnerabilityClassId;
|
||||
}; //@Extensibility EXTENSIBLE_EXTENSIBILITY
|
||||
|
||||
|
||||
}; // namespace ProjectDataManagement
|
||||
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user