See ChangeLog

8 files changed, 112 insertions, 77 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index e6c380b4..17c818fa 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -13,11 +13,11 @@
 #include <qmenubar.h>
 #include <qaction.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 #include <QCloseEvent>
-#include <Q3PopupMenu>
-#include <Q3ActionGroup>
-#include <Q3Action>
+#include <QMenu>
+#include <QActionGroup>
+#include <QAction>
 
 #include "app.h"
 #include "amixer.h"
@@ -29,7 +29,7 @@
 #include "gconfig.h"
 #include "xml.h"
 
-extern void populateAddTrack(Q3PopupMenu* addTrack);
+extern void populateAddTrack(QMenu* addTrack);
 
 #define __WIDTH_COMPENSATION 4
 
@@ -44,7 +44,7 @@ extern void populateAddTrack(Q3PopupMenu* addTrack);
 
 //AudioMixerApp::AudioMixerApp(QWidget* parent)
 AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
-   : Q3MainWindow(parent, "mixer")
+   : QMainWindow(parent, "mixer")
       {
       cfg = c;
       oldAuxsSize = 0;
@@ -55,26 +55,39 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       //printf("AudioMixerApp::AudioMixerApp setting caption:%s\n", cfg->name.latin1());
       setCaption(cfg->name);
 
-      Q3PopupMenu* menuConfig = new Q3PopupMenu(this);
+      QMenu* menuConfig = new QMenu(this);
       menuBar()->insertItem(tr("&Create"), menuConfig);
       populateAddTrack(menuConfig);
       
-      menuView = new Q3PopupMenu(this);
+      menuView = new QMenu(this);
       menuBar()->insertItem(tr("&View"), menuView);
       routingId = menuView->insertItem(tr("Routing"), this, SLOT(toggleRouteDialog()));
 
       menuView->insertSeparator();
-      
-      Q3ActionGroup* actionItems = new Q3ActionGroup(this, "actionItems", false);
+
+      // ORCAN - CHECK: 
+      //QActionGroup* actionItems = new QActionGroup(this, "actionItems", false);
+      QActionGroup* actionItems = new QActionGroup(this);
+      actionItems->setExclusive(false);
       
       /*
       showMidiTracksId = new QAction(tr("Show Midi Tracks"), 0, menuView);
       showDrumTracksId = new QAction(tr("Show Drum Tracks"), 0, menuView);
       showWaveTracksId = new QAction(tr("Show Wave Tracks"), 0, menuView);
       */
-      showMidiTracksId = new Q3Action(tr("Show Midi Tracks"), 0, actionItems);
-      showDrumTracksId = new Q3Action(tr("Show Drum Tracks"), 0, actionItems);
-      showWaveTracksId = new Q3Action(tr("Show Wave Tracks"), 0, actionItems);
+
+
+
+      // CHECK - ORCAN
+      //showMidiTracksId = new QAction(tr("Show Midi Tracks"), 0, actionItems);
+      //showDrumTracksId = new QAction(tr("Show Drum Tracks"), 0, actionItems);
+      //showWaveTracksId = new QAction(tr("Show Wave Tracks"), 0, actionItems);
+      showMidiTracksId = new QAction(tr("Show Midi Tracks"), actionItems);
+      showDrumTracksId = new QAction(tr("Show Drum Tracks"), actionItems);
+      showWaveTracksId = new QAction(tr("Show Wave Tracks"), actionItems);
+      
+
+
       //showMidiTracksId->addTo(menuView);
       //showDrumTracksId->addTo(menuView);
       //showWaveTracksId->addTo(menuView);
@@ -89,11 +102,23 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       showAuxTracksId = new QAction(tr("Show Auxs"), 0, menuView);
       showSyntiTracksId = new QAction(tr("Show Synthesizers"), 0, menuView);
       */
-      showInputTracksId = new Q3Action(tr("Show Inputs"), 0, actionItems);
-      showOutputTracksId = new Q3Action(tr("Show Outputs"), 0, actionItems);
-      showGroupTracksId = new Q3Action(tr("Show Groups"), 0, actionItems);
-      showAuxTracksId = new Q3Action(tr("Show Auxs"), 0, actionItems);
-      showSyntiTracksId = new Q3Action(tr("Show Synthesizers"), 0, actionItems);
+
+
+      // CHECK - ORCAN
+      //showInputTracksId = new QAction(tr("Show Inputs"), 0, actionItems);
+      //showOutputTracksId = new QAction(tr("Show Outputs"), 0, actionItems);
+      //showGroupTracksId = new QAction(tr("Show Groups"), 0, actionItems);
+      //showAuxTracksId = new QAction(tr("Show Auxs"), 0, actionItems);
+      //showSyntiTracksId = new QAction(tr("Show Synthesizers"), 0, actionItems);
+      showInputTracksId = new QAction(tr("Show Inputs"), actionItems);
+      showOutputTracksId = new QAction(tr("Show Outputs"), actionItems);
+      showGroupTracksId = new QAction(tr("Show Groups"), actionItems);
+      showAuxTracksId = new QAction(tr("Show Auxs"), actionItems);
+      showSyntiTracksId = new QAction(tr("Show Synthesizers"), actionItems);
+
+
+
+
       //showInputTracksId->addTo(menuView);
       //showOutputTracksId->addTo(menuView);
       //showGroupTracksId->addTo(menuView);
@@ -121,13 +146,16 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       connect(showSyntiTracksId, SIGNAL(toggled(bool)), SLOT(showSyntiTracksChanged(bool)));      
               
       actionItems->addTo(menuView);
-      view = new Q3ScrollView(this);
+      view = new QScrollArea(this);
       setCentralWidget(view);
       central = new QWidget(view);
-      view->setResizePolicy(Q3ScrollView::AutoOneFit);
-      view->setVScrollBarMode(Q3ScrollView::AlwaysOff);
+      // ORCAN - FIXME
+      /*
+      view->setResizePolicy(QScrollView::AutoOneFit);
+      view->setVScrollBarMode(QScrollView::AlwaysOff);
       view->addChild(central);
-      layout = new Q3HBoxLayout(central);
+      */
+      layout = new QHBoxLayout(central);
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
       connect(muse, SIGNAL(configChanged()), SLOT(configChanged()));
       song->update();  // calls update mixer
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index f6588ddb..b6650b0f 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -9,17 +9,17 @@
 #ifndef __AMIXER_H__
 #define __AMIXER_H__
 
-#include <qlayout.h>
+#include <QLayout>
 #include <qpixmap.h>
-#include <q3listbox.h>
+//#include <q3listbox.h>
 #include <qtooltip.h>
-#include <q3frame.h>
+//#include <q3frame.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <Q3PopupMenu>
+#include <QMenu>
 #include <QCloseEvent>
-#include <Q3Action>
+#include <QAction>
 
 #include "cobject.h"
 #include "synth.h"
@@ -28,8 +28,9 @@
 
 class Xml;
 class QWidget;
-class Q3HBoxLayout;
-class Q3ScrollView;
+class QHBoxLayout;
+// ORCAN - CHECK
+class QScrollArea;
 class AudioTrack;
 class Meter;
 class Track;
@@ -40,7 +41,7 @@ class Knob;
 class DoubleLabel;
 class ComboBox;
 class RouteDialog;
-class Q3PopupMenu;
+class QMenu;
 class Strip;
 
 struct MixerConfig;
@@ -53,28 +54,28 @@ typedef std::list<Strip*> StripList;
 //   AudioMixerApp
 //---------------------------------------------------------
 
-class AudioMixerApp : public Q3MainWindow {
+class AudioMixerApp : public QMainWindow {
       //QString name;
       MixerConfig* cfg;
       StripList stripList;
-      Q3ScrollView* view;
+      QScrollArea* view;
       QWidget* central;
-      Q3HBoxLayout* lbox;
+      QHBoxLayout* lbox;
       //Strip* master;
-      Q3HBoxLayout* layout;
-      Q3PopupMenu* menuView;
+      QHBoxLayout* layout;
+      QMenu* menuView;
       RouteDialog* routingDialog;
       int routingId;
       int oldAuxsSize;
 
-      Q3Action* showMidiTracksId;
-      Q3Action* showDrumTracksId;
-      Q3Action* showInputTracksId;
-      Q3Action* showOutputTracksId;
-      Q3Action* showWaveTracksId;
-      Q3Action* showGroupTracksId;
-      Q3Action* showAuxTracksId;
-      Q3Action* showSyntiTracksId;
+      QAction* showMidiTracksId;
+      QAction* showDrumTracksId;
+      QAction* showInputTracksId;
+      QAction* showOutputTracksId;
+      QAction* showWaveTracksId;
+      QAction* showGroupTracksId;
+      QAction* showAuxTracksId;
+      QAction* showSyntiTracksId;
 
       Q_OBJECT
 
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index c7d2d4f0..56e1e3eb 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -25,8 +25,11 @@
 #include <qevent.h>
 #include <qwidget.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
+//#include <Q3HBoxLayout>
+//#include <Q3GridLayout>
+
+#include <QHBoxLayout>
+#include <QGridLayout>
 
 #include "app.h"
 #include "globals.h"
@@ -644,7 +647,7 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
       plb->setFixedWidth(STRIP_WIDTH/2);
       plb->setAlignment(Qt::AlignCenter);
 
-      Q3GridLayout* pangrid = new Q3GridLayout(0, 2, 2, 0, 0, "pangrid");
+      QGridLayout* pangrid = new QGridLayout(0, 2, 2, 0, 0, "pangrid");
       pangrid->addWidget(plb, 0, 0);
       pangrid->addWidget(pl, 1, 0);
       pangrid->addMultiCellWidget(knob, 0, 1, 1, 1);
@@ -723,7 +726,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //    mono/stereo  pre/post
       //---------------------------------------------------
 
-      Q3HBoxLayout* ppBox = new Q3HBoxLayout(0);
+      QHBoxLayout* ppBox = new QHBoxLayout(0);
       stereo  = new QToolButton(this);
       stereo->setFont(config.fonts[1]);
       QIcon stereoSet;
@@ -779,7 +782,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //    slider, label, meter
       //---------------------------------------------------
 
-      sliderGrid = new Q3GridLayout(this); // ddskrjo this
+      sliderGrid = new QGridLayout(this); // ddskrjo this
       sliderGrid->setRowStretch(0, 100);
 
       //slider = new Slider(this);
@@ -849,8 +852,8 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
 
       Track::TrackType type = t->type();
 
-      Q3HBoxLayout* smBox1 = new Q3HBoxLayout(0);
-      Q3HBoxLayout* smBox2 = new Q3HBoxLayout(0);
+      QHBoxLayout* smBox1 = new QHBoxLayout(0);
+      QHBoxLayout* smBox2 = new QHBoxLayout(0);
 
       mute  = new QToolButton(this);
       
@@ -919,7 +922,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //    routing
       //---------------------------------------------------
 
-      Q3HBoxLayout* rBox = new Q3HBoxLayout(0);
+      QHBoxLayout* rBox = new QHBoxLayout(0);
       if (type != Track::AUDIO_AUX) {
             iR = new QToolButton(this);
             iR->setFont(config.fonts[1]);
diff --git a/muse2/muse/mixer/meter.cpp b/muse2/muse/mixer/meter.cpp
index 14b20a18..fc010a33 100644
--- a/muse2/muse/mixer/meter.cpp
+++ b/muse2/muse/mixer/meter.cpp
@@ -12,7 +12,7 @@
 //Added by qt3to4:
 #include <QResizeEvent>
 #include <QMouseEvent>
-#include <Q3Frame>
+#include <QFrame>
 
 #include "meter.h"
 #include "gconfig.h"
@@ -23,7 +23,7 @@
 //---------------------------------------------------------
 
 Meter::Meter(QWidget* parent, MeterType type)
-   : Q3Frame(parent, "", Qt::WNoAutoErase)
+   : QFrame(parent, Qt::WNoAutoErase)
       {
       mtype = type;
       overflow    = false;
diff --git a/muse2/muse/mixer/meter.h b/muse2/muse/mixer/meter.h
index fc447147..719ab701 100644
--- a/muse2/muse/mixer/meter.h
+++ b/muse2/muse/mixer/meter.h
@@ -9,13 +9,14 @@
 #ifndef __METER_H__
 #define __METER_H__
 
-#include <q3frame.h>
+//#include <q3frame.h>
+#include <QFrame>
 #include <qpixmap.h>
 //Added by qt3to4:
 #include <QResizeEvent>
 #include <QMouseEvent>
 
-class Meter : public Q3Frame {
+class Meter : public QFrame {
    public:
       enum MeterType {DBMeter, LinMeter};
    private:  
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index 10d9ddf4..92d2d02f 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -8,7 +8,7 @@
 
 #include <fastlog.h>
 
-#include <qlayout.h>
+#include <QLayout>
 #include <qapplication.h>
 #include <qdialog.h>
 #include <qtoolbutton.h>
@@ -20,8 +20,8 @@
 //#include <qpopupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
 
 #include <math.h>
 #include "app.h"
@@ -144,7 +144,7 @@ void MidiStrip::addKnob(int idx, const QString& tt, const QString& label,
       lb->setFixedHeight(15);
       lb->setEnabled(enabled);
 
-      Q3GridLayout* grid = new Q3GridLayout(0, 2, 2, 0, 0, "grid");
+      QGridLayout* grid = new QGridLayout(0, 2, 2, 0, 0, "grid");
       grid->setMargin(2);
       grid->addWidget(lb, 0, 0);
       grid->addWidget(dl, 1, 0);
@@ -205,7 +205,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       meter[0]->setRange(0, 127.0);
       meter[0]->setFixedWidth(15);
       connect(meter[0], SIGNAL(mousePress()), this, SLOT(resetPeaks()));
-      sliderGrid = new Q3GridLayout(this); // ddskrjo this
+      sliderGrid = new QGridLayout(this); // ddskrjo this
       sliderGrid->setRowStretch(0, 100);
       sliderGrid->addWidget(slider, 0, 0, Qt::AlignRight);
       sliderGrid->addWidget(meter[0], 0, 1, Qt::AlignLeft);
@@ -326,8 +326,8 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       solo->setFixedWidth(STRIP_WIDTH/2);
       connect(solo, SIGNAL(toggled(bool)), SLOT(soloToggled(bool)));
 
-      Q3HBoxLayout* smBox1 = new Q3HBoxLayout(0);
-      Q3HBoxLayout* smBox2 = new Q3HBoxLayout(0);
+      QHBoxLayout* smBox1 = new QHBoxLayout(0);
+      QHBoxLayout* smBox2 = new QHBoxLayout(0);
 
       smBox2->addWidget(mute);
       smBox2->addWidget(solo);
@@ -369,7 +369,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       //route->setText(tr("Route"));
       //QToolTip::add(route, tr("set routing"));
       //layout->addWidget(route);
-      Q3HBoxLayout* rBox = new Q3HBoxLayout(0);
+      QHBoxLayout* rBox = new QHBoxLayout(0);
       iR = new QToolButton(this);
       iR->setFont(config.fonts[1]);
       iR->setFixedWidth((STRIP_WIDTH-4)/2);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 892a19b6..a15ad44e 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -8,10 +8,11 @@
 
 #include <qtoolbutton.h>
 #include <qlabel.h>
-#include <qlayout.h>
+#include <QLayout>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3Frame>
+#include <QVBoxLayout>
+//#include <Q3Frame>
+#include <QFrame>
 
 #include "globals.h"
 #include "gconfig.h"
@@ -168,7 +169,7 @@ void Strip::soloToggled(bool val)
 //---------------------------------------------------------
 
 Strip::Strip(QWidget* parent, Track* t)
-   : Q3Frame(parent, "Strip", Qt::WDestructiveClose)
+   : QFrame(parent, Qt::WDestructiveClose)
       {
       iR            = 0;
       oR            = 0;
@@ -182,7 +183,7 @@ Strip::Strip(QWidget* parent, Track* t)
       meter[0] = 0;
       meter[1] = 0;
       setFixedWidth(STRIP_WIDTH);
-      layout = new Q3VBoxLayout(this);
+      layout = new QVBoxLayout(this);
       layout->setMargin(3);
 
       //---------------------------------------------
diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h
index a28cf5fd..4202b3e3 100644
--- a/muse2/muse/mixer/strip.h
+++ b/muse2/muse/mixer/strip.h
@@ -9,11 +9,12 @@
 #ifndef __STRIP_H__
 #define __STRIP_H__
 
-#include <q3frame.h>
+//#include <q3frame.h>
+#include <QFrame>
 #include <qicon.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3GridLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
 #include <QLabel>
 
 #include "globaldefs.h"
@@ -21,10 +22,10 @@
 
 class Track;
 class QLabel;
-class Q3VBoxLayout;
+class QVBoxLayout;
 class Meter;
 class QToolButton;
-class Q3GridLayout;
+class QGridLayout;
 class ComboBox;
 
 static const int STRIP_WIDTH = 65;
@@ -33,13 +34,13 @@ static const int STRIP_WIDTH = 65;
 //   Strip
 //---------------------------------------------------------
 
-class Strip : public Q3Frame {
+class Strip : public QFrame {
       Q_OBJECT
 
    protected:
       Track* track;
       QLabel* label;
-      Q3VBoxLayout* layout;
+      QVBoxLayout* layout;
       Meter* meter[MAX_CHANNELS];
       bool useSoloIconSet2;
       
@@ -48,7 +49,7 @@ class Strip : public Q3Frame {
       QToolButton* mute;
       QToolButton* iR; // Input routing button
       QToolButton* oR; // Output routing button
-      Q3GridLayout* sliderGrid;
+      QGridLayout* sliderGrid;
       ComboBox* autoType;
       void setLabelText();