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

Removes .IDL warnings: multiple enum definitons and builtin-type collisions

Browse Source
This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ void EquipmentErrorRegistrationModel::doEventRequests()
{
int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::EventType_def::EquipmentErrorReport});
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::EquipmentErrorReport});
startTime += (24 * 60 * 60 * 1000) + 1;
@@ -133,7 +133,7 @@ void EquipmentErrorRegistrationModel::onRequestedDataAvailable(TimeLineManagemen
void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement::Event &ev)
{
if (ev.eventTypeId() != ProjectDataManagement::EventType_def::EquipmentErrorReport)
if (ev.eventTypeId() != ProjectDataManagement::PdmEventType_def::EquipmentErrorReport)
return;
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
insertRow(event2Entry(ev));
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
+3 -3
View File
@@ -347,9 +347,9 @@ void HgrAndMineSearchModel::doEventRequests()
arr += QJsonValue(it.key());
const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}});
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::EventType_def::Hit,
ProjectDataManagement::EventType_def::HitEffectSimulation,
ProjectDataManagement::EventType_def::HitMine}, filter);
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::Hit,
ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
ProjectDataManagement::PdmEventType_def::HitMine}, filter);
startTime += (24 * 60 * 60 * 1000) + 1;
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
+1 -1
View File
@@ -19,7 +19,7 @@ namespace ServiceMonitor
{
struct HgrAndMineSearchEntry
{
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType::Unknown;
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType_Unknown;
Core::GeoPosition pos;
int64_t timeStamp = -1;
int32_t source = -1;