Mercurial > hg > svapp

diff framework/TransformUserConfigurator.h @ 644:6fd0ebfd2bbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch fix-static-analysis
author Chris Cannam
date Wed, 09 Jan 2019 15:25:09 +0000
parents 26a0cb8335e3
children 7540733f5480
line wrap: on
line diff
--- a/framework/TransformUserConfigurator.h	Wed Jan 09 14:42:25 2019 +0000
+++ b/framework/TransformUserConfigurator.h	Wed Jan 09 15:25:09 2019 +0000
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TRANSFORM_USER_CONFIGURATOR_H_
-#define _TRANSFORM_USER_CONFIGURATOR_H_
+#ifndef SV_TRANSFORM_USER_CONFIGURATOR_H
+#define SV_TRANSFORM_USER_CONFIGURATOR_H
 
 #include "transform/ModelTransformerFactory.h"
 
@@ -22,7 +22,7 @@
 public:
     // This is of course absolutely gross
 
-    virtual bool configure(ModelTransformer::Input &input,
+    bool configure(ModelTransformer::Input &input,
                            Transform &transform,
                            Vamp::PluginBase *plugin,
                            Model *&inputModel,
@@ -31,7 +31,7 @@
                            sv_frame_t duration,
                            const QMap<QString, Model *> &modelMap,
                            QStringList candidateModelNames,
-                           QString defaultModelName);
+                           QString defaultModelName) override;
 
     static void setParentWidget(QWidget *);