Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
127 files changed
+2134
No files matched your search
@@ -0,0 +1,33 @@
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
// Generated database header for ProjectDataManagement service
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
#include <QSqlDatabase>
|
||||
#include <QSqlQuery>
|
||||
#include <QSqlError>
|
||||
|
||||
#include "svcpdmcommon_export.h"
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Forward declarations
|
||||
class DbImpl;
|
||||
|
||||
// Minimal database interface stub
|
||||
class PDM_COMMON_EXPORT Db {
|
||||
public:
|
||||
Db();
|
||||
virtual ~Db();
|
||||
|
||||
bool isOpen() const;
|
||||
bool open(const QString& connectionName);
|
||||
void close();
|
||||
|
||||
protected:
|
||||
QSqlDatabase m_database;
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
// Generated database implementation for ProjectDataManagement service
|
||||
#include "pdm_db_impl.h"
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
Db::Db() = default;
|
||||
Db::~Db() = default;
|
||||
|
||||
bool Db::isOpen() const {
|
||||
return m_database.isOpen();
|
||||
}
|
||||
|
||||
bool Db::open(const QString& connectionName) {
|
||||
m_database = QSqlDatabase::database(connectionName);
|
||||
return m_database.open();
|
||||
}
|
||||
|
||||
void Db::close() {
|
||||
m_database.close();
|
||||
}
|
||||
|
||||
DbImpl::DbImpl() = default;
|
||||
DbImpl::~DbImpl() = default;
|
||||
|
||||
bool DbImpl::executeQuery(const QString& query) {
|
||||
Q_UNUSED(query);
|
||||
return true; // Stub implementation
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
@@ -0,0 +1,23 @@
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
// Generated database implementation header for ProjectDataManagement service
|
||||
#pragma once
|
||||
|
||||
#include "pdm_db.h"
|
||||
#include <QMap>
|
||||
#include <QVariant>
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Minimal database implementation stub
|
||||
class DbImpl : public Db {
|
||||
public:
|
||||
DbImpl();
|
||||
~DbImpl() override;
|
||||
|
||||
bool executeQuery(const QString& query);
|
||||
|
||||
private:
|
||||
QSqlQuery m_query;
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
// Generated database structs implementation for ProjectDataManagement service
|
||||
#include "pdm_db_structs.h"
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Minimal stub implementation
|
||||
// No database struct operations needed in stub mode
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
// Generated database structs for ProjectDataManagement service
|
||||
#pragma once
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Minimal stub structs for database operations
|
||||
struct DbStruct {
|
||||
int id = 0;
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
@@ -0,0 +1,17 @@
|
||||
#ifndef PDM_DTC_H
|
||||
#define PDM_DTC_H
|
||||
|
||||
// Stub file for pdm_dtc.h - generated code placeholder
|
||||
// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON
|
||||
// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
namespace Dds {
|
||||
|
||||
// Forward declarations - actual definitions in generated code
|
||||
class Dtc;
|
||||
|
||||
} // namespace Dds
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_DTC_H
|
||||
@@ -0,0 +1,17 @@
|
||||
#ifndef PDM_FTC_H
|
||||
#define PDM_FTC_H
|
||||
|
||||
// Stub file for pdm_ftc.h - generated code placeholder
|
||||
// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON
|
||||
// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
namespace Dds {
|
||||
|
||||
// Forward declarations - actual definitions in generated code
|
||||
class Ftc;
|
||||
|
||||
} // namespace Dds
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_FTC_H
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
// Stub file for pdm_translation.h
|
||||
// This file is used when BUILD_GRANTLEE=OFF to provide basic enum-to-string conversions
|
||||
|
||||
#ifndef PDM_TRANSLATION_H
|
||||
#define PDM_TRANSLATION_H
|
||||
|
||||
#include <QString>
|
||||
#include "pdm_enums.h"
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
#include "svcpdmcommon_export.h"
|
||||
#else
|
||||
#define PDM_COMMON_EXPORT
|
||||
#endif
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
PDM_COMMON_EXPORT QString toQString(IgniterFunctionBase e);
|
||||
PDM_COMMON_EXPORT QString toQString(EventType e);
|
||||
PDM_COMMON_EXPORT QString toQString(VulnerabilityState e);
|
||||
|
||||
inline QString toQString(IgniterFunctionBase e)
|
||||
{
|
||||
switch (e)
|
||||
{
|
||||
case IgniterFunctionBase::IfbDefault: return "IfbDefault";
|
||||
case IgniterFunctionBase::IfbTimer: return "IfbTimer";
|
||||
case IgniterFunctionBase::IfbImpact: return "IfbImpact";
|
||||
case IgniterFunctionBase::IfbDelay: return "IfbDelay";
|
||||
case IgniterFunctionBase::IfbProximity: return "IfbProximity";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline QString toQString(EventType e)
|
||||
{
|
||||
switch (e)
|
||||
{
|
||||
case EventType::Hit: return "Hit";
|
||||
case EventType::WeaponAssignment: return "WeaponAssignment";
|
||||
case EventType::BiteMessage: return "BiteMessage";
|
||||
case EventType::FireEvent: return "FireEvent";
|
||||
case EventType::AreaEnter: return "AreaEnter";
|
||||
case EventType::AreaLeave: return "AreaLeave";
|
||||
case EventType::AreaContaminated: return "AreaContaminated";
|
||||
case EventType::AreaDecontaminated: return "AreaDecontaminated";
|
||||
case EventType::AreaContaminationChanged: return "AreaContaminationChanged";
|
||||
case EventType::AreaVisibilityChanged: return "AreaVisibilityChanged";
|
||||
case EventType::AreaOwnershipChanged: return "AreaOwnershipChanged";
|
||||
case EventType::AreaStatusChanged: return "AreaStatusChanged";
|
||||
case EventType::AreaTypeChanged: return "AreaTypeChanged";
|
||||
case EventType::AreaNameChanged: return "AreaNameChanged";
|
||||
case EventType::AreaDescriptionChanged: return "AreaDescriptionChanged";
|
||||
case EventType::AreaIconChanged: return "AreaIconChanged";
|
||||
case EventType::AreaColorChanged: return "AreaColorChanged";
|
||||
case EventType::AreaShapeChanged: return "AreaShapeChanged";
|
||||
case EventType::AreaSizeChanged: return "AreaSizeChanged";
|
||||
case EventType::AreaPositionChanged: return "AreaPositionChanged";
|
||||
case EventType::AreaRotationChanged: return "AreaRotationChanged";
|
||||
case EventType::AreaAltitudeChanged: return "AreaAltitudeChanged";
|
||||
case EventType::AreaElevationChanged: return "AreaElevationChanged";
|
||||
case EventType::AreaDepthChanged: return "AreaDepthChanged";
|
||||
case EventType::AreaWidthChanged: return "AreaWidthChanged";
|
||||
case EventType::AreaLengthChanged: return "AreaLengthChanged";
|
||||
case EventType::AreaHeightChanged: return "AreaHeightChanged";
|
||||
case EventType::AreaRadiusChanged: return "AreaRadiusChanged";
|
||||
case EventType::AreaPointsChanged: return "AreaPointsChanged";
|
||||
case EventType::AreaVerticesChanged: return "AreaVerticesChanged";
|
||||
case EventType::AreaEdgesChanged: return "AreaEdgesChanged";
|
||||
case EventType::AreaFacesChanged: return "AreaFacesChanged";
|
||||
case EventType::AreaVolumeChanged: return "AreaVolumeChanged";
|
||||
case EventType::AreaMassChanged: return "AreaMassChanged";
|
||||
case EventType::AreaDensityChanged: return "AreaDensityChanged";
|
||||
case EventType::AreaTemperatureChanged: return "AreaTemperatureChanged";
|
||||
case EventType::AreaPressureChanged: return "AreaPressureChanged";
|
||||
case EventType::AreaHumidityChanged: return "AreaHumidityChanged";
|
||||
case EventType::AreaWindSpeedChanged: return "AreaWindSpeedChanged";
|
||||
case EventType::AreaWindDirectionChanged: return "AreaWindDirectionChanged";
|
||||
case EventType::AreaWeatherChanged: return "AreaWeatherChanged";
|
||||
case EventType::AreaLightingChanged: return "AreaLightingChanged";
|
||||
case EventType::AreaSoundChanged: return "AreaSoundChanged";
|
||||
case EventType::AreaSmellChanged: return "AreaSmellChanged";
|
||||
case EventType::AirSupport: return "AirSupport";
|
||||
case EventType::ExplosionCluster: return "ExplosionCluster";
|
||||
case EventType::Jamming: return "Jamming";
|
||||
case EventType::Chaff: return "Chaff";
|
||||
case EventType::Flare: return "Flare";
|
||||
case EventType::Smoke: return "Smoke";
|
||||
case EventType::Laser: return "Laser";
|
||||
case EventType::Infrared: return "Infrared";
|
||||
case EventType::Radar: return "Radar";
|
||||
case EventType::Sonar: return "Sonar";
|
||||
case EventType::Acoustic: return "Acoustic";
|
||||
case EventType::Seismic: return "Seismic";
|
||||
case EventType::Magnetic: return "Magnetic";
|
||||
case EventType::Electric: return "Electric";
|
||||
case EventType::Chemical: return "Chemical";
|
||||
case EventType::Biological: return "Biological";
|
||||
case EventType::Radiological: return "Radiological";
|
||||
case EventType::Nuclear: return "Nuclear";
|
||||
case EventType::Thermal: return "Thermal";
|
||||
case EventType::Optical: return "Optical";
|
||||
case EventType::Visual: return "Visual";
|
||||
case EventType::Audible: return "Audible";
|
||||
case EventType::Tactile: return "Tactile";
|
||||
case EventType::Olfactory: return "Olfactory";
|
||||
case EventType::Gustatory: return "Gustatory";
|
||||
case EventType::Vestibular: return "Vestibular";
|
||||
case EventType::Proprioceptive: return "Proprioceptive";
|
||||
case EventType::Interoceptive: return "Interoceptive";
|
||||
case EventType::Nociceptive: return "Nociceptive";
|
||||
case EventType::Thermoceptive: return "Thermoceptive";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline QString toQString(VulnerabilityState e)
|
||||
{
|
||||
switch (e)
|
||||
{
|
||||
case VulnerabilityState::NoChange: return "NoChange";
|
||||
case VulnerabilityState::CombatReady: return "CombatReady";
|
||||
case VulnerabilityState::LightDamage: return "LightDamage";
|
||||
case VulnerabilityState::MediumDamage: return "MediumDamage";
|
||||
case VulnerabilityState::HeavyDamage: return "HeavyDamage";
|
||||
case VulnerabilityState::MobilityKill: return "MobilityKill";
|
||||
case VulnerabilityState::VisibleMobilityKill: return "VisibleMobilityKill";
|
||||
case VulnerabilityState::WeaponSystemDamage: return "WeaponSystemDamage";
|
||||
case VulnerabilityState::VisibleWeaponSystemDamage: return "VisibleWeaponSystemDamage";
|
||||
case VulnerabilityState::CatastrophicKill: return "CatastrophicKill";
|
||||
case VulnerabilityState::TemporarySeverance: return "TemporarySeverance";
|
||||
case VulnerabilityState::NearMiss: return "NearMiss";
|
||||
case VulnerabilityState::HitWithNoEffect: return "HitWithNoEffect";
|
||||
case VulnerabilityState::VulnerabilityBitsChanged: return "VulnerabilityBitsChanged";
|
||||
case VulnerabilityState::Reserved: return "Reserved";
|
||||
case VulnerabilityState::NContamination: return "NContamination";
|
||||
case VulnerabilityState::BContamination: return "BContamination";
|
||||
case VulnerabilityState::CContamination: return "CContamination";
|
||||
case VulnerabilityState::NotReady: return "NotReady";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_TRANSLATION_H
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
-- all available service idl files
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
|
||||
Reference in new issue
Block a user