Removes .IDL warnings: multiple enum definitons and builtin-type collisions
This commit is contained in:
135 files changed
+1122
-1122
No files matched your search
+1
-1
@@ -186,7 +186,7 @@ bool MissionPlanHandler::isUasInAutoMode(int participantId)
|
||||
|
||||
DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState().underlying();
|
||||
|
||||
return (uas.uasState() == ProjectDataManagement::UasState::Auto);
|
||||
return (uas.uasState() == ProjectDataManagement::UasState::UasState_Auto);
|
||||
}
|
||||
|
||||
// stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
|
||||
|
||||
+2
-2
@@ -153,7 +153,7 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
|
||||
Database::PpmUas dbUas;
|
||||
|
||||
dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
|
||||
dbUas.uasStateId = ProjectDataManagement::UasState::Undefined;
|
||||
dbUas.uasStateId = ProjectDataManagement::UasState::UasState_Undefined;
|
||||
dbUas.participantId = request.participantId();
|
||||
dbUas.exerciseId = request.exerciseId();
|
||||
dbUas.hostname = QString::fromStdString(request.hostname());
|
||||
@@ -274,7 +274,7 @@ void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnect
|
||||
|
||||
auto uas = m_uass.value(data.id());
|
||||
if (mod == DataModification::eRemoved)
|
||||
uas->setState(ProjectDataManagement::UasState::Undefined);
|
||||
uas->setState(ProjectDataManagement::UasState::UasState_Undefined);
|
||||
else
|
||||
uas->setState(data.uasState());
|
||||
m_mainHandler->exAnyDts()->publish(uas->toDdsUas());
|
||||
|
||||
@@ -115,7 +115,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "ParticipantHandler initialized";
|
||||
m_ddsHandler->pacemaker()->addPort(m_participantHandler->getWebSocketPort(), Core::PortType::WebSocketPositionServer);
|
||||
m_ddsHandler->pacemaker()->addPort(m_participantHandler->getWebSocketPort(), Core::CorePortType::WebSocketPositionServer);
|
||||
|
||||
m_targetInformationHandler = std::make_shared<ParticipantManagement::HandlerTargetInformation>(this);
|
||||
if (!m_targetInformationHandler->init())
|
||||
@@ -168,7 +168,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler initialized";
|
||||
m_ddsHandler->pacemaker()->addPort(m_websocketHandler->webSocketPort(), Core::PortType::WebSocketServer);
|
||||
m_ddsHandler->pacemaker()->addPort(m_websocketHandler->webSocketPort(), Core::CorePortType::WebSocketServer);
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
|
||||
// UasHandler
|
||||
|
||||
Reference in new issue
Block a user