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
@@ -105,7 +105,7 @@
|
||||
</topicType>
|
||||
<topicType name="PortInformation">
|
||||
<column name="number" idlType="long"/>
|
||||
<column name="type" idlType="PortType"/>
|
||||
<column name="type" idlType="CorePortType"/>
|
||||
<column name="properties" idlType="string"/>
|
||||
</topicType>
|
||||
<topicType name="RelativePosition">
|
||||
@@ -150,7 +150,7 @@
|
||||
<attribute key="Completed" value="2"/>
|
||||
<attribute key="Error" value="4"/>
|
||||
</enumeration>
|
||||
<enumeration name="PortType">
|
||||
<enumeration name="CorePortType">
|
||||
<attribute key="Unknown" value="0"/>
|
||||
<attribute key="WebSocketServer" value="1"/>
|
||||
<attribute key="WebSocketPositionServer" value="2"/>
|
||||
|
||||
@@ -48,7 +48,7 @@ void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString&
|
||||
publishState();
|
||||
}
|
||||
|
||||
void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QString& properties)
|
||||
void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
if (QThread::currentThread() == this->thread())
|
||||
addPortInternal(number, portType, properties);
|
||||
@@ -57,7 +57,7 @@ void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QS
|
||||
[this, number, portType, properties]() { addPortInternal(number, portType, properties); });
|
||||
}
|
||||
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::PortType portType, const QString& properties)
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
if (!m_state.ports().is_set())
|
||||
m_state.ports() = std::vector<Core::PortInformation>();
|
||||
@@ -133,14 +133,14 @@ void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString&
|
||||
Q_UNUSED(errorString)
|
||||
}
|
||||
|
||||
void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QString& properties)
|
||||
void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
Q_UNUSED(number)
|
||||
Q_UNUSED(portType)
|
||||
Q_UNUSED(properties)
|
||||
}
|
||||
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::PortType portType, const QString& properties)
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
Q_UNUSED(number)
|
||||
Q_UNUSED(portType)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <QtCore/QThread>
|
||||
|
||||
// Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
|
||||
namespace Core { enum class RunningState; enum class PortType; }
|
||||
namespace Core { enum class RunningState; enum class CorePortType; }
|
||||
namespace DTS { class CurrentRunningStateImpl; }
|
||||
|
||||
#if BUILD_RTI
|
||||
@@ -52,7 +52,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
|
||||
public Q_SLOTS:
|
||||
#if BUILD_RTI
|
||||
void setNewState(Core::RunningState newState, const QString& errorString = QString());
|
||||
void addPort(unsigned short number, Core::PortType portType, const QString& properties = QStringLiteral(""));
|
||||
void addPort(unsigned short number, Core::CorePortType portType, const QString& properties = QStringLiteral(""));
|
||||
|
||||
void publishState();
|
||||
#endif
|
||||
@@ -62,7 +62,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
|
||||
NGL::INGLLogger& m_logger;
|
||||
void init(DDSConnector::DdsConnector* ddsConnector);
|
||||
void setNewStateInternal(Core::RunningState newState, const QString& errorString = QString());
|
||||
void addPortInternal(unsigned short number, Core::PortType portType,
|
||||
void addPortInternal(unsigned short number, Core::CorePortType portType,
|
||||
const QString& properties = QStringLiteral(""));
|
||||
|
||||
CurrentRunningState m_state;
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
</topicType>
|
||||
<topicType name="PortInformation">
|
||||
<column name="number" idlType="long"/>
|
||||
<column name="type" idlType="PortType"/>
|
||||
<column name="type" idlType="DdsutPortType"/>
|
||||
</topicType>
|
||||
<topicType name="RelativePosition">
|
||||
<column name="offsetX" idlType="double" comment="in meter"/>
|
||||
@@ -115,7 +115,7 @@
|
||||
<functionTopic name="FunctionTopicTestWithState" requestTopicType="FunctionRequestWithState" replyTopicType="FunctionReplyWithState" requestTopicName="FunctionTopicTestWithStateRequest" replyTopicName="FunctionTopicTestWithStateReply" routeInReplay="0"/>
|
||||
</functionTopics>
|
||||
<enumerations>
|
||||
<enumeration name="PortType">
|
||||
<enumeration name="DdsutPortType">
|
||||
<attribute key="Unknown" value="0"/>
|
||||
<attribute key="WebSocketServer" value="1"/>
|
||||
</enumeration>
|
||||
|
||||
Reference in new issue
Block a user