Mercurial > hg > svgui

diff widgets/MIDIFileImportDialog.h @ 1414:fa986b91d77f

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:24:51 +0000
parents 05d614f6e46d
children
line wrap: on
line diff
--- a/widgets/MIDIFileImportDialog.h	Wed Jan 09 14:41:52 2019 +0000
+++ b/widgets/MIDIFileImportDialog.h	Wed Jan 09 15:24:51 2019 +0000
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MIDI_FILE_IMPORT_DIALOG_H_
-#define _MIDI_FILE_IMPORT_DIALOG_H_
+#ifndef SV_MIDI_FILE_IMPORT_DIALOG_H
+#define SV_MIDI_FILE_IMPORT_DIALOG_H
 
 #include <QObject>
 
@@ -27,11 +27,11 @@
 public:
     MIDIFileImportDialog(QWidget *parent = 0);
 
-    virtual TrackPreference getTrackImportPreference
+    TrackPreference getTrackImportPreference
     (QStringList trackNames, bool haveSomePercussion,
-     QString &singleTrack) const;
+     QString &singleTrack) const override;
 
-    virtual void showError(QString error);
+    void showError(QString error) override;
 
 protected:
     QWidget *m_parent;