Mercurial > hg > svcore
diff data/midi/MIDIEvent.h @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | ad5f892c0c4d |
children | c3b5564cfb78 |
line wrap: on
line diff
--- a/data/midi/MIDIEvent.h Wed Jan 23 10:31:40 2019 +0000 +++ b/data/midi/MIDIEvent.h Wed Jan 23 14:43:43 2019 +0000 @@ -19,8 +19,8 @@ This file copyright 2000-2006 Richard Bown and Chris Cannam. */ -#ifndef _MIDI_EVENT_H_ -#define _MIDI_EVENT_H_ +#ifndef SV_MIDI_EVENT_H +#define SV_MIDI_EVENT_H #include <QString> #include <string> @@ -226,7 +226,7 @@ } virtual ~MIDIException() throw() { } - virtual const char *what() const throw() { + const char *what() const throw() override { return m_message.toLocal8Bit().data(); }