converted .ui widgets to Qt4 along with all of editevent

2 files changed, 6 insertions, 7 deletions

diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp
index a69f504e..9bab95be 100644
--- a/muse2/muse/instruments/minstrument.cpp
+++ b/muse2/muse/instruments/minstrument.cpp
@@ -8,7 +8,6 @@
 
 #include <stdio.h>
 
-#include <q3popupmenu.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 
@@ -797,7 +796,7 @@ const char* MidiInstrument::getPatchName(int channel, int prog, MType mode, bool
 //   populatePatchPopup
 //---------------------------------------------------------
 
-void MidiInstrument::populatePatchPopup(Q3PopupMenu* menu, int chan, MType songType, bool drum)
+void MidiInstrument::populatePatchPopup(QMenu* menu, int chan, MType songType, bool drum)
       {
       menu->clear();
       int mask = 0;
@@ -815,7 +814,7 @@ void MidiInstrument::populatePatchPopup(Q3PopupMenu* menu, int chan, MType songT
       if (pg.size() > 1) {
             for (ciPatchGroup i = pg.begin(); i != pg.end(); ++i) {
                   PatchGroup* pgp = *i;
-                  Q3PopupMenu* pm = new Q3PopupMenu(menu);
+                  QMenu* pm = new QMenu(menu);
                   pm->setCheckable(false);
                   pm->setFont(config.fonts[0]);
                   const PatchList& pl = pgp->patches;
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h
index 70c123ec..dcb0deb9 100644
--- a/muse2/muse/instruments/minstrument.h
+++ b/muse2/muse/instruments/minstrument.h
@@ -12,11 +12,11 @@
 #include "globaldefs.h"
 #include <list>
 #include <vector>
-//Added by qt3to4:
-#include <Q3PopupMenu>
+
+#include <QMenu>
 
 class MidiPort;
-class Q3PopupMenu;
+class QMenu;
 class MidiPlayEvent;
 class Xml;
 class EventList;
@@ -106,7 +106,7 @@ class MidiInstrument {
 
       virtual void reset(int, MType);
       virtual const char* getPatchName(int,int,MType,bool);
-      virtual void populatePatchPopup(Q3PopupMenu*, int, MType, bool);
+      virtual void populatePatchPopup(QMenu*, int, MType, bool);
       void read(Xml&);
       void write(int level, Xml&);
       PatchGroupList* groups()        { return &pg; }