See ChangeLog

3 files changed, 8 insertions, 21 deletions

diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 89bde276..cf9bdac4 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -21,7 +21,6 @@
 //#include <q3toolbar.h>
 #include <QToolBar>
 //#include <QToolTip>
-#include <q3popupmenu.h>
 #include <q3hbox.h>
 #include <QStringList>
 #include <q3filedialog.h>
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index 90b36ca8..b95b9379 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -15,7 +15,7 @@
 #include <q3whatsthis.h>
 //Added by qt3to4:
 #include <QWheelEvent>
-#include <Q3PopupMenu>
+#include <QMenu>
 
 #include "midieditor.h"
 #include "pcanvas.h"
@@ -117,7 +117,7 @@ class Arranger : public QWidget {
       QToolButton* ib;
       int trackInfoType;
       Splitter* split;
-      Q3PopupMenu* pop;
+      QMenu* pop;
       int songType;
       PosLabel* cursorPos;
       SpinBox* globalTempoSpinBox;
diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp
index 8437563d..d3ea73b5 100644
--- a/muse2/muse/arranger/trackinfo.cpp
+++ b/muse2/muse/arranger/trackinfo.cpp
@@ -5,23 +5,11 @@
 //  (C) Copyright 1999-2004 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <QLayout>
-#include <QComboBox>
-#include <QToolButton>
-#include <QLabel>
 #include <QPalette>
 #include <QColor>
 #include <QMenu>
-#include <QMessageBox>
-//#include <q3hbox.h>
-#include <QCheckBox>
-#include <QPushButton>
-//#include <q3widgetstack.h>
-#include <QLineEdit>
-#include <QTimer>
-//#include <QModelIndex>
-//Added by qt3to4:
 #include <QPixmap>
+
 #include <math.h>
 #include <string.h>
 
@@ -40,7 +28,6 @@
 #include "mixer/amixer.h"
 #include "midi.h"
 #include "midictrl.h"
-#include "xpm/muse_leftside_logo.xpm"
 #include "mixer/astrip.h"
 #include "icons.h"
 #include "app.h"
@@ -359,7 +346,7 @@ void Arranger::genTrackInfo(QWidget* parent)
 
       noTrackInfo          = new QWidget(trackInfo);
       QPixmap *noInfoPix   = new QPixmap(160, 1000); //muse_leftside_logo_xpm);
-      const QPixmap *logo  = new QPixmap(muse_leftside_logo_xpm);
+      const QPixmap *logo  = new QPixmap(*museLeftSideLogo);
       noInfoPix->fill(noTrackInfo->paletteBackgroundColor() );
       copyBlt(noInfoPix, 10, 0, logo, 0,0, logo->width(), logo->height());
       noTrackInfo->setPaletteBackgroundPixmap(*noInfoPix);
@@ -1000,8 +987,9 @@ void Arranger::instrPopup()
 
       if(pop->count() == 0)
         return;
-      int rv = pop->exec(midiTrackInfo->iPatch->mapToGlobal(QPoint(10,5)));
-      if (rv != -1) {
+      QAction *act = pop->exec(midiTrackInfo->iPatch->mapToGlobal(QPoint(10,5)));
+      if (act) {
+            int rv = act->data().toInt();
             MidiPlayEvent ev(0, port, channel, ME_CONTROLLER, CTRL_PROGRAM, rv);
             audio->msgPlayMidiEvent(&ev);
             updateTrackInfo(-1);
@@ -1228,7 +1216,7 @@ void Arranger::genMidiTrackInfo()
 
       connect(midiTrackInfo->iPatch, SIGNAL(released()), SLOT(instrPopup()));
 
-      pop = new Q3PopupMenu(midiTrackInfo->iPatch);
+      pop = new QMenu(midiTrackInfo->iPatch);
       pop->setCheckable(false);
 
       // Removed by Tim. p3.3.9