diff data/model/DenseTimeValueModel.h @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

--- a/data/model/DenseTimeValueModel.h	Wed Jan 23 10:31:40 2019 +0000
+++ b/data/model/DenseTimeValueModel.h	Wed Jan 23 14:43:43 2019 +0000
@@ -79,14 +79,13 @@
                                                         sv_frame_t count)
         const = 0;
 
-    virtual bool canPlay() const { return true; }
-    virtual QString getDefaultPlayClipId() const { return ""; }
+    bool canPlay() const override { return true; }
+    QString getDefaultPlayClipId() const override { return ""; }
 
-    virtual QString toDelimitedDataStringSubset(QString delimiter,
-                                                sv_frame_t f0, sv_frame_t f1)
-        const;
+    QString toDelimitedDataStringSubset(QString delimiter,
+                                        sv_frame_t f0, sv_frame_t f1) const override;
 
-    QString getTypeName() const { return tr("Dense Time-Value"); }
+    QString getTypeName() const override { return tr("Dense Time-Value"); }
 };
 
 #endif