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/Services/ExerciseEventManagement/web_socket_avs.cpp
+17 -17
View File
@@ -21,24 +21,24 @@
#include <ngldb/nsqlquery.h>
ProjectDataManagement::EventType avsEventTypeToPdmEventType(int avsEventType)
ProjectDataManagement::PdmEventType avsEventTypeToPdmEventType(int avsEventType)
{
ProjectDataManagement::EventType eventType;
ProjectDataManagement::PdmEventType eventType;
switch(avsEventType)
{
case 305: //MVS
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::EventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::EventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::EventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
break;
default:
eventType = ProjectDataManagement::EventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::Unknown;
break;
}
return eventType;
@@ -113,21 +113,21 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
data.streamName = obj[QStringLiteral("streamName")].toString();
int avsEventType = obj[QStringLiteral("eventType")].toInt();
ProjectDataManagement::EventType eventType;
ProjectDataManagement::PdmEventType eventType;
switch(avsEventType)
{
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::EventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::EventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::EventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
break;
default:
eventType = ProjectDataManagement::EventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::Unknown;
ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
break;
}
@@ -216,7 +216,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
return;
}
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::EventType::RadioCnr))
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::RadioCnr))
{
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr";
return;
@@ -501,7 +501,7 @@ void WebSocketAvs::onCleanUpDbInternal()
if (!collection.contains(eItem.eventTime))
{
AvsData add = eItem;
bool checkMsi = eItem.eventType == ProjectDataManagement::EventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
int mountingPointId = 0;
if (checkMsi && m_avmDtc->mountingPointForStreamName(eItem.streamName, mountingPointId))
@@ -520,7 +520,7 @@ void WebSocketAvs::onCleanUpDbInternal()
}
for ( auto item : list)
{
bool checkMsi = eItem.eventType == ProjectDataManagement::EventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
if (item.endTime == eItem.endTime )
{
@@ -672,9 +672,9 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
QVector<Database::EemEvent> dataVec;
//qCritical() << "START reading internal db ";
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::RadioTvc);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioTvc);
// m_dbHandler->db()->select(dataVec);
//qCritical() << "END select reading internal db ";