Use override and nullptr

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

5 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/tts/common/qtexttospeechprocessor.cpp b/src/plugins/tts/common/qtexttospeechprocessor.cpp
index 4ec8353..5ce4756 100644
--- a/src/plugins/tts/common/qtexttospeechprocessor.cpp
+++ b/src/plugins/tts/common/qtexttospeechprocessor.cpp
@@ -47,8 +47,8 @@ QTextToSpeechProcessor::QTextToSpeechProcessor():
     m_rate(0),
     m_pitch(0),
     m_volume(1.0),
-    m_audio(0),
-    m_audioBuffer(0)
+    m_audio(nullptr),
+    m_audioBuffer(nullptr)
 {
 }
 
@@ -186,8 +186,8 @@ void QTextToSpeechProcessor::run()
         if (isInterruptionRequested()) {
             if (m_audio) {
                 delete m_audio;
-                m_audio = 0;
-                m_audioBuffer = 0;
+                m_audio = nullptr;
+                m_audioBuffer = nullptr;
             }
             m_lock.unlock();
             break;
@@ -227,8 +227,8 @@ bool QTextToSpeechProcessor::audioStart(int sampleRate, int channelCount, QStrin
         *errorString = QLatin1String("Failed to start audio output (error ")
             + QString::number(m_audio->error()) + QLatin1Char(')');
     delete m_audio;
-    m_audio = 0;
-    m_audioBuffer = 0;
+    m_audio = nullptr;
+    m_audioBuffer = nullptr;
     return false;
 }
 
@@ -282,8 +282,8 @@ void QTextToSpeechProcessor::audioStop(bool abort)
             m_audio->stop();
         }
         delete m_audio;
-        m_audio = 0;
-        m_audioBuffer = 0;
+        m_audio = nullptr;
+        m_audioBuffer = nullptr;
     }
 }
 
diff --git a/src/plugins/tts/common/qtexttospeechprocessor_p.h b/src/plugins/tts/common/qtexttospeechprocessor_p.h
index a0392fc..67b850e 100644
--- a/src/plugins/tts/common/qtexttospeechprocessor_p.h
+++ b/src/plugins/tts/common/qtexttospeechprocessor_p.h
@@ -66,7 +66,7 @@ public:
         QVoice::Age age;
     };
     QTextToSpeechProcessor();
-    ~QTextToSpeechProcessor();
+    ~QTextToSpeechProcessor() override;
     void say(const QString &text, int voiceId);
     void stop();
     void pause();
@@ -89,8 +89,8 @@ protected:
     // These methods can be used for audio output.
     // audioOutput() blocks until all the audio has been written or processing
     // is interrupted.
-    bool audioStart(int sampleRate, int channelCount, QString *errorString = 0);
-    bool audioOutput(const char* data, qint64 dataSize, QString *errorString = 0);
+    bool audioStart(int sampleRate, int channelCount, QString *errorString = nullptr);
+    bool audioOutput(const char* data, qint64 dataSize, QString *errorString = nullptr);
     void audioStop(bool abort = false);
 
     // These methods should be re-implemented if the parameters need
diff --git a/src/plugins/tts/flite/qtexttospeech_flite.h b/src/plugins/tts/flite/qtexttospeech_flite.h
index dc5dd02..cab71d5 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite.h
@@ -56,7 +56,7 @@ class QTextToSpeechEngineFlite : public QTextToSpeechEngine
 
 public:
     QTextToSpeechEngineFlite(const QVariantMap &parameters, QObject *parent);
-    virtual ~QTextToSpeechEngineFlite();
+    ~QTextToSpeechEngineFlite() override;
 
     // Plug-in API:
     QVector<QLocale> availableLocales() const override;
diff --git a/src/plugins/tts/flite/qtexttospeech_flite_plugin.h b/src/plugins/tts/flite/qtexttospeech_flite_plugin.h
index fe9ed64..6873858 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite_plugin.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite_plugin.h
@@ -58,7 +58,7 @@ public:
     QTextToSpeechEngine *createTextToSpeechEngine(
                                 const QVariantMap &parameters,
                                 QObject *parent,
-                                QString *errorString) const;
+                                QString *errorString) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.h b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
index 710db0c..0288cd9 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite_processor.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
@@ -58,7 +58,7 @@ class QTextToSpeechProcessorFlite : public QTextToSpeechProcessor {
 
 public:
     static QSharedPointer<QTextToSpeechProcessorFlite> instance();
-    ~QTextToSpeechProcessorFlite();
+    ~QTextToSpeechProcessorFlite() override;
     const QVector<VoiceInfo> &voices() const override;
 
 private: