diff options
| author | Florian Jung <flo@windfisch.org> | 2012-03-15 18:21:23 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-03-15 18:21:23 +0000 |
| commit | 27b7bf6815cda7abb67026c37b3e44daee1803cb (patch) | |
| tree | 0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/muse/instruments/minstrument.h | |
| parent | 2d6f113a10eb485694e20a78500f650776d701e3 (diff) | |
merged with trunk
Diffstat (limited to 'muse2/muse/instruments/minstrument.h')
| -rw-r--r-- | muse2/muse/instruments/minstrument.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h index 823b9895..4d5ad8c2 100644 --- a/muse2/muse/instruments/minstrument.h +++ b/muse2/muse/instruments/minstrument.h @@ -233,7 +233,6 @@ class MidiInstrument { virtual void reset(int, MType); virtual QString getPatchName(int,int,MType,bool); - //virtual void populatePatchPopup(QMenu*, int, MType, bool); virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool); void read(Xml&); void write(int level, Xml&); @@ -264,7 +263,7 @@ extern void removeMidiInstrument(const MidiInstrument* instr); } // namespace MusECore //namespace MusEGui { -//extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool); +//extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool); DELETETHIS //} #endif |