Applied patch by Orcan converting populateAddSynth().

Changed all obsoleted setMargin() calls to setContentsMargins(). 

3 files changed, 32 insertions, 22 deletions

diff --git a/muse2/muse/arranger/alayout.h b/muse2/muse/arranger/alayout.h
index 08eb1727..05d418b5 100644
--- a/muse2/muse/arranger/alayout.h
+++ b/muse2/muse/arranger/alayout.h
@@ -33,7 +33,7 @@ class TLLayout : public QLayout
 
     public:
       //TLLayout(QWidget *parent) : QLayout(parent, 0, -1) {}
-      TLLayout(QWidget *parent) : QLayout(parent) { setMargin(0); setSpacing(-1); }
+      TLLayout(QWidget *parent) : QLayout(parent) { setContentsMargins(0, 0, 0, 0); setSpacing(-1); }
       ~TLLayout() { clear(); }
 
       void addItem(QLayoutItem *item) { ilist.append(item); }
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index a3c23a0a..422980f1 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -332,7 +332,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       egrid->setColStretch(0, 50);
       egrid->setRowStretch(2, 50);
       //egrid->setContentsMargins(0, 0, 0, 0);  
-      egrid->setMargin(0);  
+      egrid->setContentsMargins(0, 0, 0, 0);  
       egrid->setSpacing(0);  
 
       time = new MTScale(&_raster, editor, xscale);
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 618dc2e6..d2da81b1 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -50,7 +50,7 @@
 #include "dssihost.h"
 #endif
 
-extern Q3PopupMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0);
+extern QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0);
 
 static const int MIN_TRACKHEIGHT = 20;
 static const int WHEEL_DELTA = 120;
@@ -795,30 +795,40 @@ void TList::mousePressEvent(QMouseEvent* ev)
       TrackColumn col = TrackColumn(header->sectionAt(x));
       if (t == 0) {
             if (button == Qt::RightButton) {
-                  Q3PopupMenu* p = new Q3PopupMenu(this);
+                  QMenu* p = new QMenu(this);
                   p->clear();
-                  p->insertItem(*addtrack_addmiditrackIcon,
-                     tr("Add Midi Track"), Track::MIDI, 0);
-                  p->insertItem(*addtrack_drumtrackIcon,
-                     tr("Add Drum Track"),Track::DRUM, 1);
-                  p->insertItem(*addtrack_wavetrackIcon,
-                     tr("Add Wave Track"), Track::WAVE, 2);
-                  p->insertItem(*addtrack_audiooutputIcon,
-                     tr("Add Output"), Track::AUDIO_OUTPUT, 3);
-                  p->insertItem(*addtrack_audiogroupIcon,
-                     tr("Add Group"), Track::AUDIO_GROUP, 4);
-                  p->insertItem(*addtrack_audioinputIcon,
-                     tr("Add Input"), Track::AUDIO_INPUT, 5);
-                  p->insertItem(*addtrack_auxsendIcon,
-                     tr("Add Aux Send"), Track::AUDIO_AUX, 6);
+                  QAction* midi = p->addAction(*addtrack_addmiditrackIcon,
+					       tr("Add Midi Track"));
+		  midi->setData(Track::MIDI);
+                  QAction* drum = p->addAction(*addtrack_drumtrackIcon,
+					       tr("Add Drum Track"));
+		  drum->setData(Track::DRUM);
+                  QAction* wave = p->addAction(*addtrack_wavetrackIcon,
+						tr("Add Wave Track"));
+		  wave->setData(Track::WAVE);
+                  QAction* aoutput = p->addAction(*addtrack_audiooutputIcon,
+						  tr("Add Output"));
+		  aoutput->setData(Track::AUDIO_OUTPUT);
+                  QAction* agroup = p->addAction(*addtrack_audiogroupIcon,
+						 tr("Add Group"));
+		  agroup->setData(Track::AUDIO_GROUP);
+                  QAction* ainput = p->addAction(*addtrack_audioinputIcon,
+						 tr("Add Input"));
+		  ainput->setData(Track::AUDIO_INPUT);
+                  QAction* aaux = p->addAction(*addtrack_auxsendIcon,
+					       tr("Add Aux Send"));
+		  aaux->setData(Track::AUDIO_AUX);
                   
                   // Create a sub-menu and fill it with found synth types. Make p the owner.
-                  Q3PopupMenu* synp = populateAddSynth(p);
+                  QMenu* synp = populateAddSynth(p);
+		  synp->setIcon(*synthIcon);
+		  synp->setTitle(QT_TR_NOOP("Add Synth"));
+
                   // Add the 'Add Synth' sub-menu to the menu.
-                  p->insertItem(*synthIcon, tr("Add Synth"), synp, Track::AUDIO_SOFTSYNTH);
-                  
+		  p->addMenu(synp);
+
                   // Show the menu
-                  int n = p->exec(ev->globalPos(), 0);
+                  int n = p->exec(ev->globalPos(), 0)->data().toInt();
 
                   // Valid click?
                   if((n >= 0) && ((Track::TrackType)n != Track::AUDIO_SOFTSYNTH))