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

Merge from default branch

--- a/data/model/PathModel.h	Wed Jan 23 10:31:40 2019 +0000
+++ b/data/model/PathModel.h	Wed Jan 23 14:43:43 2019 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PATH_MODEL_H_
-#define _PATH_MODEL_H_
+#ifndef SV_PATH_MODEL_H
+#define SV_PATH_MODEL_H
 
 #include "Model.h"
 #include "SparseModel.h"
@@ -71,9 +71,9 @@
     PathModel(sv_samplerate_t sampleRate, int resolution, bool notify = true) :
         SparseModel<PathPoint>(sampleRate, resolution, notify) { }
 
-    virtual void toXml(QTextStream &out,
+    void toXml(QTextStream &out,
                        QString indent = "",
-                       QString extraAttributes = "") const
+                       QString extraAttributes = "") const override
     {
         SparseModel<PathPoint>::toXml
             (out, 
@@ -85,9 +85,9 @@
     /**
      * TabularModel is inherited via SparseModel, but we don't need it here.
      */
-    virtual QString getHeading(int) const { return ""; }
-    virtual bool isColumnTimeValue(int) const { return false; }
-    virtual SortType getSortType(int) const { return SortNumeric; }
+    QString getHeading(int) const override { return ""; }
+    bool isColumnTimeValue(int) const override { return false; }
+    SortType getSortType(int) const override { return SortNumeric; }
 
 };