comparison data/fileio/FileReadThread.h @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FILE_READ_THREAD_H_
-#define _FILE_READ_THREAD_H_
+#ifndef SV_FILE_READ_THREAD_H
+#define SV_FILE_READ_THREAD_H
 
 #include "base/Thread.h"
 
 #include <QMutex>
 #include <QWaitCondition>

     Q_OBJECT
 
 public:
     FileReadThread();
 
-    virtual void run();
+    void run() override;
     virtual void finish();
 
     struct Request {
         int fd;
         QMutex *mutex; // used to synchronise access to fd; may be null