# HG changeset patch
# User Chris Cannam
# Date 1556188251 -3600
# Node ID 718ce5fb9fec8db4ccdac347c9a1bfd876b9365c
# Parent  73077ec5aed62c406aaf57df0a1e8295e2724a47# Parent  d08b560102a14744b6b7f4dcdbec0902fa54835b
Merge

diff -r d08b560102a1 -r 718ce5fb9fec data/model/DenseThreeDimensionalModel.h
--- 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.
diff -r d08b560102a1 -r 718ce5fb9fec data/model/ImageModel.h
--- 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) {
         
diff -r d08b560102a1 -r 718ce5fb9fec data/model/NoteModel.h
--- 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 {
diff -r d08b560102a1 -r 718ce5fb9fec data/model/RegionModel.h
--- 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 {
diff -r d08b560102a1 -r 718ce5fb9fec data/model/SparseOneDimensionalModel.h
--- 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 {
diff -r d08b560102a1 -r 718ce5fb9fec data/model/SparseTimeValueModel.h
--- 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 {