Modernize to C++11: Use for-range loop.

This commit is contained in:
Haojian Wu 2016-07-10 13:32:40 +02:00
commit 55b3f1936f
17 changed files with 66 additions and 71 deletions

View file

@ -415,9 +415,8 @@ int TtsControllerImpl::GetMatchingVoice(
if (utterance->required_event_types().size() > 0) {
bool has_all_required_event_types = true;
for (auto iter = utterance->required_event_types().begin();
iter != utterance->required_event_types().end(); ++iter) {
if (voice.events.find(*iter) == voice.events.end()) {
for (auto iter : utterance->required_event_types()) {
if (voice.events.find(iter) == voice.events.end()) {
has_all_required_event_types = false;
break;
}
@ -434,9 +433,8 @@ int TtsControllerImpl::GetMatchingVoice(
}
void TtsControllerImpl::VoicesChanged() {
for (auto iter = voices_changed_delegates_.begin();
iter != voices_changed_delegates_.end(); ++iter) {
(*iter)->OnVoicesChanged();
for (auto voices_changed_delegate : voices_changed_delegates_) {
voices_changed_delegate->OnVoicesChanged();
}
}