diff data/fileio/MP3FileReader.h @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

--- a/data/fileio/MP3FileReader.h	Wed Jan 23 10:31:40 2019 +0000
+++ b/data/fileio/MP3FileReader.h	Wed Jan 23 14:43:43 2019 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MP3_FILE_READER_H_
-#define _MP3_FILE_READER_H_
+#ifndef SV_MP3_FILE_READER_H
+#define SV_MP3_FILE_READER_H
 
 #ifdef HAVE_MAD
 
@@ -74,21 +74,21 @@
                   ProgressReporter *reporter = 0);
     virtual ~MP3FileReader();
 
-    virtual QString getError() const { return m_error; }
+    QString getError() const override { return m_error; }
 
-    virtual QString getLocation() const { return m_source.getLocation(); }
-    virtual QString getTitle() const { return m_title; }
-    virtual QString getMaker() const { return m_maker; }
-    virtual TagMap getTags() const { return m_tags; }
+    QString getLocation() const override { return m_source.getLocation(); }
+    QString getTitle() const override { return m_title; }
+    QString getMaker() const override { return m_maker; }
+    TagMap getTags() const override { return m_tags; }
     
     static void getSupportedExtensions(std::set<QString> &extensions);
     static bool supportsExtension(QString ext);
     static bool supportsContentType(QString type);
     static bool supports(FileSource &source);
 
-    virtual int getDecodeCompletion() const { return m_completion; }
+    int getDecodeCompletion() const override { return m_completion; }
 
-    virtual bool isUpdating() const {
+    bool isUpdating() const override {
         return m_decodeThread && m_decodeThread->isRunning();
     }
 
@@ -144,7 +144,7 @@
     {
     public:
         DecodeThread(MP3FileReader *reader) : m_reader(reader) { }
-        virtual void run();
+        void run() override;
 
     protected:
         MP3FileReader *m_reader;