diff options
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | examples/speech/hello_speak/mainwindow.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/tts/flite/qtexttospeech_flite.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/tts/flite/qtexttospeech_flite_processor.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/tts/sapi/qtexttospeech_sapi.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp | 2 |
6 files changed, 16 insertions, 12 deletions
diff --git a/.qmake.conf b/.qmake.conf index 360e9de..f30686b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,7 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean +DEFINES += QT_NO_FOREACH +DEFINES += QT_NO_JAVA_STYLE_ITERATORS + MODULE_VERSION = 5.14.0 diff --git a/examples/speech/hello_speak/mainwindow.cpp b/examples/speech/hello_speak/mainwindow.cpp index 17619d2..351249e 100644 --- a/examples/speech/hello_speak/mainwindow.cpp +++ b/examples/speech/hello_speak/mainwindow.cpp @@ -62,7 +62,8 @@ MainWindow::MainWindow(QWidget *parent) // Populate engine selection list ui.engine->addItem("Default", QString("default")); - foreach (QString engine, QTextToSpeech::availableEngines()) + const auto engines = QTextToSpeech::availableEngines(); + for (const QString &engine : engines) ui.engine->addItem(engine, engine); ui.engine->setCurrentIndex(0); engineSelected(0); @@ -125,9 +126,9 @@ void MainWindow::engineSelected(int index) disconnect(ui.language, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::languageSelected); ui.language->clear(); // Populate the languages combobox before connecting its signal. - QVector<QLocale> locales = m_speech->availableLocales(); + const QVector<QLocale> locales = m_speech->availableLocales(); QLocale current = m_speech->locale(); - foreach (const QLocale &locale, locales) { + for (const QLocale &locale : locales) { QString name(QString("%1 (%2)") .arg(QLocale::languageToString(locale.language())) .arg(QLocale::countryToString(locale.country()))); @@ -171,7 +172,7 @@ void MainWindow::localeChanged(const QLocale &locale) m_voices = m_speech->availableVoices(); QVoice currentVoice = m_speech->voice(); - foreach (const QVoice &voice, m_voices) { + for (const QVoice &voice : qAsConst(m_voices)) { ui.voice->addItem(QString("%1 - %2 - %3").arg(voice.name()) .arg(QVoice::genderName(voice.gender())) .arg(QVoice::ageName(voice.age()))); diff --git a/src/plugins/tts/flite/qtexttospeech_flite.cpp b/src/plugins/tts/flite/qtexttospeech_flite.cpp index 2b32715..fc69397 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite.cpp +++ b/src/plugins/tts/flite/qtexttospeech_flite.cpp @@ -122,7 +122,7 @@ QLocale QTextToSpeechEngineFlite::locale() const bool QTextToSpeechEngineFlite::setLocale(const QLocale &locale) { bool localeFound = false; - foreach (const QLocale &l, m_locales) { + for (const QLocale &l : qAsConst(m_locales)) { if (l.name() == locale.name()) { localeFound = true; break; @@ -154,7 +154,8 @@ QVoice QTextToSpeechEngineFlite::voice() const bool QTextToSpeechEngineFlite::setVoice(const QVoice &voice) { - foreach (const QVoice &availableVoice, availableVoices()) { + const auto voices = availableVoices(); + for (const QVoice &availableVoice : voices) { if (QTextToSpeechEngine::voiceData(availableVoice) == QTextToSpeechEngine::voiceData(voice)) { m_currentVoice = voice; return true; @@ -172,7 +173,7 @@ bool QTextToSpeechEngineFlite::init(QString *errorString) { int i = 0; const QVector<QTextToSpeechProcessor::VoiceInfo> &voices = m_processor->voices(); - foreach (const QTextToSpeechProcessor::VoiceInfo &voiceInfo, voices) { + for (const QTextToSpeechProcessor::VoiceInfo &voiceInfo : voices) { QString name = voiceInfo.name; QLocale locale(voiceInfo.locale); QVoice voice = QTextToSpeechEngine::createVoice(name, voiceInfo.gender, voiceInfo.age, diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp index 5cb051d..198c09b 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp +++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp @@ -179,7 +179,7 @@ bool QTextToSpeechProcessorFlite::init() m_fliteVoices.append(voice_enus); int totalVoiceCount = 0; - foreach (const FliteVoice &voice, m_fliteVoices) { + for (const FliteVoice &voice : qAsConst(m_fliteVoices)) { QTextToSpeechProcessor::VoiceInfo voiceInfo; voiceInfo.name = voice.name; voiceInfo.locale = voice.locale; @@ -194,9 +194,8 @@ bool QTextToSpeechProcessorFlite::init() void QTextToSpeechProcessorFlite::deinit() { - foreach (const FliteVoice &voice, m_fliteVoices) + for (const FliteVoice &voice : qExchange(m_fliteVoices, {})) voice.unregister_func(voice.vox); - m_fliteVoices.clear(); m_voices.clear(); } diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp index b97b56f..e371247 100644 --- a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp +++ b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp @@ -386,7 +386,7 @@ QVoice QTextToSpeechEngineSapi::voice() const m_voice->GetVoice(&cpVoiceToken); QString vId = voiceId(cpVoiceToken); cpVoiceToken->Release(); - foreach (const QVoice &voice, m_voices.values()) { + for (const QVoice &voice : m_voices) { if (voiceData(voice).toString() == vId) { return voice; } diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp index 5fd3bc2..6eb74b8 100644 --- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp +++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp @@ -364,7 +364,7 @@ QVector<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const // (history functions are just stubs) void speech_finished_callback(size_t /*msg_id*/, size_t /*client_id*/, SPDNotificationType state) { - Q_FOREACH (QTextToSpeechEngineSpeechd *backend, *backends) + for (QTextToSpeechEngineSpeechd *backend : qAsConst(*backends)) backend->spdStateChanged(state); } |