summaryrefslogtreecommitdiff
path: root/platform/android/tts_android.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-05-16 11:59:38 +0200
committerGitHub <noreply@github.com>2022-05-16 11:59:38 +0200
commitc1277c2183eaacb9ae49f9fef0c57443b934b72b (patch)
tree434b526eb286850ebccc6d2c998a7d90fdb8b5e2 /platform/android/tts_android.cpp
parent396def9b66c476f7834604adb7136ca903ed01be (diff)
parent746dddc0673d7261f19b1e056e90e6e3a49ef33a (diff)
Merge pull request #60999 from reduz/replace-rbhash-by-hashmap
Diffstat (limited to 'platform/android/tts_android.cpp')
-rw-r--r--platform/android/tts_android.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/tts_android.cpp b/platform/android/tts_android.cpp
index 528878f14e..d3f3773344 100644
--- a/platform/android/tts_android.cpp
+++ b/platform/android/tts_android.cpp
@@ -46,7 +46,7 @@ jmethodID TTS_Android::_pause_speaking = 0;
jmethodID TTS_Android::_resume_speaking = 0;
jmethodID TTS_Android::_stop_speaking = 0;
-Map<int, Char16String> TTS_Android::ids;
+HashMap<int, Char16String> TTS_Android::ids;
void TTS_Android::setup(jobject p_tts) {
JNIEnv *env = get_jni_env();
@@ -175,8 +175,8 @@ void TTS_Android::resume() {
}
void TTS_Android::stop() {
- for (Map<int, Char16String>::Element *E = ids.front(); E; E = E->next()) {
- DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E->key());
+ for (const KeyValue<int, Char16String> &E : ids) {
+ DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
}
ids.clear();