summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-04-27 14:58:40 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-05-14 11:01:33 +0000
commit0d02c3e54507f0568c630fc5fb41e9e2e4b34ea6 (patch)
treeb4623025c6d6c29cd1e28c0ee2ad079ae722184d
parent1d5721852cfa83082deef1301f96731cd4dc0260 (diff)
Slight cleanup/simplification of if statements
Change-Id: I7a62b35729aaac6614a868ce3c0e3b4dea91f1d6 Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r--src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
index c5884ee..5fd3bc2 100644
--- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
+++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
@@ -118,11 +118,10 @@ bool QTextToSpeechEngineSpeechd::connectToSpeechDispatcher()
m_currentLocale = QLocale::system();
updateVoices();
return true;
- } else {
- qWarning() << "Connection to speech-dispatcher failed";
- m_state = QTextToSpeech::BackendError;
- return false;
}
+
+ qWarning() << "Connection to speech-dispatcher failed";
+ m_state = QTextToSpeech::BackendError;
return false;
}
@@ -212,9 +211,7 @@ bool QTextToSpeechEngineSpeechd::setRate(double rate)
return false;
int result = spd_set_voice_rate(speechDispatcher, static_cast<int>(rate * 100));
- if (result == 0)
- return true;
- return false;
+ return result == 0;
}
double QTextToSpeechEngineSpeechd::rate() const
@@ -236,9 +233,7 @@ bool QTextToSpeechEngineSpeechd::setVolume(double volume)
// convert from 0.0..1.0 to -100..100
int result = spd_set_volume(speechDispatcher, (volume - 0.5) * 200);
- if (result == 0)
- return true;
- return false;
+ return result == 0;
}
double QTextToSpeechEngineSpeechd::volume() const