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
@@ -66,7 +66,7 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
|
||||
ev.equipmentNumber(evDb.equipmentNumber);
|
||||
ev.properties(evDb.properties.toUtf8().data());
|
||||
|
||||
if ( ev.eventTypeId() == ProjectDataManagement::EventType_def::HitBuilding)
|
||||
if ( ev.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitBuilding)
|
||||
{
|
||||
QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties()).toUtf8()).object();
|
||||
|
||||
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
|
||||
{
|
||||
const QJsonObject &port = valPort.toObject();
|
||||
int typeId = port.value(QStringLiteral("typeId")).toInt();
|
||||
if (typeId == Core::PortType::WebSocketServer)
|
||||
if (typeId == Core::CorePortType::WebSocketServer)
|
||||
{
|
||||
m_eemPort = port.value(QStringLiteral("number")).toInt();
|
||||
connectToEem();
|
||||
|
||||
Reference in new issue
Block a user