diff audio/PlaySpeedRangeMapper.h @ 644:6fd0ebfd2bbe

Merge from branch fix-static-analysis
author Chris Cannam
date Wed, 09 Jan 2019 15:25:09 +0000
parents 26a0cb8335e3
children
line wrap: on
line diff
--- a/audio/PlaySpeedRangeMapper.h	Wed Jan 09 14:42:25 2019 +0000
+++ b/audio/PlaySpeedRangeMapper.h	Wed Jan 09 15:25:09 2019 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLAY_SPEED_RANGE_MAPPER_H_
-#define _PLAY_SPEED_RANGE_MAPPER_H_
+#ifndef SV_PLAY_SPEED_RANGE_MAPPER_H
+#define SV_PLAY_SPEED_RANGE_MAPPER_H
 
 #include "base/RangeMapper.h"
 
@@ -26,11 +26,11 @@
     int getMinPosition() const { return m_minpos; }
     int getMaxPosition() const { return m_maxpos; }
     
-    virtual int getPositionForValue(double value) const;
-    virtual int getPositionForValueUnclamped(double value) const;
+    int getPositionForValue(double value) const override;
+    int getPositionForValueUnclamped(double value) const override;
 
-    virtual double getValueForPosition(int position) const;
-    virtual double getValueForPositionUnclamped(int position) const;
+    double getValueForPosition(int position) const override;
+    double getValueForPositionUnclamped(int position) const override;
 
     int getPositionForFactor(double factor) const;
     double getValueForFactor(double factor) const;
@@ -38,7 +38,7 @@
     double getFactorForPosition(int position) const;
     double getFactorForValue(double value) const;
 
-    virtual QString getUnit() const;
+    QString getUnit() const override;
     
 protected:
     int m_minpos;