7 files changed, 42 insertions, 42 deletions

diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
index 94595751b..3d1ffe66a 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
@@ -62,26 +62,26 @@ class Q_MULTIMEDIA_EXPORT QMediaNetworkPlaylistProvider : public QMediaPlaylistP
     Q_OBJECT
 public:
     QMediaNetworkPlaylistProvider(QObject *parent=0);
-    virtual ~QMediaNetworkPlaylistProvider();
+    ~QMediaNetworkPlaylistProvider();
 
-    virtual bool load(const QNetworkRequest &request, const char *format = 0);
+    bool load(const QNetworkRequest &request, const char *format = 0) override;
 
-    virtual int mediaCount() const;
-    virtual QMediaContent media(int pos) const;
+    int mediaCount() const override;
+    QMediaContent media(int pos) const override;
 
-    virtual bool isReadOnly() const;
+    bool isReadOnly() const override;
 
-    virtual bool addMedia(const QMediaContent &content);
-    virtual bool addMedia(const QList<QMediaContent> &items);
-    virtual bool insertMedia(int pos, const QMediaContent &content);
-    virtual bool insertMedia(int pos, const QList<QMediaContent> &items);
-    virtual bool moveMedia(int from, int to);
-    virtual bool removeMedia(int pos);
-    virtual bool removeMedia(int start, int end);
-    virtual bool clear();
+    bool addMedia(const QMediaContent &content) override;
+    bool addMedia(const QList<QMediaContent> &items) override;
+    bool insertMedia(int pos, const QMediaContent &content) override;
+    bool insertMedia(int pos, const QList<QMediaContent> &items) override;
+    bool moveMedia(int from, int to) override;
+    bool removeMedia(int pos) override;
+    bool removeMedia(int start, int end) override;
+    bool clear() override;
 
 public Q_SLOTS:
-    virtual void shuffle();
+    void shuffle() override;
 
 private:
     Q_DISABLE_COPY(QMediaNetworkPlaylistProvider)
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index f8d91b999..f23a94104 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -157,7 +157,7 @@ public:
 
     QNetworkConfiguration currentNetworkConfiguration() const;
 
-    QMultimedia::AvailabilityStatus availability() const;
+    QMultimedia::AvailabilityStatus availability() const override;
 
     QAudio::Role audioRole() const;
     void setAudioRole(QAudio::Role audioRole);
@@ -205,8 +205,8 @@ Q_SIGNALS:
 
     void networkConfigurationChanged(const QNetworkConfiguration &configuration);
 public:
-    virtual bool bind(QObject *);
-    virtual void unbind(QObject *);
+    bool bind(QObject *) override;
+    void unbind(QObject *) override;
 
 private:
     Q_DISABLE_COPY(QMediaPlayer)
diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index 05ab8f42e..b16e734f8 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -70,7 +70,7 @@ public:
     explicit QMediaPlaylist(QObject *parent = Q_NULLPTR);
     virtual ~QMediaPlaylist();
 
-    QMediaObject *mediaObject() const;
+    QMediaObject *mediaObject() const override;
 
     PlaybackMode playbackMode() const;
     void setPlaybackMode(PlaybackMode mode);
@@ -129,7 +129,7 @@ Q_SIGNALS:
     void loadFailed();
 
 protected:
-    bool setMediaObject(QMediaObject *object);
+    bool setMediaObject(QMediaObject *object) override;
     QMediaPlaylistPrivate *d_ptr;
 
 private:
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index 0c3375ba7..8e081dd67 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -141,26 +141,26 @@ public:
         connect(m_navigator, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)), SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)));
     }
 
-    virtual ~QMediaNetworkPlaylistControl() {};
+    ~QMediaNetworkPlaylistControl() {}
 
-    QMediaPlaylistProvider* playlistProvider() const { return m_navigator->playlist(); }
-    bool setPlaylistProvider(QMediaPlaylistProvider *mediaPlaylist)
+    QMediaPlaylistProvider* playlistProvider() const override { return m_navigator->playlist(); }
+    bool setPlaylistProvider(QMediaPlaylistProvider *mediaPlaylist) override
     {
         m_navigator->setPlaylist(mediaPlaylist);
         emit playlistProviderChanged();
         return true;
     }
 
-    int currentIndex() const { return m_navigator->currentIndex(); }
-    void setCurrentIndex(int position) { m_navigator->jump(position); }
-    int nextIndex(int steps) const { return m_navigator->nextIndex(steps); }
-    int previousIndex(int steps) const { return m_navigator->previousIndex(steps); }
+    int currentIndex() const override { return m_navigator->currentIndex(); }
+    void setCurrentIndex(int position) override { m_navigator->jump(position); }
+    int nextIndex(int steps) const override { return m_navigator->nextIndex(steps); }
+    int previousIndex(int steps) const override { return m_navigator->previousIndex(steps); }
 
-    void next() { m_navigator->next(); }
-    void previous() { m_navigator->previous(); }
+    void next() override { m_navigator->next(); }
+    void previous() override { m_navigator->previous(); }
 
-    QMediaPlaylist::PlaybackMode playbackMode() const { return m_navigator->playbackMode(); }
-    void setPlaybackMode(QMediaPlaylist::PlaybackMode mode) { m_navigator->setPlaybackMode(mode); }
+    QMediaPlaylist::PlaybackMode playbackMode() const override { return m_navigator->playbackMode(); }
+    void setPlaybackMode(QMediaPlaylist::PlaybackMode mode) override { m_navigator->setPlaybackMode(mode); }
 
 private:
     QMediaPlaylistNavigator *m_navigator;
diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h
index 73281b2bf..1e157d135 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin_p.h
+++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h
@@ -107,17 +107,17 @@ Q_OBJECT
 Q_INTERFACES(QMediaPlaylistIOInterface)
 public:
     explicit QMediaPlaylistIOPlugin(QObject *parent = 0);
-    virtual ~QMediaPlaylistIOPlugin();
+    ~QMediaPlaylistIOPlugin();
 
-    virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const = 0;
-    virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const = 0;
+    bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const override = 0;
+    bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const override = 0;
 
-    virtual bool canWrite(QIODevice *device, const QByteArray &format) const = 0;
+    bool canWrite(QIODevice *device, const QByteArray &format) const override = 0;
 
-    virtual QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) = 0;
-    virtual QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) = 0;
+    QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) override = 0;
+    QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) override = 0;
 
-    virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
+    QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) override = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 1da7329ec..192fd463c 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -50,9 +50,9 @@ class QMediaPlaylistNullProvider : public QMediaPlaylistProvider
 {
 public:
     QMediaPlaylistNullProvider() :QMediaPlaylistProvider() {}
-    virtual ~QMediaPlaylistNullProvider() {}
-    virtual int mediaCount() const {return 0;}
-    virtual QMediaContent media(int) const { return QMediaContent(); }
+    ~QMediaPlaylistNullProvider() {}
+    int mediaCount() const override {return 0;}
+    QMediaContent media(int) const override { return QMediaContent(); }
 };
 
 Q_GLOBAL_STATIC(QMediaPlaylistNullProvider, _q_nullMediaPlaylist)
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp
index 424e54d34..d0617d2cf 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/src/multimedia/playback/qplaylistfileparser.cpp
@@ -134,7 +134,7 @@ public:
     C:\Documents and Settings\I\My Music\Greatest Hits\Example.ogg
 
      */
-    bool parseLineImpl(int lineIndex, const QString& line, const QUrl& root)
+    bool parseLineImpl(int lineIndex, const QString& line, const QUrl& root) override
     {
         if (line[0] == '#' ) {
             if (m_extendedFormat) {
@@ -241,7 +241,7 @@ NumberOfEntries=2
 
 Version=2
 */
-    bool parseLineImpl(int, const QString &line, const QUrl &root)
+    bool parseLineImpl(int, const QString &line, const QUrl &root) override
     {
         // We ignore everything but 'File' entries, since that's the only thing we care about.
         if (!line.startsWith(QLatin1String("File")))