Replace Q_DECL_OVERRIDE with override

We're depending on C++11 these days, so no need to use deprecated
macros.

Change-Id: Ia1d48f5207978fbfcbf70a939de67aa6ed2214a1
Reviewed-by: Jeremy Whiting <jpwhiting@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

7 files changed, 88 insertions, 88 deletions

diff --git a/src/plugins/tts/common/qtexttospeechprocessor_p.h b/src/plugins/tts/common/qtexttospeechprocessor_p.h
index da043c0..5ad80d3 100644
--- a/src/plugins/tts/common/qtexttospeechprocessor_p.h
+++ b/src/plugins/tts/common/qtexttospeechprocessor_p.h
@@ -112,7 +112,7 @@ signals:
     void notSpeaking(int statusCode);
 
 private:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
     mutable QMutex m_lock;
     volatile bool m_stop;
     volatile bool m_idle;
diff --git a/src/plugins/tts/flite/qtexttospeech_flite.h b/src/plugins/tts/flite/qtexttospeech_flite.h
index bffdb25..dc5dd02 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite.h
@@ -59,23 +59,23 @@ public:
     virtual ~QTextToSpeechEngineFlite();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const Q_DECL_OVERRIDE;
-    QVector<QVoice> availableVoices() const Q_DECL_OVERRIDE;
-    void say(const QString &text) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    double rate() const Q_DECL_OVERRIDE;
-    bool setRate(double rate) Q_DECL_OVERRIDE;
-    double pitch() const Q_DECL_OVERRIDE;
-    bool setPitch(double pitch) Q_DECL_OVERRIDE;
-    QLocale locale() const Q_DECL_OVERRIDE;
-    bool setLocale(const QLocale &locale) Q_DECL_OVERRIDE;
-    double volume() const Q_DECL_OVERRIDE;
-    bool setVolume(double volume) Q_DECL_OVERRIDE;
-    QVoice voice() const Q_DECL_OVERRIDE;
-    bool setVoice(const QVoice &voice) Q_DECL_OVERRIDE;
-    QTextToSpeech::State state() const Q_DECL_OVERRIDE;
+    QVector<QLocale> availableLocales() const override;
+    QVector<QVoice> availableVoices() const override;
+    void say(const QString &text) override;
+    void stop() override;
+    void pause() override;
+    void resume() override;
+    double rate() const override;
+    bool setRate(double rate) override;
+    double pitch() const override;
+    bool setPitch(double pitch) override;
+    QLocale locale() const override;
+    bool setLocale(const QLocale &locale) override;
+    double volume() const override;
+    bool setVolume(double volume) override;
+    QVoice voice() const override;
+    bool setVoice(const QVoice &voice) override;
+    QTextToSpeech::State state() const override;
 
     // Internal API:
     bool init(QString *errorString);
diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.h b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
index 6eb1263..710db0c 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite_processor.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
@@ -59,7 +59,7 @@ class QTextToSpeechProcessorFlite : public QTextToSpeechProcessor {
 public:
     static QSharedPointer<QTextToSpeechProcessorFlite> instance();
     ~QTextToSpeechProcessorFlite();
-    const QVector<VoiceInfo> &voices() const Q_DECL_OVERRIDE;
+    const QVector<VoiceInfo> &voices() const override;
 
 private:
     QTextToSpeechProcessorFlite();
@@ -67,7 +67,7 @@ private:
                             int last, cst_audio_streaming_info *asi);
     int fliteOutput(const cst_wave *w, int start, int size,
                     int last, cst_audio_streaming_info *asi);
-    int processText(const QString &text, int voiceId) Q_DECL_OVERRIDE;
+    int processText(const QString &text, int voiceId) override;
     void setRateForVoice(cst_voice *voice, float rate);
     void setPitchForVoice(cst_voice *voice, float pitch);
     bool init();
diff --git a/src/plugins/tts/osx/qtexttospeech_osx.h b/src/plugins/tts/osx/qtexttospeech_osx.h
index 576905e..1085075 100644
--- a/src/plugins/tts/osx/qtexttospeech_osx.h
+++ b/src/plugins/tts/osx/qtexttospeech_osx.h
@@ -59,23 +59,23 @@ public:
     ~QTextToSpeechEngineOsx();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const Q_DECL_OVERRIDE;
-    QVector<QVoice> availableVoices() const Q_DECL_OVERRIDE;
-    void say(const QString &text) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    double rate() const Q_DECL_OVERRIDE;
-    bool setRate(double rate) Q_DECL_OVERRIDE;
-    double pitch() const Q_DECL_OVERRIDE;
-    bool setPitch(double pitch) Q_DECL_OVERRIDE;
-    QLocale locale() const Q_DECL_OVERRIDE;
-    bool setLocale(const QLocale &locale) Q_DECL_OVERRIDE;
-    double volume() const Q_DECL_OVERRIDE;
-    bool setVolume(double volume) Q_DECL_OVERRIDE;
-    QVoice voice() const Q_DECL_OVERRIDE;
-    bool setVoice(const QVoice &voice) Q_DECL_OVERRIDE;
-    QTextToSpeech::State state() const Q_DECL_OVERRIDE;
+    QVector<QLocale> availableLocales() const override;
+    QVector<QVoice> availableVoices() const override;
+    void say(const QString &text) override;
+    void stop() override;
+    void pause() override;
+    void resume() override;
+    double rate() const override;
+    bool setRate(double rate) override;
+    double pitch() const override;
+    bool setPitch(double pitch) override;
+    QLocale locale() const override;
+    bool setLocale(const QLocale &locale) override;
+    double volume() const override;
+    bool setVolume(double volume) override;
+    QVoice voice() const override;
+    bool setVoice(const QVoice &voice) override;
+    QTextToSpeech::State state() const override;
 
     void speechStopped(bool);
 
diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.h b/src/plugins/tts/sapi/qtexttospeech_sapi.h
index 119ca8a..d22042c 100644
--- a/src/plugins/tts/sapi/qtexttospeech_sapi.h
+++ b/src/plugins/tts/sapi/qtexttospeech_sapi.h
@@ -59,23 +59,23 @@ public:
     ~QTextToSpeechEngineSapi();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const Q_DECL_OVERRIDE;
-    QVector<QVoice> availableVoices() const Q_DECL_OVERRIDE;
-    void say(const QString &text) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    double rate() const Q_DECL_OVERRIDE;
-    bool setRate(double rate) Q_DECL_OVERRIDE;
-    double pitch() const Q_DECL_OVERRIDE;
-    bool setPitch(double pitch) Q_DECL_OVERRIDE;
-    QLocale locale() const Q_DECL_OVERRIDE;
-    bool setLocale(const QLocale &locale) Q_DECL_OVERRIDE;
-    double volume() const Q_DECL_OVERRIDE;
-    bool setVolume(double volume) Q_DECL_OVERRIDE;
-    QVoice voice() const Q_DECL_OVERRIDE;
-    bool setVoice(const QVoice &voice) Q_DECL_OVERRIDE;
-    QTextToSpeech::State state() const Q_DECL_OVERRIDE;
+    QVector<QLocale> availableLocales() const override;
+    QVector<QVoice> availableVoices() const override;
+    void say(const QString &text) override;
+    void stop() override;
+    void pause() override;
+    void resume() override;
+    double rate() const override;
+    bool setRate(double rate) override;
+    double pitch() const override;
+    bool setPitch(double pitch) override;
+    QLocale locale() const override;
+    bool setLocale(const QLocale &locale) override;
+    double volume() const override;
+    bool setVolume(double volume) override;
+    QVoice voice() const override;
+    bool setVoice(const QVoice &voice) override;
+    QTextToSpeech::State state() const override;
 
     HRESULT STDMETHODCALLTYPE NotifyCallback(WPARAM /*wParam*/, LPARAM /*lParam*/);
 private:
diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
index f6b9f93..cfe91b0 100644
--- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
+++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
@@ -57,23 +57,23 @@ public:
     ~QTextToSpeechEngineSpeechd();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const Q_DECL_OVERRIDE;
-    QVector<QVoice> availableVoices() const Q_DECL_OVERRIDE;
-    void say(const QString &text) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    double rate() const Q_DECL_OVERRIDE;
-    bool setRate(double rate) Q_DECL_OVERRIDE;
-    double pitch() const Q_DECL_OVERRIDE;
-    bool setPitch(double pitch) Q_DECL_OVERRIDE;
-    QLocale locale() const Q_DECL_OVERRIDE;
-    bool setLocale(const QLocale &locale) Q_DECL_OVERRIDE;
-    double volume() const Q_DECL_OVERRIDE;
-    bool setVolume(double volume) Q_DECL_OVERRIDE;
-    QVoice voice() const Q_DECL_OVERRIDE;
-    bool setVoice(const QVoice &voice) Q_DECL_OVERRIDE;
-    QTextToSpeech::State state() const Q_DECL_OVERRIDE;
+    QVector<QLocale> availableLocales() const override;
+    QVector<QVoice> availableVoices() const override;
+    void say(const QString &text) override;
+    void stop() override;
+    void pause() override;
+    void resume() override;
+    double rate() const override;
+    bool setRate(double rate) override;
+    double pitch() const override;
+    bool setPitch(double pitch) override;
+    QLocale locale() const override;
+    bool setLocale(const QLocale &locale) override;
+    double volume() const override;
+    bool setVolume(double volume) override;
+    QVoice voice() const override;
+    bool setVoice(const QVoice &voice) override;
+    QTextToSpeech::State state() const override;
 
     void spdStateChanged(SPDNotificationType state);
 
diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.h b/src/plugins/tts/winrt/qtexttospeech_winrt.h
index 0d45466..8729deb 100644
--- a/src/plugins/tts/winrt/qtexttospeech_winrt.h
+++ b/src/plugins/tts/winrt/qtexttospeech_winrt.h
@@ -70,23 +70,23 @@ public:
     QTextToSpeechEngineWinRT(const QVariantMap &parameters, QObject *parent);
     ~QTextToSpeechEngineWinRT();
 
-    QVector<QLocale> availableLocales() const Q_DECL_OVERRIDE;
-    QVector<QVoice> availableVoices() const Q_DECL_OVERRIDE;
-    void say(const QString &text) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    double rate() const Q_DECL_OVERRIDE;
-    bool setRate(double rate) Q_DECL_OVERRIDE;
-    double pitch() const Q_DECL_OVERRIDE;
-    bool setPitch(double pitch) Q_DECL_OVERRIDE;
-    QLocale locale() const Q_DECL_OVERRIDE;
-    bool setLocale(const QLocale &locale) Q_DECL_OVERRIDE;
-    double volume() const Q_DECL_OVERRIDE;
-    bool setVolume(double volume) Q_DECL_OVERRIDE;
-    QVoice voice() const Q_DECL_OVERRIDE;
-    bool setVoice(const QVoice &voice) Q_DECL_OVERRIDE;
-    QTextToSpeech::State state() const Q_DECL_OVERRIDE;
+    QVector<QLocale> availableLocales() const override;
+    QVector<QVoice> availableVoices() const override;
+    void say(const QString &text) override;
+    void stop() override;
+    void pause() override;
+    void resume() override;
+    double rate() const override;
+    bool setRate(double rate) override;
+    double pitch() const override;
+    bool setPitch(double pitch) override;
+    QLocale locale() const override;
+    bool setLocale(const QLocale &locale) override;
+    double volume() const override;
+    bool setVolume(double volume) override;
+    QVoice voice() const override;
+    bool setVoice(const QVoice &voice) override;
+    QTextToSpeech::State state() const override;
 
 public slots:
     void checkElementState();