diff options
| author | Tuomas Tuononen <tuomas.tuononen@code-q.fi> | 2015-10-02 12:15:03 +0300 |
|---|---|---|
| committer | Tuomas Tuononen <tuomas.tuononen@code-q.fi> | 2015-10-14 08:12:02 +0000 |
| commit | 6e8b1e5628d4ece453a26e2984e78763f596be3a (patch) | |
| tree | f4ee83ec802869618c9c3a9715a0b236cdacd505 | |
| parent | bbf4c960e0a04e6d86826e86802ac100cb4291a0 (diff) | |
SpeechRecognition: Clean up metatype registration
Enum type QSpeechRecognition::Error is used in signal parameters,
so declare it as a public metatype.
Change-Id: I8ee84ee0f336a0060cc5c0409b80f43be044024a
Reviewed-by: Jeremy Whiting <jpwhiting@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| -rwxr-xr-x | src/asr/qspeechrecognition.cpp | 2 | ||||
| -rw-r--r-- | src/asr/qspeechrecognition.h | 2 | ||||
| -rwxr-xr-x | src/asr/qspeechrecognitionmanager.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/asr/qspeechrecognition.cpp b/src/asr/qspeechrecognition.cpp index fee094e..01f6b88 100755 --- a/src/asr/qspeechrecognition.cpp +++ b/src/asr/qspeechrecognition.cpp @@ -630,7 +630,7 @@ QSpeechRecognitionPrivate::QSpeechRecognitionPrivate(): m_manager->moveToThread(m_managerThread); /*** Results and notifications from the manager: ***/ - qRegisterMetaType<QSpeechRecognition::Error>("QSpeechRecognition::Error"); + qRegisterMetaType<QSpeechRecognition::Error>(); QObject::connect(m_manager, &QSpeechRecognitionManager::notListening, m_managerInterface, &QSpeechRecognitionManagerInterface::onNotListening); QObject::connect(m_manager, &QSpeechRecognitionManager::error, m_managerInterface, &QSpeechRecognitionManagerInterface::onError); QObject::connect(m_manager, &QSpeechRecognitionManager::attributeUpdated, m_managerInterface, &QSpeechRecognitionManagerInterface::onAttributeUpdated); diff --git a/src/asr/qspeechrecognition.h b/src/asr/qspeechrecognition.h index 14ba61c..f5ec515 100644 --- a/src/asr/qspeechrecognition.h +++ b/src/asr/qspeechrecognition.h @@ -124,4 +124,6 @@ Q_SIGNALS: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QSpeechRecognition::Error) + #endif diff --git a/src/asr/qspeechrecognitionmanager.cpp b/src/asr/qspeechrecognitionmanager.cpp index 923112c..d15a8e1 100755 --- a/src/asr/qspeechrecognitionmanager.cpp +++ b/src/asr/qspeechrecognitionmanager.cpp @@ -119,7 +119,6 @@ void QSpeechRecognitionManager::createEngine(const QString &engineName, const QS connect(engine, &QSpeechRecognitionPluginEngine::attributeUpdated, this, &QSpeechRecognitionManager::onAttributeUpdated); // Force handling of the following signals to be asynchronous connect(engine, &QSpeechRecognitionPluginEngine::requestStop, this, &QSpeechRecognitionManager::onRequestStop, Qt::QueuedConnection); - qRegisterMetaType<QSpeechRecognition::Error>("QSpeechRecognition::Error"); connect(engine, &QSpeechRecognitionPluginEngine::error, this, &QSpeechRecognitionManager::onError, Qt::QueuedConnection); m_engines.insert(engineName, engine); m_engineLoaders.insert(provider, engineLoader); |