comparison widgets/MIDIFileImportDialog.h @ 1414:fa986b91d77f

Merge from branch fix-static-analysis

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     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>
 
 #include "data/fileio/MIDIFileReader.h"
 

     Q_OBJECT
 
 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;
 };