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
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user