2 files changed, 46 insertions, 46 deletions

diff --git a/src/plugins/opensles/qopenslesaudiooutput.cpp b/src/plugins/opensles/qopenslesaudiooutput.cpp
index 70d77a380..0b1f444bd 100644
--- a/src/plugins/opensles/qopenslesaudiooutput.cpp
+++ b/src/plugins/opensles/qopenslesaudiooutput.cpp
@@ -69,13 +69,13 @@ QOpenSLESAudioOutput::QOpenSLESAudioOutput(const QByteArray &device)
     : m_deviceName(device),
       m_state(QAudio::StoppedState),
       m_error(QAudio::NoError),
-      m_outputMixObject(Q_NULLPTR),
-      m_playerObject(Q_NULLPTR),
-      m_playItf(Q_NULLPTR),
-      m_volumeItf(Q_NULLPTR),
-      m_bufferQueueItf(Q_NULLPTR),
-      m_audioSource(Q_NULLPTR),
-      m_buffers(Q_NULLPTR),
+      m_outputMixObject(nullptr),
+      m_playerObject(nullptr),
+      m_playItf(nullptr),
+      m_volumeItf(nullptr),
+      m_bufferQueueItf(nullptr),
+      m_audioSource(nullptr),
+      m_buffers(nullptr),
       m_volume(1.0),
       m_pullMode(false),
       m_nextBuffer(0),
@@ -157,7 +157,7 @@ QIODevice *QOpenSLESAudioOutput::start()
         stop();
 
     if (!preparePlayer())
-        return Q_NULLPTR;
+        return nullptr;
 
     m_pullMode = false;
     m_processedBytes = 0;
@@ -458,8 +458,8 @@ bool QOpenSLESAudioOutput::preparePlayer()
     if (SL_RESULT_SUCCESS != (*engine)->CreateOutputMix(engine,
                                                         &m_outputMixObject,
                                                         0,
-                                                        Q_NULLPTR,
-                                                        Q_NULLPTR)) {
+                                                        nullptr,
+                                                        nullptr)) {
         qWarning() << "Unable to create output mix";
         setError(QAudio::FatalError);
         return false;
@@ -472,7 +472,7 @@ bool QOpenSLESAudioOutput::preparePlayer()
     }
 
     SLDataLocator_OutputMix outputMixLocator = { SL_DATALOCATOR_OUTPUTMIX, m_outputMixObject };
-    SLDataSink audioSink = { &outputMixLocator, Q_NULLPTR };
+    SLDataSink audioSink = { &outputMixLocator, nullptr };
 
 #ifndef ANDROID
     const int iids = 2;
@@ -598,28 +598,28 @@ void QOpenSLESAudioOutput::destroyPlayer()
 
     if (m_playerObject) {
         (*m_playerObject)->Destroy(m_playerObject);
-        m_playerObject = Q_NULLPTR;
+        m_playerObject = nullptr;
     }
 
     if (m_outputMixObject) {
         (*m_outputMixObject)->Destroy(m_outputMixObject);
-        m_outputMixObject = Q_NULLPTR;
+        m_outputMixObject = nullptr;
     }
 
     if (!m_pullMode && m_audioSource) {
         m_audioSource->close();
         delete m_audioSource;
-        m_audioSource = Q_NULLPTR;
+        m_audioSource = nullptr;
     }
 
     delete [] m_buffers;
-    m_buffers = Q_NULLPTR;
+    m_buffers = nullptr;
     m_processedBytes = 0;
     m_nextBuffer = 0;
     m_availableBuffers.storeRelease(BUFFER_COUNT);
-    m_playItf = Q_NULLPTR;
-    m_volumeItf = Q_NULLPTR;
-    m_bufferQueueItf = Q_NULLPTR;
+    m_playItf = nullptr;
+    m_volumeItf = nullptr;
+    m_bufferQueueItf = nullptr;
     m_startRequiresInit = true;
 }
 
@@ -630,7 +630,7 @@ void QOpenSLESAudioOutput::stopPlayer()
     if (m_audioSource && !m_pullMode) {
         m_audioSource->close();
         delete m_audioSource;
-        m_audioSource = Q_NULLPTR;
+        m_audioSource = nullptr;
     }
 
     // We need to change the state manually...
diff --git a/src/plugins/opensles/qopenslesaudiooutput.h b/src/plugins/opensles/qopenslesaudiooutput.h
index 4c724dca6..b480f00e6 100644
--- a/src/plugins/opensles/qopenslesaudiooutput.h
+++ b/src/plugins/opensles/qopenslesaudiooutput.h
@@ -57,30 +57,30 @@ public:
     QOpenSLESAudioOutput(const QByteArray &device);
     ~QOpenSLESAudioOutput();
 
-    void start(QIODevice *device) Q_DECL_OVERRIDE;
-    QIODevice *start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesFree() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int value) Q_DECL_OVERRIDE;
-    int bufferSize() const Q_DECL_OVERRIDE;
-    void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat &format) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
-
-    void setCategory(const QString &category) Q_DECL_OVERRIDE;
-    QString category() const Q_DECL_OVERRIDE;
+    void start(QIODevice *device) override;
+    QIODevice *start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesFree() const override;
+    int periodSize() const override;
+    void setBufferSize(int value) override;
+    int bufferSize() const override;
+    void setNotifyInterval(int milliSeconds) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat &format) override;
+    QAudioFormat format() const override;
+
+    void setVolume(qreal volume) override;
+    qreal volume() const override;
+
+    void setCategory(const QString &category) override;
+    QString category() const override;
 
 private:
     friend class SLIODevicePrivate;
@@ -138,11 +138,11 @@ class SLIODevicePrivate : public QIODevice
 
 public:
     inline SLIODevicePrivate(QOpenSLESAudioOutput *audio) : m_audioDevice(audio) {}
-    inline ~SLIODevicePrivate() Q_DECL_OVERRIDE {}
+    inline ~SLIODevicePrivate() override {}
 
 protected:
-    inline qint64 readData(char *, qint64) Q_DECL_OVERRIDE { return 0; }
-    inline qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    inline qint64 readData(char *, qint64) override { return 0; }
+    inline qint64 writeData(const char *data, qint64 len) override;
 
 private:
     QOpenSLESAudioOutput *m_audioDevice;