Mercurial > hg > svcore

changeset 1693:718ce5fb9fec single-point

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 25 Apr 2019 11:30:51 +0100
parents 73077ec5aed6 (diff) d08b560102a1 (current diff)
children a9d0b5a2c242
files
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/DenseThreeDimensionalModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/DenseThreeDimensionalModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -120,7 +120,7 @@
 
     QString getTypeName() const override { return tr("Dense 3-D"); }
 
-    virtual int getCompletion() const = 0;
+    virtual int getCompletion() const override = 0;
 
     /*
        TabularModel methods.
--- a/data/model/ImageModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/ImageModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -55,7 +55,7 @@
     }
 
     QString getTypeName() const override { return tr("Image"); }
-    bool isSparse() const { return true; }
+    bool isSparse() const override { return true; }
     bool isOK() const override { return true; }
 
     sv_frame_t getStartFrame() const override {
@@ -71,7 +71,7 @@
     sv_samplerate_t getSampleRate() const override { return m_sampleRate; }
     int getResolution() const { return m_resolution; }
     
-    int getCompletion() const { return m_completion; }
+    int getCompletion() const override { return m_completion; }
 
     void setCompletion(int completion, bool update = true) {
         
--- a/data/model/NoteModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/NoteModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -96,7 +96,7 @@
 
     QString getTypeName() const override { return tr("Note"); }
     Subtype getSubtype() const { return m_subtype; }
-    bool isSparse() const { return true; }
+    bool isSparse() const override { return true; }
     bool isOK() const override { return true; }
     
     sv_frame_t getStartFrame() const override {
--- a/data/model/RegionModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/RegionModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -77,7 +77,7 @@
     }
 
     QString getTypeName() const override { return tr("Region"); }
-    bool isSparse() const { return true; }
+    bool isSparse() const override { return true; }
     bool isOK() const override { return true; }
 
     sv_frame_t getStartFrame() const override {
--- a/data/model/SparseOneDimensionalModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/SparseOneDimensionalModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -61,7 +61,7 @@
     }
 
     QString getTypeName() const override { return tr("Sparse 1-D"); }
-    bool isSparse() const { return true; }
+    bool isSparse() const override { return true; }
     bool isOK() const override { return true; }
 
     sv_frame_t getStartFrame() const override {
--- a/data/model/SparseTimeValueModel.h	Wed Apr 24 11:44:32 2019 +0100
+++ b/data/model/SparseTimeValueModel.h	Thu Apr 25 11:30:51 2019 +0100
@@ -81,7 +81,7 @@
     }
 
     QString getTypeName() const override { return tr("Sparse Time-Value"); }
-    bool isSparse() const { return true; }
+    bool isSparse() const override { return true; }
     bool isOK() const override { return true; }
 
     sv_frame_t getStartFrame() const override {