diff --git a/src/blackcore/blackcorefreefunctions.cpp b/src/blackcore/blackcorefreefunctions.cpp index 8c6e1f4d5..6a20ef687 100644 --- a/src/blackcore/blackcorefreefunctions.cpp +++ b/src/blackcore/blackcorefreefunctions.cpp @@ -11,8 +11,13 @@ namespace BlackCore { void registerMetadata() { - IVoice::registerMetadata(); - ISimulator::registerMetadata(); + // for some reasons (ask RW) these are registered twice + qRegisterMetaType(); + qRegisterMetaType("Status"); + qRegisterMetaType(); + qRegisterMetaType("ComUnit"); + qRegisterMetaType(); + qRegisterMetaType("ConnectionStatus"); } } // namespace diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 4882ec19d..e0028e281 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -9,11 +9,4 @@ namespace BlackCore { ISimulator::ISimulator(QObject *parent) : QObject(parent) { } - - void ISimulator::registerMetadata() - { - // for some reasons (ask RW) this is registered twice, see IVoice - qRegisterMetaType(); - qRegisterMetaType("Status"); - } } diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 0f1c05b18..2dc03e5f5 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -49,10 +49,6 @@ namespace BlackCore //! ISimulatorCan we connect? virtual bool canConnect() = 0; - //! ISimulatorRegister metadata - static void registerMetadata(); - - public slots: //! ISimulatorConnect to simulator diff --git a/src/blackcore/voice.cpp b/src/blackcore/voice.cpp index d7aa963f5..382ae7722 100644 --- a/src/blackcore/voice.cpp +++ b/src/blackcore/voice.cpp @@ -9,13 +9,4 @@ namespace BlackCore { IVoice::IVoice(QObject *parent) : QObject(parent) { } - - void IVoice::registerMetadata() - { - // for some reasons (ask RW) this is registered twice - qRegisterMetaType(); - qRegisterMetaType("ComUnit"); - qRegisterMetaType(); - qRegisterMetaType("ConnectionStatus"); - } } diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index fb4e87a6a..b4c1a8e5e 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -128,9 +128,6 @@ namespace BlackCore */ virtual QString micTestResultAsString() const = 0; - //! \brief Register metadata - static void registerMetadata(); - public slots: /*!