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