diff -rupN muse2.org/muse/app.cpp muse2.new/muse/app.cpp
--- muse2.org/muse/app.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/app.cpp	2010-10-24 01:18:26.000000000 -0400
@@ -22,8 +22,9 @@
 #include <signal.h>
 #include <stdarg.h>
 
-#include <q3buttongroup.h>
-#include <q3popupmenu.h>
+#include <QButtonGroup>
+//#include <q3popupmenu.h>
+#include <QMenu>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qsocketnotifier.h>
@@ -42,7 +43,7 @@
 #include <QTranslator>
 #include <QKeyEvent>
 #include <QEvent>
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <QPixmap>
 #include <QCloseEvent>
 
@@ -608,10 +609,10 @@ struct addSynth_cmp_str 
    }
 };
 */
-
-Q3PopupMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
+ // ORCAN - CHECK
+QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
 {
-  Q3PopupMenu* synp = new Q3PopupMenu(parent);
+  QMenu* synp = new QMenu(parent);
   
   //typedef std::multimap<std::string, int, addSynth_cmp_str > asmap;
   typedef std::multimap<std::string, int > asmap;
@@ -620,23 +621,23 @@ Q3PopupMenu* populateAddSynth(QWidget* p
   typedef std::multimap<std::string, int >::iterator imap;
   
   MessSynth* synMESS   = 0;
-  Q3PopupMenu* synpMESS = 0;
+  QMenu* synpMESS = 0;
   asmap mapMESS;
 
   #ifdef DSSI_SUPPORT
   DssiSynth* synDSSI   = 0;
-  Q3PopupMenu* synpDSSI = 0;
+  QMenu* synpDSSI = 0;
   asmap mapDSSI;
   #endif                  
   
   #ifdef VST_SUPPORT
   VstSynth*  synVST    = 0;
-  Q3PopupMenu* synpVST  = 0;
+  QMenu* synpVST  = 0;
   asmap mapVST;
   #endif                  
   
   // Not necessary, but what the heck.
-  Q3PopupMenu* synpOther = 0;
+  QMenu* synpOther = 0;
   asmap mapOther;
   
   //const int synth_base_id = 0x1000;
@@ -690,7 +691,7 @@ Q3PopupMenu* populateAddSynth(QWidget* p
     {
       // No MESS sub-menu yet? Create it now.
       if(!synpMESS)
-        synpMESS = new Q3PopupMenu(parent);
+        synpMESS = new QMenu(parent);
       synpMESS->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
     }  
   }
@@ -706,7 +707,7 @@ Q3PopupMenu* populateAddSynth(QWidget* p
     {
       // No DSSI sub-menu yet? Create it now.
       if(!synpDSSI)
-        synpDSSI = new Q3PopupMenu(parent);
+        synpDSSI = new QMenu(parent);
       synpDSSI->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
     }  
   }
@@ -723,7 +724,7 @@ Q3PopupMenu* populateAddSynth(QWidget* p
     {
       // No VST sub-menu yet? Create it now.
       if(!synpVST)
-        synpVST = new Q3PopupMenu(parent);
+        synpVST = new QMenu(parent);
       synpVST->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
     }  
   }
@@ -737,7 +738,7 @@ Q3PopupMenu* populateAddSynth(QWidget* p
     Synth* s = synthis[idx];
     // No Other sub-menu yet? Create it now.
     if(!synpOther)
-      synpOther = new Q3PopupMenu(parent);
+      synpOther = new QMenu(parent);
     synpOther->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
   }
   
@@ -781,7 +782,7 @@ Q3PopupMenu* populateAddSynth(QWidget* p
 //    this is also used in "mixer"
 //---------------------------------------------------------
 
-void populateAddTrack(Q3PopupMenu* addTrack)
+void populateAddTrack(QMenu* addTrack)
       {
       addTrack->insertItem(QIcon(*addtrack_addmiditrackIcon),
          QT_TR_NOOP("Add Midi Track"), Track::MIDI);
@@ -799,7 +800,7 @@ void populateAddTrack(Q3PopupMenu* addTr
          QT_TR_NOOP("Add Aux Send"), Track::AUDIO_AUX);
          
       // Create a sub-menu and fill it with found synth types. Make addTrack the owner.
-      Q3PopupMenu* synp = populateAddSynth(addTrack, song, SLOT(addNewTrack(int)));
+      QMenu* synp = populateAddSynth(addTrack, song, SLOT(addNewTrack(int)));
       // Add the sub-menu to the given menu.
       addTrack->insertItem(*synthIcon, QT_TR_NOOP("Add Synth"), synp, Track::AUDIO_SOFTSYNTH);
          
@@ -812,7 +813,8 @@ void populateAddTrack(Q3PopupMenu* addTr
 //   MusE
 //---------------------------------------------------------
 
-MusE::MusE(int argc, char** argv) : Q3MainWindow(0, "mainwindow")
+//MusE::MusE(int argc, char** argv) : QMainWindow(0, "mainwindow")
+MusE::MusE(int argc, char** argv) : QMainWindow()
       {
       // By T356. For LADSPA plugins in plugin.cpp
       // QWidgetFactory::addWidgetFactory( new PluginWidgetFactory ); ddskrjo
@@ -866,11 +868,21 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //---------------------------------------------------
       //    undo/redo
       //---------------------------------------------------
-      undoRedo = new Q3ActionGroup(this, tr("UndoRedo"), false);
-      undoAction = new Q3Action(tr("undo"), QIcon(*undoIconS), tr("Und&o"), // ddskrjo
+      // ORCAN - CHECK:
+      /*
+      undoRedo = new QActionGroup(this, tr("UndoRedo"), false);
+      undoAction = new QAction(tr("undo"), QIcon(*undoIconS), tr("Und&o"), // ddskrjo
         Qt::CTRL+Qt::Key_Z, undoRedo, "undo");
-      redoAction = new Q3Action(tr("redo"), QIcon(*redoIconS), tr("Re&do"), // ddskrjo
+      redoAction = new QAction(tr("redo"), QIcon(*redoIconS), tr("Re&do"), // ddskrjo
         Qt::CTRL+Qt::Key_Y, undoRedo, "redo");
+      */
+      undoRedo = new QActionGroup(this);
+      undoAction = new QAction(QIcon(*undoIconS), tr("Und&o"), // ddskrjo
+        undoRedo);
+      redoAction = new QAction(QIcon(*redoIconS), tr("Re&do"), // ddskrjo
+        undoRedo);
+
+
       undoAction->setWhatsThis(tr("undo last change to song"));
       redoAction->setWhatsThis(tr("redo last undo"));
       undoAction->setEnabled(false);
@@ -881,60 +893,119 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //---------------------------------------------------
       //    Transport
       //---------------------------------------------------
+      // ORCAN - CHECK:
+      /*
+      transportAction = new QActionGroup(this, tr("Transport"), false);
 
-      transportAction = new Q3ActionGroup(this, tr("Transport"), false);
-
-      loopAction = new Q3Action(tr("loop"), QIcon(*loop1Icon),
+      loopAction = new QAction(tr("loop"), QIcon(*loop1Icon),
          tr("Loop"), 0, transportAction, "loop", true);
+      */
+      transportAction = new QActionGroup(this);
+
+      loopAction = new QAction(QIcon(*loop1Icon),
+         tr("Loop"), transportAction);
+
       loopAction->setWhatsThis(tr(infoLoopButton));
       connect(loopAction, SIGNAL(toggled(bool)), song, SLOT(setLoop(bool)));
-
-      punchinAction = new Q3Action(tr("punchin"), QIcon(*punchin1Icon),
+      // ORCAN - CHECK:
+      /*
+      punchinAction = new QAction(tr("punchin"), QIcon(*punchin1Icon),
          tr("Punchin"), 0, transportAction, "Punchin", true);
+      */
+      punchinAction = new QAction(QIcon(*punchin1Icon),
+         tr("Punchin"), transportAction);
+
       punchinAction->setWhatsThis(tr(infoPunchinButton));
       connect(punchinAction, SIGNAL(toggled(bool)), song, SLOT(setPunchin(bool)));
 
-      punchoutAction = new Q3Action(tr("punchout"), QIcon(*punchout1Icon),
+      // ORCAN - CHECK:
+      /*
+      punchoutAction = new QAction(tr("punchout"), QIcon(*punchout1Icon),
          tr("Punchout"), 0, transportAction, "punchout", true);
+      */
+      punchoutAction = new QAction(QIcon(*punchout1Icon),
+         tr("Punchout"), transportAction);
+
       punchoutAction->setWhatsThis(tr(infoPunchoutButton));
       connect(punchoutAction, SIGNAL(toggled(bool)), song, SLOT(setPunchout(bool)));
 
       transportAction->addSeparator();
 
-      startAction = new Q3Action(tr("start"), QIcon(*startIcon),
+      // ORCAN - CHECK:
+      /*
+      startAction = new QAction(tr("start"), QIcon(*startIcon),
          tr("Start"), 0, transportAction, "start");
+      */
+      startAction = new QAction(QIcon(*startIcon),
+         tr("Start"), transportAction);
+
       startAction->setWhatsThis(tr(infoStartButton));
       connect(startAction, SIGNAL(activated()), song, SLOT(rewindStart()));
 
-      rewindAction = new Q3Action(tr("rewind"), QIcon(*frewindIcon),
+      // ORCAN - CHECK:
+      /*
+      rewindAction = new QAction(tr("rewind"), QIcon(*frewindIcon),
          tr("Rewind"), 0, transportAction, "rewind");
+      */
+      rewindAction = new QAction(QIcon(*frewindIcon),
+         tr("Rewind"), transportAction);
+
       rewindAction->setWhatsThis(tr(infoRewindButton));
       connect(rewindAction, SIGNAL(activated()), song, SLOT(rewind()));
 
-      forwardAction = new Q3Action(tr("forward"), QIcon(*fforwardIcon),
+      // ORCAN - CHECK:
+      /*
+      forwardAction = new QAction(tr("forward"), QIcon(*fforwardIcon),
          tr("Forward"), 0, transportAction, "forward");
+      */
+      forwardAction = new QAction(QIcon(*fforwardIcon),
+	 tr("Forward"), transportAction);
+
       forwardAction->setWhatsThis(tr(infoForwardButton));
       connect(forwardAction, SIGNAL(activated()), song, SLOT(forward()));
 
-      stopAction = new Q3Action(tr("stop"), QIcon(*stopIcon),
+      // ORCAN - CHECK:
+      /*
+      stopAction = new QAction(tr("stop"), QIcon(*stopIcon),
          tr("Stop"), 0, transportAction, "stop", true);
+      */
+      stopAction = new QAction(QIcon(*stopIcon),
+         tr("Stop"), transportAction);
+
       stopAction->setWhatsThis(tr(infoStopButton));
       stopAction->setOn(true);
       connect(stopAction, SIGNAL(toggled(bool)), song, SLOT(setStop(bool)));
 
-      playAction = new Q3Action(tr("play"),  QIcon(*playIcon),
+      // ORCAN - CHECK:
+      /*
+      playAction = new QAction(tr("play"),  QIcon(*playIcon),
          tr("Play"), 0, transportAction, "play", true);
+      */
+      playAction = new QAction(QIcon(*playIcon),
+         tr("Play"), transportAction);
+
       playAction->setWhatsThis(tr(infoPlayButton));
       playAction->setOn(false);
       connect(playAction, SIGNAL(toggled(bool)), song, SLOT(setPlay(bool)));
 
-      recordAction = new Q3Action(tr("record"),  QIcon(*recordIcon),
+      // ORCAN - CHECK:
+      /*
+      recordAction = new QAction(tr("record"),  QIcon(*recordIcon),
          tr("Record"), 0, transportAction, "record", true);
+      */
+      recordAction = new QAction(QIcon(*recordIcon),
+         tr("Record"), transportAction);
       recordAction->setWhatsThis(tr(infoRecordButton));
       connect(recordAction, SIGNAL(toggled(bool)), song, SLOT(setRecord(bool)));
 
-      panicAction = new Q3Action(tr("panic"),  QIcon(*panicIcon),
+      // ORCAN - CHECK:
+      /*
+      panicAction = new QAction(tr("panic"),  QIcon(*panicIcon),
          tr("Panic"), 0, 0, "panic", false);
+      */
+      panicAction = new QAction(QIcon(*panicIcon),
+         tr("Panic"), 0);
+
       panicAction->setWhatsThis(tr(infoPanicButton));
       connect(panicAction, SIGNAL(activated()), song, SLOT(panic()));
 
@@ -944,23 +1015,47 @@ MusE::MusE(int argc, char** argv) : Q3Ma
 
       //----Actions
 
-      fileNewAction = new Q3Action(tr("new"),
+      // ORCAN - CHECK:
+      /*
+      fileNewAction = new QAction(tr("new"),
         QIcon(*filenewIcon), tr("&New"), 0, this, "new"); // ddskrjo
+      */
+      fileNewAction = new QAction(
+        QIcon(*filenewIcon), tr("&New"), this); // ddskrjo
+
       fileNewAction->setToolTip(tr(fileNewText));
       fileNewAction->setWhatsThis(tr(fileNewText));
 
-      fileOpenAction = new Q3Action(tr("open"),
+      // ORCAN - CHECK:
+      /*
+      fileOpenAction = new QAction(tr("open"),
         QIcon(*openIcon), tr("&Open"), 0, this, "open"); // ddskrjo
+      */
+      fileOpenAction = new QAction(
+        QIcon(*openIcon), tr("&Open"), this); // ddskrjo
+
       fileOpenAction->setToolTip(tr(fileOpenText));
       fileOpenAction->setWhatsThis(tr(fileOpenText));
 
-      fileSaveAction = new Q3Action(tr("save"),
+      // ORCAN - CHECK:
+      /*
+      fileSaveAction = new QAction(tr("save"),
         QIcon(*saveIcon), tr("&Save"), 0, this, "save"); // ddskrjo
+      */
+      fileSaveAction = new QAction(
+        QIcon(*saveIcon), tr("&Save"), this); // ddskrjo
+
       fileSaveAction->setToolTip(tr(fileSaveText));
       fileSaveAction->setWhatsThis(tr(fileSaveText));
 
-      pianoAction = new Q3Action(tr("pianoroll"),
+      // ORCAN - CHECK:
+      /*
+      pianoAction = new QAction(tr("pianoroll"),
         *pianoIconSet, tr("Pianoroll"), 0, this, "pianoroll");
+	*/
+      pianoAction = new QAction(
+        *pianoIconSet, tr("Pianoroll"), this);
+
       connect(pianoAction, SIGNAL(activated()), SLOT(startPianoroll()));
 
 //       markerAction = new QAction(tr("marker"), QIconSet(*view_markerIcon), tr("Marker"),
@@ -974,27 +1069,37 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //--------------------------------------------------
       //    Toolbar
       //--------------------------------------------------
+      // FIXME - Orcan
+      tools = new QToolBar(tr("File Buttons"), this);
 
-      tools = new Q3ToolBar(tr("File Buttons"), this);
       fileNewAction->addTo(tools);
       fileOpenAction->addTo(tools);
       fileSaveAction->addTo(tools);
-
+      
       //
       //    Whats This
       //
-      Q3WhatsThis::whatsThisButton(tools);
+      // FIXME - Orcan: Do we need this?
+      //Q3WhatsThis::whatsThisButton(tools);
 
       tools->addSeparator();
       undoRedo->addTo(tools);
+      this->addToolBar(tools);
+
 
       tools1 = new EditToolBar(this, arrangerTools);
+      this->addToolBar(tools1);
 
-      Q3ToolBar* transportToolbar = new Q3ToolBar(this);
+
+      QToolBar* transportToolbar = new QToolBar(this);
       transportAction->addTo(transportToolbar);
+      this->addToolBar(transportToolbar);
+
 
-      Q3ToolBar* panicToolbar = new Q3ToolBar(this);
+      QToolBar* panicToolbar = new QToolBar(this);
       panicAction->addTo(panicToolbar);
+      this->addToolBar(panicToolbar);
+
 
       if (realTimePriority < sched_get_priority_min(SCHED_FIFO))
             realTimePriority = sched_get_priority_min(SCHED_FIFO);
@@ -1032,11 +1137,11 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup File
       //-------------------------------------------------------------
 
-      menu_file = new Q3PopupMenu(this);
+      menu_file = new QMenu(this);
       menuBar()->insertItem(tr("&File"), menu_file);
       fileNewAction->addTo(menu_file);
       fileOpenAction->addTo(menu_file);
-      openRecent = new Q3PopupMenu(menu_file);
+      openRecent = new QMenu(menu_file);
       connect(openRecent, SIGNAL(aboutToShow()), this, SLOT(openRecentMenu()));
       connect(openRecent, SIGNAL(activated(int)), this, SLOT(selectProject(int)));
       menu_ids[CMD_OPEN_RECENT] = menu_file->insertItem(tr("Open &Recent"), openRecent, 0);
@@ -1059,7 +1164,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Edit
       //-------------------------------------------------------------
 
-      menuEdit = new Q3PopupMenu(this);
+      menuEdit = new QMenu(this);
       undoRedo->addTo(menuEdit);
       menuEdit->insertSeparator();
       menuBar()->insertItem(tr("&Edit"), menuEdit);
@@ -1085,14 +1190,14 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       menuEdit->insertItem(QIcon(*edit_track_delIcon),
          tr("Delete Selected Tracks"), CMD_DELETE_TRACK);
 
-      addTrack = new Q3PopupMenu(this);
+      addTrack = new QMenu(this);
       // Moved below. Have to wait until synths are available...
       //populateAddTrack(addTrack);
       
       menuEdit->insertItem(QIcon(*edit_track_addIcon),
          tr("Add Track"), addTrack);
 
-      select = new Q3PopupMenu(this);
+      select = new QMenu(this);
       select->insertItem(QIcon(*select_allIcon),
          tr("Select &All"),  CMD_SELECT_ALL);
       select->insertItem(QIcon(*select_deselect_allIcon),
@@ -1118,7 +1223,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       menu_ids[CMD_OPEN_WAVE]  = menuEdit->insertItem(
          QIcon(*edit_waveIcon), tr("Wave"), this, SLOT(startWaveEditor()), 0);
 
-      master = new Q3PopupMenu(this);
+      master = new QMenu(this);
       master->setCheckable(false);
       menu_ids[CMD_OPEN_GRAPHIC_MASTER] = master->insertItem(
         QIcon(*mastertrack_graphicIcon),tr("Graphic"), this, SLOT(startMasterEditor()), 0);
@@ -1131,7 +1236,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
       connect(select, SIGNAL(activated(int)), SLOT(cmd(int)));
 
-      midiEdit = new Q3PopupMenu(this);
+      midiEdit = new QMenu(this);
       midiEdit->setCheckable(false);
 #if 0  // TODO
       menu_ids[CMD_OPEN_MIDI_TRANSFORM] = midiEdit->insertItem(
@@ -1162,7 +1267,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup View
       //-------------------------------------------------------------
 
-      menuView = new Q3PopupMenu(this);
+      menuView = new QMenu(this);
       menuView->setCheckable(true);
       menuBar()->insertItem(tr("View"), menuView);
 
@@ -1188,7 +1293,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Structure
       //-------------------------------------------------------------
 
-      menuStructure = new Q3PopupMenu(this);
+      menuStructure = new QMenu(this);
       menuStructure->setCheckable(false);
       menuBar()->insertItem(tr("&Structure"), menuStructure);
       menu_ids[CMD_GLOBAL_CUT] = menuStructure->insertItem(tr("Global Cut"),    this, SLOT(globalCut()), 0);
@@ -1204,7 +1309,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Midi
       //-------------------------------------------------------------
 
-      midiInputPlugins = new Q3PopupMenu(this);
+      midiInputPlugins = new QMenu(this);
       midiInputPlugins->setCheckable(false);
       mpid0 = midiInputPlugins->insertItem(
          QIcon(*midi_inputplugins_transposeIcon), tr("Transpose"), 0);
@@ -1222,12 +1327,12 @@ MusE::MusE(int argc, char** argv) : Q3Ma
 
 //      midiInputPlugins->setItemEnabled(mpid4, false);
 
-      menu_functions = new Q3PopupMenu(this);
+      menu_functions = new QMenu(this);
       menu_functions->setCheckable(true);
       menuBar()->insertItem(tr("&Midi"), menu_functions);
       menu_functions->setCaption(tr("Midi"));
 
-      menuScriptPlugins = new Q3PopupMenu(this);
+      menuScriptPlugins = new QMenu(this);
       song->populateScriptMenu(menuScriptPlugins, this);
       menu_functions->insertItem(tr("&Plugins"), menuScriptPlugins);
       
@@ -1247,7 +1352,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Audio
       //-------------------------------------------------------------
 
-      menu_audio = new Q3PopupMenu(this);
+      menu_audio = new QMenu(this);
       menu_audio->setCheckable(true);
       menuBar()->insertItem(tr("&Audio"), menu_audio);
       menu_ids[CMD_AUDIO_BOUNCE_TO_TRACK] = menu_audio->insertItem(
@@ -1262,7 +1367,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Automation
       //-------------------------------------------------------------
 
-      menuAutomation = new Q3PopupMenu(this);
+      menuAutomation = new QMenu(this);
       menuAutomation->setCheckable(true);
       menuBar()->insertItem(tr("Automation"), menuAutomation);
       autoId = menuAutomation->insertItem(
@@ -1278,7 +1383,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //    popup Settings
       //-------------------------------------------------------------
 
-      follow = new Q3PopupMenu(this);
+      follow = new QMenu(this);
       follow->setCheckable(false);
       fid0 = follow->insertItem(tr("dont follow Song"), CMD_FOLLOW_NO);
       fid1 = follow->insertItem(tr("follow page"), CMD_FOLLOW_JUMP);
@@ -1286,7 +1391,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       follow->setItemChecked(fid1, true);
       connect(follow, SIGNAL(activated(int)), SLOT(cmd(int)));
 
-      menuSettings = new Q3PopupMenu(this);
+      menuSettings = new QMenu(this);
       menuSettings->setCheckable(false);
       menuBar()->insertItem(tr("Settings"), menuSettings);
       menu_ids[CMD_GLOBAL_CONFIG] = menuSettings->insertItem(
@@ -1314,7 +1419,7 @@ MusE::MusE(int argc, char** argv) : Q3Ma
       //---------------------------------------------------
 
       menuBar()->insertSeparator();
-      menu_help = new Q3PopupMenu(this);
+      menu_help = new QMenu(this);
       menu_help->setCheckable(false);
       menuBar()->insertItem(tr("&Help"), menu_help);
 
@@ -4752,7 +4857,7 @@ void MusE::focusInEvent(QFocusEvent* ev)
       if (mixer2)
             mixer2->raise();
       raise();
-      Q3MainWindow::focusInEvent(ev);
+      QMainWindow::focusInEvent(ev);
       }
 
 //---------------------------------------------------------
diff -rupN muse2.org/muse/appearance.cpp muse2.new/muse/appearance.cpp
--- muse2.org/muse/appearance.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/appearance.cpp	2010-10-23 02:38:44.000000000 -0400
@@ -5,11 +5,11 @@
 //=========================================================
 
 #include <stdio.h>
-#include <q3button.h>
+#include <QAbstractButton>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -645,7 +645,7 @@ void Appearance::addToPaletteClicked()
       {
       if (!color)
             return;
-      Q3Button* button = (Q3Button*)aPalette->selected(); // ddskrjo
+      QAbstractButton* button = (QAbstractButton*)aPalette->selected(); // ddskrjo
       int r, g, b;
       QColor c;
       if (button) {
@@ -661,7 +661,7 @@ void Appearance::addToPaletteClicked()
                         // found empty slot
                         aPalette->setButton(i);
                         //aPalette->moveFocus(i); ddskrjo
-                        button = (Q3Button*)aPalette->find(i); // ddskrjo
+                        button = (QAbstractButton*)aPalette->find(i); // ddskrjo
                         break;
                         }
                   }
@@ -682,7 +682,7 @@ void Appearance::paletteClicked(int id)
       {
       if (!color)
             return;
-      Q3Button* button = (Q3Button*)aPalette->find(id); // ddskrjo
+      QAbstractButton* button = (QAbstractButton*)aPalette->find(id); // ddskrjo
       if (button) {
             QColor c = button->paletteBackgroundColor();
             int r, g, b;
diff -rupN muse2.org/muse/app.h muse2.new/muse/app.h
--- muse2.org/muse/app.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/app.h	2010-10-23 13:54:12.000000000 -0400
@@ -11,11 +11,13 @@
 
 #include "config.h"
 
-#include <q3mainwindow.h>
+//#include <q3mainwindow.h>
+#include <QMainWindow>
 #include <qrect.h>
 //Added by qt3to4:
 #include <Qt3Support>
-#include <Q3PopupMenu>
+//#include <Q3PopupMenu>
+#include <QMenu>
 #include <QFocusEvent>
 #include <QCloseEvent>
 #include "cobject.h"
@@ -24,8 +26,8 @@
 
 class Part;
 class PartList;
-class Q3ToolBar;
-class Q3PopupMenu;
+class QToolBar;
+class QMenu;
 class Transport;
 class BigTime;
 class Arranger;
@@ -69,7 +71,7 @@ class EditInstrument;
 //   MusE
 //---------------------------------------------------------
 
-class MusE : public Q3MainWindow
+class MusE : public QMainWindow
       {
       Q_OBJECT
       enum {CMD_CUT, CMD_COPY, CMD_PASTE, CMD_INSERT, CMD_INSERTMEAS, CMD_PASTE_CLONE,
@@ -95,22 +97,22 @@ class MusE : public Q3MainWindow
             CMD_LAST };
 
       int menu_ids[CMD_LAST];
-      Q3Action *fileSaveAction, *fileOpenAction, *pianoAction, *fileNewAction, /* *markerAction,*/ *testAction;
+      QAction *fileSaveAction, *fileOpenAction, *pianoAction, *fileNewAction, /* *markerAction,*/ *testAction;
       QString appName;
 
       QFileInfo project;
-      Q3ToolBar *tools;
+      QToolBar *tools;
       EditToolBar *tools1;
 
       Transport* transport;
       BigTime* bigtime;
       EditInstrument* editInstrument;
       
-      Q3PopupMenu *menu_file, *menuView, *menuSettings, *menu_help;
-      Q3PopupMenu *menuEdit, *menuStructure;
-      Q3PopupMenu* menu_audio, *menuAutomation;
-      Q3PopupMenu* menu_functions, *menuScriptPlugins;
-      Q3PopupMenu* select, *master, *midiEdit, *addTrack;
+      QMenu *menu_file, *menuView, *menuSettings, *menu_help;
+      QMenu *menuEdit, *menuStructure;
+      QMenu* menu_audio, *menuAutomation;
+      QMenu* menu_functions, *menuScriptPlugins;
+      QMenu* select, *master, *midiEdit, *addTrack;
 
       // Special 'stay-open' menu for routes.
       PopupMenu* routingPopupMenu; 
@@ -118,9 +120,9 @@ class MusE : public Q3MainWindow
       int aid1a, aid1b, aid2, aid3, autoId;
       int tr_id, bt_id, mr_id;
       int cc_id;
-      Q3PopupMenu* follow;
+      QMenu* follow;
       int fid0, fid1, fid2;
-      Q3PopupMenu* midiInputPlugins;
+      QMenu* midiInputPlugins;
       int mpid0, mpid1, mpid2, mpid3, mpid4;
 
       QWidget* midiPortConfig;
@@ -143,7 +145,7 @@ class MusE : public Q3MainWindow
       ClipListEdit* clipListEdit;
       MarkerView* markerView;
       MidiTransformerDialog* midiTransformerDialog;
-      Q3PopupMenu* openRecent;
+      QMenu* openRecent;
       
       bool readMidi(FILE*);
       void read(Xml& xml, bool skipConfig);
diff -rupN muse2.org/muse/arranger/alayout.h muse2.new/muse/arranger/alayout.h
--- muse2.org/muse/arranger/alayout.h	2010-10-22 01:14:43.000000000 -0400
+++ muse2.new/muse/arranger/alayout.h	2010-10-23 01:39:17.000000000 -0400
@@ -9,7 +9,7 @@
 #define __ALAYOUT_H__
 
 #include <qlayout.h>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 
 class QScrollBar;
 class WidgetStack;
diff -rupN muse2.org/muse/arranger/arranger.cpp muse2.new/muse/arranger/arranger.cpp
--- muse2.org/muse/arranger/arranger.cpp	2010-10-22 01:14:43.000000000 -0400
+++ muse2.new/muse/arranger/arranger.cpp	2010-10-24 01:42:57.000000000 -0400
@@ -13,12 +13,13 @@
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 #include <qlabel.h>
-#include <q3accel.h>
+//#include <q3accel.h>
 #include <qcombobox.h>
-#include <q3whatsthis.h>
-#include <q3toolbar.h>
+//#include <q3whatsthis.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtooltip.h>
 #include <q3popupmenu.h>
 #include <q3hbox.h>
@@ -26,15 +27,16 @@
 #include <q3filedialog.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <q3mainwindow.h>
+//#include <q3mainwindow.h>
+#include <QMainWindow>
 #include <q3widgetstack.h>
 #include <qscrollbar.h>
 //Added by qt3to4:
 #include <QKeyEvent>
 #include <Q3ValueList>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QPixmap>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include <QWheelEvent>
 
 #include "arranger.h"
@@ -92,7 +94,7 @@ QString TWhatsThis::text(const QPoint& p
 //    is the central widget in app
 //---------------------------------------------------------
 
-Arranger::Arranger(Q3MainWindow* parent, const char* name)
+Arranger::Arranger(QMainWindow* parent, const char* name)
    : QWidget(parent, name)
       {
       _raster  = 0;      // measure
@@ -111,8 +113,9 @@ Arranger::Arranger(Q3MainWindow* parent,
       //    create toolbar in toplevel widget
       //---------------------------------------------------
 
-      Q3ToolBar* toolbar = new Q3ToolBar(tr("Arranger"), parent);
-
+      // FIXME - Orcan: This toolbar needs a hand
+      QToolBar* toolbar = new QToolBar(tr("Arranger"), parent);
+      
       QLabel* label = new QLabel(tr("Cursor"), toolbar, "Cursor");
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
@@ -183,8 +186,9 @@ Arranger::Arranger(Q3MainWindow* parent,
       QToolButton* tempo200 = new QToolButton(toolbar, "tempo200");
       tempo200->setText(QString("200%"));
       connect(tempo200, SIGNAL(clicked()), SLOT(setTempo200()));
+      parent->addToolBar(toolbar);
 
-      Q3VBoxLayout* box  = new Q3VBoxLayout(this);
+      QVBoxLayout* box  = new QVBoxLayout(this);
       box->addWidget(hLine(this), Qt::AlignTop);
 
       //---------------------------------------------------
@@ -307,7 +311,7 @@ Arranger::Arranger(Q3MainWindow* parent,
       vallist.append(tgrid->maximumSize().width());
       split->setSizes(vallist);
 
-      Q3GridLayout* egrid  = new Q3GridLayout(editor);
+      QGridLayout* egrid  = new QGridLayout(editor);
       egrid->setColStretch(0, 50);
       egrid->setRowStretch(2, 50);
 
diff -rupN muse2.org/muse/arranger/arranger.h muse2.new/muse/arranger/arranger.h
--- muse2.org/muse/arranger/arranger.h	2010-10-22 01:14:43.000000000 -0400
+++ muse2.new/muse/arranger/arranger.h	2010-10-23 00:47:51.000000000 -0400
@@ -22,7 +22,7 @@
 #include "mtrackinfobase.h"
 #include "trackautomationview.h"
 
-class Q3MainWindow;
+class QMainWindow;
 class QToolButton;
 class Header;
 class TList;
@@ -204,7 +204,7 @@ class Arranger : public QWidget {
       enum { CMD_CUT_PART, CMD_COPY_PART, CMD_PASTE_PART, CMD_PASTE_CLONE_PART, CMD_PASTE_PART_TO_TRACK, CMD_PASTE_CLONE_PART_TO_TRACK,
              CMD_INSERT_PART, CMD_INSERT_EMPTYMEAS };
 
-      Arranger(Q3MainWindow* parent, const char* name = 0);
+      Arranger(QMainWindow* parent, const char* name = 0);
       void setMode(int);
       void reset();
 
diff -rupN muse2.org/muse/arranger/trackinfo.cpp muse2.new/muse/arranger/trackinfo.cpp
--- muse2.org/muse/arranger/trackinfo.cpp	2010-10-22 01:14:43.000000000 -0400
+++ muse2.new/muse/arranger/trackinfo.cpp	2010-10-23 03:01:01.000000000 -0400
@@ -11,10 +11,10 @@
 #include <qlabel.h>
 #include <q3popupmenu.h>
 #include <qmessagebox.h>
-#include <q3hbox.h>
+//#include <q3hbox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <q3widgetstack.h>
+//#include <q3widgetstack.h>
 #include <qlineedit.h>
 #include <qtimer.h>
 //Added by qt3to4:
diff -rupN muse2.org/muse/cobject.cpp muse2.new/muse/cobject.cpp
--- muse2.org/muse/cobject.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/cobject.cpp	2010-10-23 00:13:33.000000000 -0400
@@ -56,7 +56,7 @@ void TopWin::writeStatus(int level, Xml&
       }
 
 TopWin::TopWin(QWidget* parent, const char* name,
-   Qt::WFlags f) : Q3MainWindow(parent, name, f)
+   Qt::WFlags f) : QMainWindow(parent, name, f)
       {
       }
 
diff -rupN muse2.org/muse/cobject.h muse2.new/muse/cobject.h
--- muse2.org/muse/cobject.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/cobject.h	2010-10-23 00:13:25.000000000 -0400
@@ -11,7 +11,8 @@
 
 #include "config.h"
 
-#include <q3mainwindow.h>
+//#include <q3mainwindow.h>
+#include <QMainWindow>
 #include <list>
 
 class Xml;
@@ -20,7 +21,7 @@ class Xml;
 //   TopWin
 //---------------------------------------------------------
 
-class TopWin : public Q3MainWindow
+class TopWin : public QMainWindow
       {
       Q_OBJECT
 
diff -rupN muse2.org/muse/conf.cpp muse2.new/muse/conf.cpp
--- muse2.org/muse/conf.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/conf.cpp	2010-10-23 02:39:45.000000000 -0400
@@ -14,7 +14,7 @@
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 #include <stdio.h>
 #include <q3popupmenu.h>
 #include <q3groupbox.h>
diff -rupN muse2.org/muse/confmport.cpp muse2.new/muse/confmport.cpp
--- muse2.org/muse/confmport.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/confmport.cpp	2010-10-23 02:40:12.000000000 -0400
@@ -16,7 +16,7 @@
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 //Added by qt3to4:
 #include <QPixmap>
 #include <stdio.h>
diff -rupN muse2.org/muse/globals.cpp muse2.new/muse/globals.cpp
--- muse2.org/muse/globals.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/globals.cpp	2010-10-23 00:52:52.000000000 -0400
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <qpixmap.h>
 //Added by qt3to4:
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -301,20 +301,20 @@ int midiFilterCtrl2 = 0;
 int midiFilterCtrl3 = 0;
 int midiFilterCtrl4 = 0;
 
-Q3ActionGroup* undoRedo;
-Q3Action* undoAction;
-Q3Action* redoAction;
-Q3ActionGroup* transportAction;
-Q3Action* playAction;
-Q3Action* startAction;
-Q3Action* stopAction;
-Q3Action* rewindAction;
-Q3Action* forwardAction;
-Q3Action* loopAction;
-Q3Action* punchinAction;
-Q3Action* punchoutAction;
-Q3Action* recordAction;
-Q3Action* panicAction;
+QActionGroup* undoRedo;
+QAction* undoAction;
+QAction* redoAction;
+QActionGroup* transportAction;
+QAction* playAction;
+QAction* startAction;
+QAction* stopAction;
+QAction* rewindAction;
+QAction* forwardAction;
+QAction* loopAction;
+QAction* punchinAction;
+QAction* punchoutAction;
+QAction* recordAction;
+QAction* panicAction;
 
 //AudioMixerApp* audioMixer;
 MusE* muse;
diff -rupN muse2.org/muse/globals.h muse2.new/muse/globals.h
--- muse2.org/muse/globals.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/globals.h	2010-10-23 00:52:52.000000000 -0400
@@ -14,7 +14,7 @@
 //#include <qfont.h>
 //#include <qnamespace.h>
 //Added by qt3to4:
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <Qt3Support>
 //#include <qaction.h>
 #include "value.h"
@@ -26,7 +26,7 @@
 class QString;
 class QFont;
 class QAction;
-class Q3ActionGroup;
+class QActionGroup;
 class QStringList;
 
 extern const float denormalBias;
@@ -128,21 +128,21 @@ extern int midiFilterCtrl4;
 #define CMD_RANGE_SELECTED    1
 #define CMD_RANGE_LOOP        2
 
-extern Q3ActionGroup* undoRedo;
-extern Q3Action* undoAction;
-extern Q3Action* redoAction;
-
-extern Q3ActionGroup* transportAction;
-extern Q3Action* playAction;
-extern Q3Action* startAction;
-extern Q3Action* stopAction;
-extern Q3Action* rewindAction;
-extern Q3Action* forwardAction;
-extern Q3Action* loopAction;
-extern Q3Action* punchinAction;
-extern Q3Action* punchoutAction;
-extern Q3Action* recordAction;
-extern Q3Action* panicAction;
+extern QActionGroup* undoRedo;
+extern QAction* undoAction;
+extern QAction* redoAction;
+
+extern QActionGroup* transportAction;
+extern QAction* playAction;
+extern QAction* startAction;
+extern QAction* stopAction;
+extern QAction* rewindAction;
+extern QAction* forwardAction;
+extern QAction* loopAction;
+extern QAction* punchinAction;
+extern QAction* punchoutAction;
+extern QAction* recordAction;
+extern QAction* panicAction;
 
 //class AudioMixerApp;
 class MusE;
diff -rupN muse2.org/muse/liste/editevent.cpp muse2.new/muse/liste/editevent.cpp
--- muse2.org/muse/liste/editevent.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/liste/editevent.cpp	2010-10-23 02:28:52.000000000 -0400
@@ -19,10 +19,10 @@
 #include <q3widgetstack.h>
 #include <q3popupmenu.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
-#include <Q3BoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QBoxLayout>
 
 #include "song.h"
 #include "event.h"
@@ -159,15 +159,15 @@ Event EditPAfterDialog::getEvent(int tic
 EditEventDialog::EditEventDialog(QWidget* parent, const char* name)
    : QDialog(parent, name, true)
       {
-      Q3VBoxLayout* xlayout = new Q3VBoxLayout(this);
-      layout1 = new Q3GridLayout(this); // ddskrjo this
+      QVBoxLayout* xlayout = new QVBoxLayout(this);
+      layout1 = new QGridLayout(this); // ddskrjo this
       xlayout->addLayout(layout1);
 
       //---------------------------------------------------
       //  Ok, Cancel
       //---------------------------------------------------
 
-      Q3BoxLayout* w5 = new Q3HBoxLayout(this); // ddskrjo this
+      QBoxLayout* w5 = new QHBoxLayout(this); // ddskrjo this
       xlayout->addLayout(w5);
       QPushButton* okB = new QPushButton(tr("Ok"), this);
       okB->setDefault(true);
@@ -296,7 +296,7 @@ EditMetaDialog::EditMetaDialog(int tick,
       il2->setDark();
       typeLabel = new QLabel(this);
       typeLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-      Q3HBoxLayout* typeLayout = new Q3HBoxLayout(this);
+      QHBoxLayout* typeLayout = new QHBoxLayout(this);
       typeLayout->addWidget(il2);
       typeLayout->addWidget(typeLabel);
       typeLayout->addStretch();
diff -rupN muse2.org/muse/liste/editevent.h muse2.new/muse/liste/editevent.h
--- muse2.org/muse/liste/editevent.h	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/liste/editevent.h	2010-10-23 02:34:15.000000000 -0400
@@ -11,7 +11,7 @@
 #include <qdialog.h>
 //Added by qt3to4:
 #include <Q3PopupMenu>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QLabel>
 
 #include "editnotedialogbase.h"
@@ -22,7 +22,7 @@
 class PosEdit;
 class IntLabel;
 class PitchEdit;
-class Q3GridLayout;
+class QGridLayout;
 class Q3MultiLineEdit;
 class QRadioButton;
 class PosEdit;
@@ -37,7 +37,7 @@ class EditEventDialog : public QDialog {
       Q_OBJECT
 
    protected:
-      Q3GridLayout* layout1;
+      QGridLayout* layout1;
 
    public:
       EditEventDialog(QWidget* parent=0, const char* name=0);
@@ -70,7 +70,7 @@ class EditSysexDialog : public EditSysex
       int len;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    private slots:
       virtual void accept();
@@ -106,7 +106,7 @@ class EditCtrlDialog : public EditCtrlBa
       void instrPopup();
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
 
    public:
@@ -133,7 +133,7 @@ class EditMetaDialog : public EditEventD
       QLabel* typeLabel;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    private slots:
       virtual void accept();
@@ -160,7 +160,7 @@ class EditCAfterDialog : public EditEven
       IntLabel* il2;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    public:
       EditCAfterDialog(int tick, const Event&,
@@ -182,7 +182,7 @@ class EditPAfterDialog : public EditEven
       IntLabel* il2;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    public:
       EditPAfterDialog(int tick, const Event&,
diff -rupN muse2.org/muse/liste/listedit.cpp muse2.new/muse/liste/listedit.cpp
--- muse2.org/muse/liste/listedit.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/liste/listedit.cpp	2010-10-23 02:40:39.000000000 -0400
@@ -5,7 +5,8 @@
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtooltip.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
@@ -14,7 +15,7 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 #include <q3listbox.h>
 #include <q3listview.h>
 #include <q3header.h>
@@ -25,7 +26,7 @@
 #include <Qt3Support>
 //Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <QCloseEvent>
 
 #include "listedit.h"
@@ -419,19 +420,29 @@ QString EventListItem::text(int col) con
 ListEdit::ListEdit(PartList* pl)
    : MidiEditor(0, 0, pl)
       {
-      insertItems = new Q3ActionGroup(this, "InsertItems", false);
-      insertNote = new Q3Action(tr("Insert Note"), QIcon(*note1Icon), tr("insert Note"),
+      // ORCAN - CHECK:
+      /*
+      insertItems = new QActionGroup(this, "InsertItems", false);
+      insertNote = new QAction(tr("Insert Note"), QIcon(*note1Icon), tr("insert Note"),
         0, insertItems);
-      insertSysEx = new Q3Action(tr("Insert SysEx"), QIcon(*sysexIcon), tr("insert SysEx"),
+      insertSysEx = new QAction(tr("Insert SysEx"), QIcon(*sysexIcon), tr("insert SysEx"),
         0, insertItems);
-      insertCtrl = new Q3Action(tr("Insert Ctrl"), QIcon(*ctrlIcon), tr("insert Ctrl"),
+      insertCtrl = new QAction(tr("Insert Ctrl"), QIcon(*ctrlIcon), tr("insert Ctrl"),
         0, insertItems);
-      insertMeta = new Q3Action(tr("Insert Meta"), QIcon(*metaIcon), tr("insert Meta"),
+      insertMeta = new QAction(tr("Insert Meta"), QIcon(*metaIcon), tr("insert Meta"),
         0, insertItems);
-      insertCAfter = new Q3Action(tr("Insert Channel Aftertouch"), QIcon(*cafterIcon), tr("insert Channel Aftertouch"),
+      insertCAfter = new QAction(tr("Insert Channel Aftertouch"), QIcon(*cafterIcon), tr("insert Channel Aftertouch"),
         0, insertItems);
-      insertPAfter = new Q3Action(tr("Insert Key Aftertouch"), QIcon(*pafterIcon), tr("insert Poly Aftertouch"),
+      insertPAfter = new QAction(tr("Insert Key Aftertouch"), QIcon(*pafterIcon), tr("insert Poly Aftertouch"),
         0, insertItems);
+      */
+      insertItems = new QActionGroup(this);
+      insertNote = new QAction(QIcon(*note1Icon), tr("insert Note"), insertItems);
+      insertSysEx = new QAction(QIcon(*sysexIcon), tr("insert SysEx"), insertItems);
+      insertCtrl = new QAction(QIcon(*ctrlIcon), tr("insert Ctrl"), insertItems);
+      insertMeta = new QAction(QIcon(*metaIcon), tr("insert Meta"), insertItems);
+      insertCAfter = new QAction(QIcon(*cafterIcon), tr("insert Channel Aftertouch"), insertItems);
+      insertPAfter = new QAction(QIcon(*pafterIcon), tr("insert Poly Aftertouch"), insertItems);
 
       connect(insertNote,    SIGNAL(activated()), SLOT(editInsertNote()));
       connect(insertSysEx,   SIGNAL(activated()), SLOT(editInsertSysEx()));
@@ -468,10 +479,10 @@ ListEdit::ListEdit(PartList* pl)
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      listTools = new Q3ToolBar(this, "list-tools");
+      listTools = new QToolBar(this, "list-tools");
       listTools->setLabel(tr("List Tools"));
       undoRedo->addTo(listTools);
-      Q3ToolBar* insertTools = new Q3ToolBar(this, "insert");
+      QToolBar* insertTools = new QToolBar(this, "insert");
       insertTools->setLabel(tr("Insert Tools"));
       insertItems->addTo(insertTools);
 
diff -rupN muse2.org/muse/liste/listedit.h muse2.new/muse/liste/listedit.h
--- muse2.org/muse/liste/listedit.h	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/liste/listedit.h	2010-10-23 00:52:52.000000000 -0400
@@ -15,7 +15,7 @@
 #include <Q3PopupMenu>
 #include <QKeyEvent>
 #include <QCloseEvent>
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <Qt3Support>
 
 class Event;
@@ -24,7 +24,7 @@ class PartList;
 class MidiPart;
 class MidiPart;
 class Xml;
-class Q3ActionGroup;
+class QActionGroup;
 class QAction;
 class Q3ListView;
 class Q3ListViewItem;
@@ -36,8 +36,8 @@ class Q3ListViewItem;
 class ListEdit : public MidiEditor {
       Q3ListView* liste;
       Q3PopupMenu* menuEdit;
-      Q3ActionGroup* insertItems;
-      Q3ToolBar* listTools;
+      QActionGroup* insertItems;
+      QToolBar* listTools;
       MidiTrack* curTrack;
       MidiPart* curPart;
       int selectedTick;
@@ -49,7 +49,7 @@ class ListEdit : public MidiEditor {
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       void initShortcuts();
-      Q3Action *insertNote, *insertSysEx, *insertCtrl, *insertMeta, *insertCAfter, *insertPAfter;
+      QAction *insertNote, *insertSysEx, *insertCtrl, *insertMeta, *insertCAfter, *insertPAfter;
 
    private slots:
       void editInsertNote();
diff -rupN muse2.org/muse/marker/markerview.cpp muse2.new/muse/marker/markerview.cpp
--- muse2.org/muse/marker/markerview.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/marker/markerview.cpp	2010-10-23 01:07:50.000000000 -0400
@@ -14,7 +14,8 @@
 #include "song.h"
 #include "posedit.h"
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qlayout.h>
@@ -155,14 +156,18 @@ MarkerView::MarkerView(QWidget* parent)
       setCaption(tr("MusE: Marker"));
 
       //---------Actions----------------------------
-      Q3Action* markerAdd = new Q3Action(tr("add marker"),
-         QIcon(*flagIcon), tr("Add Marker"),
-        0, this, "add marker");
+      // CHECK - ORCAN:
+      //QAction* markerAdd = new QAction(tr("add marker"),
+      //   QIcon(*flagIcon), tr("Add Marker"),
+      //  0, this, "add marker");
+      //QAction* markerDelete = new QAction(tr("delete marker"),
+      //   QIcon(*deleteIcon), tr("Delete Marker"),
+      //   0, this, "delete marker");
+
+      QAction* markerAdd = new QAction(QIcon(*flagIcon), tr("add marker"), this);
       connect(markerAdd, SIGNAL(activated()), SLOT(addMarker()));
 
-      Q3Action* markerDelete = new Q3Action(tr("delete marker"),
-         QIcon(*deleteIcon), tr("Delete Marker"),
-         0, this, "delete marker");
+      QAction* markerDelete = new QAction(QIcon(*deleteIcon), tr("delete marker"), this);
       connect(markerDelete, SIGNAL(activated()), SLOT(deleteMarker()));
 
       //---------Pulldown Menu----------------------------
@@ -174,10 +179,10 @@ MarkerView::MarkerView(QWidget* parent)
       markerDelete->addTo(editMenu);
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "marker-tools");
+      tools = new QToolBar(this, "marker-tools");
       undoRedo->addTo(tools);
 
-      Q3ToolBar* edit = new Q3ToolBar(this, "edit tools");
+      QToolBar* edit = new QToolBar(this, "edit tools");
       markerAdd->addTo(edit);
       markerDelete->addTo(edit);
 
diff -rupN muse2.org/muse/marker/markerview.h muse2.new/muse/marker/markerview.h
--- muse2.org/muse/marker/markerview.h	2010-10-22 01:14:47.000000000 -0400
+++ muse2.new/muse/marker/markerview.h	2010-10-23 00:22:19.000000000 -0400
@@ -18,7 +18,7 @@ class QLineEdit;
 class PosEdit;
 class QToolButton;
 class Marker;
-class Q3ToolBar;
+class QToolBar;
 class Pos;
 
 //---------------------------------------------------------
@@ -49,7 +49,7 @@ class MarkerView : public TopWin {
       PosEdit* editSMPTE;
       PosEdit* editTick;
       QToolButton* lock;
-      Q3ToolBar* tools;
+      QToolBar* tools;
 
       Q_OBJECT
       virtual void closeEvent(QCloseEvent*);
diff -rupN muse2.org/muse/master/lmaster.cpp muse2.new/muse/master/lmaster.cpp
--- muse2.org/muse/master/lmaster.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/master/lmaster.cpp	2010-10-23 00:15:16.000000000 -0400
@@ -15,7 +15,8 @@
 #include "shortcuts.h"
 #include "debug.h"
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qlayout.h>
@@ -88,10 +89,10 @@ LMaster::LMaster()
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "list-tools");
+      tools = new QToolBar(this, "list-tools");
       undoRedo->addTo(tools);
 
-      Q3ToolBar* edit = new Q3ToolBar(this, "edit tools");
+      QToolBar* edit = new QToolBar(this, "edit tools");
       QToolButton* tempoButton = new QToolButton(edit);
       QToolButton* timeSigButton = new QToolButton(edit);
       tempoButton->setText(tr("Tempo"));
diff -rupN muse2.org/muse/master/lmaster.h muse2.new/muse/master/lmaster.h
--- muse2.org/muse/master/lmaster.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/master/lmaster.h	2010-10-23 00:19:41.000000000 -0400
@@ -96,7 +96,7 @@ class LMasterSigEventItem : public LMast
 
 class LMaster : public MidiEditor {
       Q3ListView* view;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       Q3PopupMenu* menuEdit;
 
       enum { CMD_DELETE, CMD_INSERT_SIG, CMD_INSERT_TEMPO, CMD_EDIT_BEAT, CMD_EDIT_VALUE };
diff -rupN muse2.org/muse/master/masteredit.cpp muse2.new/muse/master/masteredit.cpp
--- muse2.org/muse/master/masteredit.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/master/masteredit.cpp	2010-10-23 00:21:05.000000000 -0400
@@ -22,7 +22,8 @@
 #include "globals.h"
 
 #include <values.h>
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <q3accel.h>
@@ -100,13 +101,13 @@ MasterEdit::MasterEdit()
 //      menuBar()->insertItem("&File", file);
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(tr("edit tools"), this);
+      tools = new QToolBar(tr("edit tools"), this);
       undoRedo->addTo(tools);
 
       EditToolBar* tools2 = new EditToolBar(this,
          PointerTool | PencilTool | RubberTool);
 
-      Q3ToolBar* enableMaster = new Q3ToolBar(tr("EnableMaster"), this);
+      QToolBar* enableMaster = new QToolBar(tr("EnableMaster"), this);
       enableButton = new QToolButton(enableMaster);
       enableButton->setToggleButton(true);
       enableButton->setText(tr("Enable"));
@@ -114,7 +115,7 @@ MasterEdit::MasterEdit()
       enableButton->setOn(song->masterFlag());
       connect(enableButton, SIGNAL(toggled(bool)), song, SLOT(setMasterFlag(bool)));
 
-      Q3ToolBar* info = new Q3ToolBar(tr("Info"), this);
+      QToolBar* info = new QToolBar(tr("Info"), this);
       QLabel* label  = new QLabel(tr("Cursor"), info);
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
diff -rupN muse2.org/muse/master/masteredit.h muse2.new/muse/master/masteredit.h
--- muse2.org/muse/master/masteredit.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/master/masteredit.h	2010-10-23 00:21:17.000000000 -0400
@@ -47,7 +47,7 @@ class MasterEdit : public MidiEditor {
       TempoEdit* curTempo;
       SigEdit* curSig;
       LabelCombo* rasterLabel;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       PosLabel* cursorPos;
       TempoLabel* tempo;
       QToolButton* enableButton;
diff -rupN muse2.org/muse/midiedit/drumedit.cpp muse2.new/muse/midiedit/drumedit.cpp
--- muse2.org/muse/midiedit/drumedit.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/midiedit/drumedit.cpp	2010-10-24 01:36:19.000000000 -0400
@@ -221,7 +221,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget
       //    Toolbars
       //---------------------------------------------------
 
-      tools = new Q3ToolBar(this, "drum-tools");
+      tools = new QToolBar(this, "drum-tools");
       new QToolButton(*openIcon, tr("Load Drummap"),
                   QString::null, this, SLOT(load()),
                   tools, "load drummap from file");
@@ -246,15 +246,18 @@ DrumEdit::DrumEdit(PartList* pl, QWidget
       QToolTip::add(midiin, tr("Midi Input"));
       midiin->setPixmap(*midiinIcon);
       midiin->setToggleButton(true);
+      this->addToolBar(tools);
 
       tools2 = new EditToolBar(this, drumeditTools);
+      this->addToolBar(tools2);
 
-      Q3ToolBar* transport = new Q3ToolBar(this);
+      QToolBar* transport = new QToolBar(this);
       transportAction->addTo(transport);
-
+      this->addToolBar(transport);
       // dontt show pitch value in toolbar
       //toolbar = new Toolbar1(this, _rasterInit, _quantInit, false);
       toolbar = new Toolbar1(this, _rasterInit, _quantInit);
+      this->addToolBar(toolbar);
       info    = new NoteInfo(this);
 
       //---------------------------------------------------
diff -rupN muse2.org/muse/midiedit/drumedit.h muse2.new/muse/midiedit/drumedit.h
--- muse2.org/muse/midiedit/drumedit.h	2010-10-22 01:14:48.000000000 -0400
+++ muse2.new/muse/midiedit/drumedit.h	2010-10-23 00:25:12.000000000 -0400
@@ -94,7 +94,7 @@ class DrumEdit : public MidiEditor {
       QWidget* split1w1;
       DList* dlist;
       Header* header;
-      Q3ToolBar* tools;
+      QToolBar* tools;
 
       static int _quantInit, _rasterInit;
       static int _widthInit, _heightInit;
diff -rupN muse2.org/muse/midiedit/pianoroll.cpp muse2.new/muse/midiedit/pianoroll.cpp
--- muse2.org/muse/midiedit/pianoroll.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/midiedit/pianoroll.cpp	2010-10-24 01:33:32.000000000 -0400
@@ -22,7 +22,7 @@
 #include <qaction.h>
 //Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QResizeEvent>
 #include <QCloseEvent>
 
@@ -178,10 +178,11 @@ PianoRoll::PianoRoll(PartList* pl, QWidg
       connect(menuFunctions, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "pianoroll-tools");
+      tools = new QToolBar(this, "pianoroll-tools");
       tools->setLabel(tr("Pianoroll Tools"));
       undoRedo->addTo(tools);
       tools->addSeparator();
+      this->addToolBar(tools);
 
       srec  = new QToolButton(tools, "srec");
       QToolTip::add(srec, tr("Step Record"));
@@ -199,16 +200,20 @@ PianoRoll::PianoRoll(PartList* pl, QWidg
       speaker->setToggleButton(true);
 
       tools2 = new EditToolBar(this, pianorollTools);
+      this->addToolBar(tools2);
 
-      Q3ToolBar* panicToolbar = new Q3ToolBar(this);
+      QToolBar* panicToolbar = new QToolBar(this);
       panicAction->addTo(panicToolbar);
+      this->addToolBar(panicToolbar);
 
       //-------------------------------------------------------------
       //    Transport Bar
-      Q3ToolBar* transport = new Q3ToolBar(this);
+      QToolBar* transport = new QToolBar(this);
       transportAction->addTo(transport);
+      this->addToolBar(transport);
 
       toolbar = new Toolbar1(this, _rasterInit, _quantInit);
+      this->addToolBar(toolbar);
       info    = new NoteInfo(this);
 
       //---------------------------------------------------
@@ -233,7 +238,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidg
       mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
 
       QWidget* split1     = new QWidget(splitter, "split1");
-      Q3GridLayout* gridS1 = new Q3GridLayout(split1);
+      QGridLayout* gridS1 = new QGridLayout(split1);
       time                = new MTScale(&_raster, split1, xscale);
       Piano* piano        = new Piano(split1, yscale);
       canvas              = new PianoCanvas(this, split1, xscale, yscale);
diff -rupN muse2.org/muse/midiedit/pianoroll.h muse2.new/muse/midiedit/pianoroll.h
--- muse2.org/muse/midiedit/pianoroll.h	2010-10-22 01:14:48.000000000 -0400
+++ muse2.new/muse/midiedit/pianoroll.h	2010-10-23 00:23:33.000000000 -0400
@@ -72,7 +72,7 @@ class PianoRoll : public MidiEditor {
       Splitter* splitter;
 
       QToolButton* speaker;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       EditToolBar* tools2;
 
       Q3PopupMenu* eventColor;
diff -rupN muse2.org/muse/midiedit/quantconfig.cpp muse2.new/muse/midiedit/quantconfig.cpp
--- muse2.org/muse/midiedit/quantconfig.cpp	2010-10-22 01:14:48.000000000 -0400
+++ muse2.new/muse/midiedit/quantconfig.cpp	2010-10-23 02:30:09.000000000 -0400
@@ -7,7 +7,7 @@
 //=========================================================
 
 #include <qspinbox.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <q3groupbox.h>
@@ -15,7 +15,7 @@
 
 #include "quantconfig.h"
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 const char* wtStrengthTxt = QT_TR_NOOP("sets amount of quantization:\n"
                             "0   - no quantization\n"
@@ -31,7 +31,7 @@ QuantConfig::QuantConfig(int s, int l, b
    : QDialog()
       {
       setCaption(tr("MusE: Config Quantize"));
-      Q3VBoxLayout* layout = new Q3VBoxLayout(this);
+      QVBoxLayout* layout = new QVBoxLayout(this);
       Q3GroupBox* gb = new Q3GroupBox(2, Qt::Horizontal, tr("Config Quantize"), this);
       layout->addWidget(gb);
 
diff -rupN muse2.org/muse/mixer/amixer.cpp muse2.new/muse/mixer/amixer.cpp
--- muse2.org/muse/mixer/amixer.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/amixer.cpp	2010-10-23 14:09:16.000000000 -0400
@@ -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
 
 //AudioMixerApp::AudioMixerApp(QWidget* parent)
 AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
-   : Q3MainWindow(parent, "mixer")
+   : QMainWindow(parent, "mixer")
       {
       cfg = c;
       oldAuxsSize = 0;
@@ -55,26 +55,38 @@ AudioMixerApp::AudioMixerApp(QWidget* pa
       //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);
       
       /*
       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 +101,23 @@ AudioMixerApp::AudioMixerApp(QWidget* pa
       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 +145,16 @@ AudioMixerApp::AudioMixerApp(QWidget* pa
       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 -rupN muse2.org/muse/mixer/amixer.h muse2.new/muse/mixer/amixer.h
--- muse2.org/muse/mixer/amixer.h	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/amixer.h	2010-10-23 14:09:34.000000000 -0400
@@ -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 -rupN muse2.org/muse/mixer/astrip.cpp muse2.new/muse/mixer/astrip.cpp
--- muse2.org/muse/mixer/astrip.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/astrip.cpp	2010-10-23 02:54:26.000000000 -0400
@@ -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 
       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, 
       //    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, 
       //    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, 
 
       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, 
       //    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 -rupN muse2.org/muse/mixer/meter.cpp muse2.new/muse/mixer/meter.cpp
--- muse2.org/muse/mixer/meter.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/meter.cpp	2010-10-23 02:04:20.000000000 -0400
@@ -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 -rupN muse2.org/muse/mixer/meter.h muse2.new/muse/mixer/meter.h
--- muse2.org/muse/mixer/meter.h	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/meter.h	2010-10-23 02:13:47.000000000 -0400
@@ -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 -rupN muse2.org/muse/mixer/mstrip.cpp muse2.new/muse/mixer/mstrip.cpp
--- muse2.org/muse/mixer/mstrip.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/mstrip.cpp	2010-10-23 02:24:37.000000000 -0400
@@ -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 Q
       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, Mi
       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, Mi
       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, Mi
       //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 -rupN muse2.org/muse/mixer/strip.cpp muse2.new/muse/mixer/strip.cpp
--- muse2.org/muse/mixer/strip.cpp	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/strip.cpp	2010-10-23 02:23:41.000000000 -0400
@@ -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 -rupN muse2.org/muse/mixer/strip.h muse2.new/muse/mixer/strip.h
--- muse2.org/muse/mixer/strip.h	2010-10-22 01:14:50.000000000 -0400
+++ muse2.new/muse/mixer/strip.h	2010-10-23 02:23:20.000000000 -0400
@@ -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();
 
diff -rupN muse2.org/muse/mplugins/rhythm.cpp muse2.new/muse/mplugins/rhythm.cpp
--- muse2.org/muse/mplugins/rhythm.cpp	2010-10-22 01:14:48.000000000 -0400
+++ muse2.new/muse/mplugins/rhythm.cpp	2010-10-23 02:07:06.000000000 -0400
@@ -55,7 +55,8 @@ void RhythmGen::closeEvent(QCloseEvent* 
 
 #include <qvariant.h>
 #include <qcheckbox.h>
-#include <q3frame.h>
+//#include <q3frame.h>
+#include <QFrame>
 #include <qlabel.h>
 #include <qlcdnumber.h>
 #include <q3listbox.h>
@@ -231,9 +232,9 @@ RhythmGenerator::RhythmGenerator( QWidge
     setCaption( trUtf8( "Form3" ) );
     RhythmGeneratorLayout = new Q3VBoxLayout( this, 11, 6, "RhythmGeneratorLayout");
 
-    Frame6 = new Q3Frame( this, "Frame6" );
-    Frame6->setFrameShape( Q3Frame::StyledPanel );
-    Frame6->setFrameShadow( Q3Frame::Raised );
+    Frame6 = new QFrame( this);
+    Frame6->setFrameShape( QFrame::StyledPanel );
+    Frame6->setFrameShadow( QFrame::Raised );
     Frame6Layout = new Q3VBoxLayout( Frame6, 11, 6, "Frame6Layout");
 
     TextLabel1 = new QLabel( Frame6, "TextLabel1" );
@@ -351,9 +352,9 @@ RhythmGenerator::RhythmGenerator( QWidge
 
     Layout27 = new Q3HBoxLayout( 0, 0, 15, "Layout27");
 
-    Frame5 = new Q3Frame( this, "Frame5" );
-    Frame5->setFrameShape( Q3Frame::StyledPanel );
-    Frame5->setFrameShadow( Q3Frame::Raised );
+    Frame5 = new QFrame( this );
+    Frame5->setFrameShape( QFrame::StyledPanel );
+    Frame5->setFrameShadow( QFrame::Raised );
     Frame5Layout = new Q3VBoxLayout( Frame5, 11, 6, "Frame5Layout");
 
     TextLabel2 = new QLabel( Frame5, "TextLabel2" );
@@ -430,9 +431,9 @@ RhythmGenerator::RhythmGenerator( QWidge
     Frame5Layout->addWidget( RandomizeCheck );
     Layout27->addWidget( Frame5 );
 
-    Frame5_2 = new Q3Frame( this, "Frame5_2" );
-    Frame5_2->setFrameShape( Q3Frame::StyledPanel );
-    Frame5_2->setFrameShadow( Q3Frame::Raised );
+    Frame5_2 = new QFrame( this );
+    Frame5_2->setFrameShape( QFrame::StyledPanel );
+    Frame5_2->setFrameShadow( QFrame::Raised );
     Frame5_2Layout = new Q3VBoxLayout( Frame5_2, 11, 6, "Frame5_2Layout");
 
     TextLabel3 = new QLabel( Frame5_2, "TextLabel3" );
@@ -477,23 +478,23 @@ RhythmGenerator::RhythmGenerator( QWidge
 
     Layout29 = new Q3HBoxLayout( 0, 0, 6, "Layout29");
 
-    Frame6_2 = new Q3Frame( this, "Frame6_2" );
+    Frame6_2 = new QFrame( this );
     Frame6_2->setMinimumSize( QSize( 200, 150 ) );
-    Frame6_2->setFrameShape( Q3Frame::StyledPanel );
-    Frame6_2->setFrameShadow( Q3Frame::Raised );
+    Frame6_2->setFrameShape( QFrame::StyledPanel );
+    Frame6_2->setFrameShadow( QFrame::Raised );
     Layout29->addWidget( Frame6_2 );
 
-    Frame7 = new Q3Frame( this, "Frame7" );
+    Frame7 = new QFrame( this );
     Frame7->setMinimumSize( QSize( 200, 150 ) );
-    Frame7->setFrameShape( Q3Frame::StyledPanel );
-    Frame7->setFrameShadow( Q3Frame::Raised );
+    Frame7->setFrameShape( QFrame::StyledPanel );
+    Frame7->setFrameShadow( QFrame::Raised );
     Layout29->addWidget( Frame7 );
     RhythmGeneratorLayout->addLayout( Layout29 );
 
-    Frame8 = new Q3Frame( this, "Frame8" );
+    Frame8 = new QFrame( this );
     Frame8->setMinimumSize( QSize( 400, 150 ) );
-    Frame8->setFrameShape( Q3Frame::StyledPanel );
-    Frame8->setFrameShadow( Q3Frame::Raised );
+    Frame8->setFrameShape( QFrame::StyledPanel );
+    Frame8->setFrameShadow( QFrame::Raised );
     RhythmGeneratorLayout->addWidget( Frame8 );
 
     // signals and slots connections
diff -rupN muse2.org/muse/plugin.cpp muse2.new/muse/plugin.cpp
--- muse2.org/muse/plugin.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/plugin.cpp	2010-10-23 02:47:09.000000000 -0400
@@ -8,10 +8,10 @@
 
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3BoxLayout>
-#include <Q3GridLayout>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QBoxLayout>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <Qt3Support>
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,13 +20,14 @@
 #include <math.h>
 
 #include <qwidget.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qlabel.h>
 #include <qsignalmapper.h>
 #include <qpushbutton.h>
 #include <q3scrollview.h>
 #include <q3listview.h>
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <q3whatsthis.h>
 #include <qcheckbox.h>
@@ -35,7 +36,8 @@
 #include <qfile.h>
 #include <qobject.h>
 #include <qcombobox.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
+#include <QGroupBox>
 #include <qradiobutton.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
@@ -2530,7 +2532,7 @@ PluginDialog::PluginDialog(QWidget* pare
   : QDialog(parent, name, modal)
       {
       setCaption(tr("MusE: select plugin"));
-      Q3VBoxLayout* layout = new Q3VBoxLayout(this);
+      QVBoxLayout* layout = new QVBoxLayout(this);
 
       pList  = new Q3ListView(this);
       pList->setAllColumnsShowFocus(true);
@@ -2553,7 +2555,7 @@ PluginDialog::PluginDialog(QWidget* pare
       //  Ok/Cancel Buttons
       //---------------------------------------------------
 
-      Q3BoxLayout* w5 = new Q3HBoxLayout;
+      QBoxLayout* w5 = new QHBoxLayout;
       layout->addLayout(w5);
 
       QPushButton* okB     = new QPushButton(tr("Ok"), this);
@@ -2565,7 +2567,9 @@ PluginDialog::PluginDialog(QWidget* pare
       w5->addSpacing(12);
       w5->addWidget(cancelB);
 
-      Q3ButtonGroup* plugSel = new Q3ButtonGroup(4, Qt::Horizontal, this, "Show plugs:");
+      // ORCAN - CHECK
+      //QButtonGroup* plugSel = new QButtonGroup(4, Qt::Horizontal, this, "Show plugs:");
+      QGroupBox* plugSel = new QGroupBox(this);
       plugSel->setTitle("Show plugs:");
       QRadioButton* onlySM = new QRadioButton(plugSel, "Mono and Stereo");
       onlySM->setText( "Mono and Stereo");
@@ -2576,8 +2580,9 @@ PluginDialog::PluginDialog(QWidget* pare
       QRadioButton* allPlug = new QRadioButton(plugSel, "Show all");
       allPlug->setText( "Show All");
 
-      plugSel->setRadioButtonExclusive(true);
-      plugSel->setButton(selectedPlugType);
+      // ORCAN - FIXME
+      //plugSel->setRadioButtonExclusive(true);
+      //plugSel->setButton(selectedPlugType);
 
       QToolTip::add(plugSel, tr("Select which types of plugins should be visible in the list.<br>"
                              "Note that using mono plugins on stereo tracks is not a problem, two will be used in parallel.<br>"
@@ -2825,7 +2830,7 @@ PluginGui::PluginGui(PluginIBase* p)
       plugin = p;
       setCaption(plugin->name());
 
-      Q3ToolBar* tools = new Q3ToolBar(tr("File Buttons"), this);
+      QToolBar* tools = new QToolBar(tr("File Buttons"), this);
       QToolButton* fileOpen = new QToolButton(
          QIcon(*openIconS), // ddskrjo
          tr("Load Preset"),
@@ -2968,7 +2973,7 @@ PluginGui::PluginGui(PluginIBase* p)
             //view->setVScrollBarMode(QScrollView::AlwaysOff);
             view->addChild(mw);
             
-            Q3GridLayout* grid = new Q3GridLayout(mw);
+            QGridLayout* grid = new QGridLayout(mw);
             grid->setSpacing(2);
 
             int n  = plugin->parameters();
diff -rupN muse2.org/muse/song.cpp muse2.new/muse/song.cpp
--- muse2.org/muse/song.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/song.cpp	2010-10-23 14:07:50.000000000 -0400
@@ -11,7 +11,8 @@
 #include <errno.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
+#include <QMenu>
 #include <qdir.h>
 #include <qaction.h>
 #include <qcursor.h>
@@ -2342,7 +2343,7 @@ int Song::execAutomationCtlPopup(AudioTr
 {
   //enum { HEADER, SEP1, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
   enum { HEADER, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
-  Q3PopupMenu* menu = new Q3PopupMenu;
+  QMenu* menu = new QMenu;
 
   int count = 0;
   bool isEvent = false, canSeekPrev = false, canSeekNext = false, canEraseRange = false;
@@ -2406,6 +2407,8 @@ int Song::execAutomationCtlPopup(AudioTr
   menu->insertItem(tr("clear automation"), CLEAR_ALL_EVENTS, CLEAR_ALL_EVENTS);
   menu->setItemEnabled(CLEAR_ALL_EVENTS, (bool)count);
 
+  // ORCAN - FIXME
+  /*
   int sel = menu->exec(menupos, 1);
   delete menu;
   if (sel == -1)
@@ -2446,6 +2449,8 @@ int Song::execAutomationCtlPopup(AudioTr
     break;      
   }
   return sel;
+  */
+  return 0;
 }
 
 //---------------------------------------------------------
@@ -2459,7 +2464,7 @@ int Song::execMidiAutomationCtlPopup(Mid
     
   //enum { HEADER, SEP1, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
   enum { HEADER, ADD_EVENT, CLEAR_EVENT };
-  Q3PopupMenu* menu = new Q3PopupMenu;
+  QMenu* menu = new QMenu;
 
   //int count = 0;
   bool isEvent = false;
@@ -2576,6 +2581,9 @@ int Song::execMidiAutomationCtlPopup(Mid
 //  menu->insertItem(tr("clear automation"), CLEAR_ALL_EVENTS, CLEAR_ALL_EVENTS);
 //  menu->setItemEnabled(CLEAR_ALL_EVENTS, (bool)count);
 
+
+// ORCAN - FIXME
+/*
   int sel = menu->exec(menupos, 1);
   delete menu;
   if (sel == -1)
@@ -2663,6 +2671,8 @@ int Song::execMidiAutomationCtlPopup(Mid
   }
   
   return sel;
+*/
+  return 0;
 }
 
 //---------------------------------------------------------
@@ -3618,7 +3628,7 @@ void Song::executeScript(const char* scr
 
 #define SCRIPTSSUFFIX "/share/muse/scripts/"
 #define USERSCRIPTSSUFFIX "/.muse/scripts/"
-void Song::populateScriptMenu(Q3PopupMenu* menuPlugins, QObject* receiver)
+void Song::populateScriptMenu(QMenu* menuPlugins, QObject* receiver)
 {
       //
       // List scripts
diff -rupN muse2.org/muse/song.h muse2.new/muse/song.h
--- muse2.org/muse/song.h	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/song.h	2010-10-23 13:57:04.000000000 -0400
@@ -13,7 +13,8 @@
 #include <qobject.h>
 #include <qfont.h>
 //Added by qt3to4:
-#include <Q3PopupMenu>
+//#include <Q3PopupMenu>
+#include <QMenu>
 #include <QEvent>
 
 #include "pos.h"
@@ -38,7 +39,7 @@ class EventList;
 class MarkerList;
 class Marker;
 class SNode;
-class Q3PopupMenu;
+class QMenu;
 class QButton;
 
 class MidiPort;
@@ -390,7 +391,7 @@ class Song : public QObject {
       Track* addTrack(int);
       Track* addNewTrack(int);
       QString getScriptPath(int id, bool delivered);
-      void populateScriptMenu(Q3PopupMenu* menuPlugins, QObject* receiver);
+      void populateScriptMenu(QMenu* menuPlugins, QObject* receiver);
 
    signals:
       void songChanged(int);
diff -rupN muse2.org/muse/.svn/entries muse2.new/muse/.svn/entries
--- muse2.org/muse/.svn/entries	2010-10-23 01:48:29.000000000 -0400
+++ muse2.new/muse/.svn/entries	2010-10-24 01:46:13.000000000 -0400
@@ -4086,33 +4086,12 @@ file
 
 
 
-2010-10-23T05:48:29.000000Z
+
 7e4c94b2b3f7967fb97e45aacae5d7b3
 2010-10-23T04:25:08.647453Z
 486
 terminator356
 has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8633
 
 xml.cpp
 file
diff -rupN muse2.org/muse/transport.cpp muse2.new/muse/transport.cpp
--- muse2.org/muse/transport.cpp	2010-10-22 01:14:51.000000000 -0400
+++ muse2.new/muse/transport.cpp	2010-10-23 02:07:41.000000000 -0400
@@ -10,7 +10,8 @@
 #include <qlabel.h>
 #include <qslider.h>
 #include <qpushbutton.h>
-#include <q3frame.h>
+//#include <q3frame.h>
+#include <QFrame>
 #include <q3whatsthis.h>
 #include <qtooltip.h>
 #include <qlayout.h>
@@ -115,8 +116,8 @@ TempoSig::TempoSig(QWidget* parent)
       Q3BoxLayout* vb1 = new Q3VBoxLayout(this);
       vb1->setAutoAdd(true);
 
-      Q3Frame* f = new Q3Frame(this);
-      f->setFrameStyle(Q3Frame::Panel | Q3Frame::Sunken);
+      QFrame* f = new QFrame(this);
+      f->setFrameStyle(QFrame::Panel | QFrame::Sunken);
       f->setLineWidth(1);
 
       Q3BoxLayout* vb2 = new Q3VBoxLayout(f);
diff -rupN muse2.org/muse/waveedit/waveedit.cpp muse2.new/muse/waveedit/waveedit.cpp
--- muse2.org/muse/waveedit/waveedit.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/waveedit/waveedit.cpp	2010-10-23 00:16:41.000000000 -0400
@@ -21,7 +21,8 @@
 #include "icons.h"
 #include "shortcuts.h"
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <q3accel.h>
 #include <qlayout.h>
@@ -105,7 +106,7 @@ WaveEdit::WaveEdit(PartList* pl)
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "waveedit-tools");
+      tools = new QToolBar(this, "waveedit-tools");
       undoRedo->addTo(tools);
 
       Q3Accel* qa = new Q3Accel(this);
@@ -116,13 +117,13 @@ WaveEdit::WaveEdit(PartList* pl)
 
       //--------------------------------------------------
       //    Transport Bar
-      Q3ToolBar* transport = new Q3ToolBar(this);
+      QToolBar* transport = new QToolBar(this);
       transportAction->addTo(transport);
 
       //--------------------------------------------------
       //    ToolBar:   Solo  Cursor1 Cursor2
 
-      tb1 = new Q3ToolBar(this, "pianoroll-tools");
+      tb1 = new QToolBar(this, "pianoroll-tools");
 
       tb1->setLabel(tr("weTools"));
       solo = new QToolButton(tb1);
diff -rupN muse2.org/muse/waveedit/waveedit.h muse2.new/muse/waveedit/waveedit.h
--- muse2.org/muse/waveedit/waveedit.h	2010-10-22 01:14:49.000000000 -0400
+++ muse2.new/muse/waveedit/waveedit.h	2010-10-23 00:16:11.000000000 -0400
@@ -32,8 +32,8 @@ class SNode;
 class WaveEdit : public MidiEditor {
       WaveView* view;
       QSlider* ymag;
-      Q3ToolBar* tools;
-      Q3ToolBar* tb1;
+      QToolBar* tools;
+      QToolBar* tb1;
       QToolButton* solo;
       PosLabel* pos1;
       PosLabel* pos2;
diff -rupN muse2.org/muse/widgets/action.h muse2.new/muse/widgets/action.h
--- muse2.org/muse/widgets/action.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/action.h	2010-10-23 00:59:40.000000000 -0400
@@ -14,13 +14,14 @@
 //   Action
 //---------------------------------------------------------
 
-class Action : public Q3Action {
+class Action : public QAction {
       Q_OBJECT
       int _id;
 
    public:
+      // ORCAN - CHECK:
       Action(QObject* parent, int i, const char* name = 0, bool toggle = false)
-         : Q3Action(parent, name, toggle) {
+         : QAction(name, parent) {
             _id = i;
             }
       void setId(int i) { _id = i; }
diff -rupN muse2.org/muse/widgets/combobox.cpp muse2.new/muse/widgets/combobox.cpp
--- muse2.org/muse/widgets/combobox.cpp	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/combobox.cpp	2010-10-23 02:10:38.000000000 -0400
@@ -9,7 +9,7 @@
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QMouseEvent>
-#include <Q3Frame>
+#include <QFrame>
 #include <QLabel>
 #include "combobox.h"
 
@@ -24,7 +24,7 @@ ComboBox::ComboBox(QWidget* parent, cons
       _id = -1;
       list = new Q3PopupMenu(0, "comboPopup");
       connect(list, SIGNAL(activated(int)), SLOT(activatedIntern(int)));
-      setFrameStyle(Q3Frame::Panel | Q3Frame::Raised);
+      setFrameStyle(QFrame::Panel | QFrame::Raised);
       setLineWidth(2);
       }
 
diff -rupN muse2.org/muse/widgets/lcombo.cpp muse2.new/muse/widgets/lcombo.cpp
--- muse2.org/muse/widgets/lcombo.cpp	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/lcombo.cpp	2010-10-23 02:33:10.000000000 -0400
@@ -7,11 +7,11 @@
 
 #include "lcombo.h"
 
-#include <qlayout.h>
-#include <q3frame.h>
+#include <QLayout>
+#include <QFrame>
 #include <qlabel.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 
 //---------------------------------------------------------
 //   LabelCombo
@@ -21,7 +21,7 @@ LabelCombo::LabelCombo(const QString& tx
    const char* name) : QWidget(parent, name)
       {
 //      setFixedHeight(20);
-      Q3HBoxLayout* layout = new Q3HBoxLayout(this);
+      QHBoxLayout* layout = new QHBoxLayout(this);
       QLabel* label = new QLabel(txt, this);
       box = new QComboBox(false, this);
       layout->addStretch();
@@ -46,4 +46,4 @@ void LabelCombo::clearFocus()
 void LabelCombo::setFocusPolicy ( Qt::FocusPolicy fp )
 {
   box->setFocusPolicy(fp);
-}
\ No newline at end of file
+}
diff -rupN muse2.org/muse/widgets/nentry.cpp muse2.new/muse/widgets/nentry.cpp
--- muse2.org/muse/widgets/nentry.cpp	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/nentry.cpp	2010-10-23 02:32:27.000000000 -0400
@@ -5,13 +5,13 @@
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <qlayout.h>
+#include <QLayout>
 #include <qlabel.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 #include <QContextMenuEvent>
 #include <QWheelEvent>
-#include <Q3Frame>
+#include <QFrame>
 #include <QMouseEvent>
 #include <QKeyEvent>
 #include "nentry.h"
@@ -81,7 +81,7 @@ bool NentryFilter::eventFilter(QObject*,
 //---------------------------------------------------------
 
 Nentry::Nentry(QWidget* parent, const QString& txt,
-   int _lPos, bool dark) : Q3Frame(parent)
+   int _lPos, bool dark) : QFrame(parent)
       {
       focusW     = 0;
       lPos       = _lPos;
@@ -97,7 +97,7 @@ Nentry::Nentry(QWidget* parent, const QS
       edit->setCursor(QCursor(Qt::arrowCursor));
 //      edit->setFont(font3);
       val = 0;
-      layout = new Q3HBoxLayout(this);
+      layout = new QHBoxLayout(this);
       if (txt == "") {
             layout->addWidget(edit, 1, Qt::AlignHCenter);
             }
diff -rupN muse2.org/muse/widgets/nentry.h muse2.new/muse/widgets/nentry.h
--- muse2.org/muse/widgets/nentry.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/nentry.h	2010-10-23 02:32:44.000000000 -0400
@@ -8,20 +8,20 @@
 #ifndef __NENTRY_H__
 #define __NENTRY_H__
 
-#include <q3frame.h>
+#include <QFrame>
 #include <qlineedit.h>
 #include <qstring.h>
 //Added by qt3to4:
 #include <QWheelEvent>
 #include <QEvent>
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QLabel>
 #include <QContextMenuEvent>
 #include <QKeyEvent>
 
 class QTimer;
-class Q3HBoxLayout;
+class QHBoxLayout;
 class QLabel;
 
 class NentryFilter : public QObject {
@@ -38,7 +38,7 @@ class NentryFilter : public QObject {
 //    numerical entry widget with optional label
 //---------------------------------------------------------
 
-class Nentry : public Q3Frame {
+class Nentry : public QFrame {
       Q_OBJECT
 
       int button;
@@ -47,7 +47,7 @@ class Nentry : public Q3Frame {
       QTimer* timer;
       int evx;
       int timecount;
-      Q3HBoxLayout* layout;
+      QHBoxLayout* layout;
       QObject* filter;
       QLabel* label;
       int lPos;   // label Position 0 - left, 1 - right
diff -rupN muse2.org/muse/widgets/noteinfo.cpp muse2.new/muse/widgets/noteinfo.cpp
--- muse2.org/muse/widgets/noteinfo.cpp	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/noteinfo.cpp	2010-10-23 00:41:45.000000000 -0400
@@ -21,8 +21,8 @@
 //    Start, L�nge, Note, Velo an, Velo aus, Kanal
 //---------------------------------------------------
 
-NoteInfo::NoteInfo(Q3MainWindow* parent)
-   : Q3ToolBar(tr("Note Info"), parent)
+NoteInfo::NoteInfo(QMainWindow* parent)
+   : QToolBar(tr("Note Info"), parent)
       {
       deltaMode = false;
 
diff -rupN muse2.org/muse/widgets/noteinfo.h muse2.new/muse/widgets/noteinfo.h
--- muse2.org/muse/widgets/noteinfo.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/noteinfo.h	2010-10-23 00:41:38.000000000 -0400
@@ -7,19 +7,20 @@
 #ifndef __NOTE_INFO_H__
 #define __NOTE_INFO_H__
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 
 class PosEdit;
 class QSpinBox;
 class PitchEdit;
-class Q3MainWindow;
+class QMainWindow;
 class Pos;
 
 //---------------------------------------------------------
 //   NoteInfo
 //---------------------------------------------------------
 
-class NoteInfo : public Q3ToolBar {
+class NoteInfo : public QToolBar {
       PosEdit* selTime;
       QSpinBox* selLen;
       PitchEdit* selPitch;
@@ -31,7 +32,7 @@ class NoteInfo : public Q3ToolBar {
 
    public:
       enum ValType {VAL_TIME, VAL_LEN, VAL_VELON, VAL_VELOFF, VAL_PITCH };
-      NoteInfo(Q3MainWindow* parent);
+      NoteInfo(QMainWindow* parent);
       void setValues(unsigned, int, int, int, int);
       void setDeltaMode(bool);
 
diff -rupN muse2.org/muse/widgets/sliderbase.h muse2.new/muse/widgets/sliderbase.h
--- muse2.org/muse/widgets/sliderbase.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/sliderbase.h	2010-10-23 02:09:10.000000000 -0400
@@ -15,7 +15,7 @@
 #define __SLIDERBASE_H__
 
 #include "drange.h"
-#include <q3frame.h>
+#include <QFrame>
 #include <qpixmap.h>
 #include <qdatetime.h>
 //#include <qbutton.h>
diff -rupN muse2.org/muse/widgets/tb1.cpp muse2.new/muse/widgets/tb1.cpp
--- muse2.org/muse/widgets/tb1.cpp	2010-10-22 01:48:59.000000000 -0400
+++ muse2.new/muse/widgets/tb1.cpp	2010-10-23 00:38:24.000000000 -0400
@@ -57,13 +57,14 @@ static const char* quantStrings[] = {
 //    solo time pitch raster quant
 //---------------------------------------------------------
 
-Toolbar1::Toolbar1(Q3MainWindow* parent, int r, int q, bool sp)
+Toolbar1::Toolbar1(QMainWindow* parent, int r, int q, bool sp)
 //Toolbar1::Toolbar1(QWidget* parent, int r, int q, bool sp)    // p4.0.4
-   : Q3ToolBar(QString("Quant'n'Snap-tools"), parent)
+   : QToolBar(QString("Quant'n'Snap-tools"), parent)
    //: QToolBar(QString("Qant'n'Snap-tools"), parent)             
       {
       showPitch = sp;
-      setHorizontalStretchable(false);    
+      // ORCAN - FIXME: Check this:
+      //setHorizontalStretchable(false);
 
       solo = new QToolButton(this);
       solo->setText(tr("Solo"));
diff -rupN muse2.org/muse/widgets/tb1.h muse2.new/muse/widgets/tb1.h
--- muse2.org/muse/widgets/tb1.h	2010-10-22 01:48:59.000000000 -0400
+++ muse2.new/muse/widgets/tb1.h	2010-10-23 00:28:20.000000000 -0400
@@ -9,10 +9,10 @@
 #define __TB1_H__
 
 //#include <qwidget.h>
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
 
 #include <QWidget>      // p4.0.4
-//#include <QToolBar>     //
+#include <QToolBar>     //
 
 class PosLabel;
 class PitchLabel;
@@ -24,8 +24,8 @@ class QToolButton;
 //   Toolbar1
 //---------------------------------------------------------
 
-class Toolbar1 : public Q3ToolBar {
-//class Toolbar1 : public QToolBar {       // p4.0.4
+//class Toolbar1 : public Q3ToolBar {
+class Toolbar1 : public QToolBar {       // p4.0.4
       QToolButton* solo;
       PosLabel* pos;
       PitchLabel* pitch;
@@ -52,7 +52,7 @@ class Toolbar1 : public Q3ToolBar {
       void toChanged(int);
 
    public:
-      Toolbar1(Q3MainWindow* parent, int r=96,
+      Toolbar1(QMainWindow* parent, int r=96,
       //Toolbar1(QWidget* parent, int r=96,     // p4.0.4
          int q=96, bool showPitch=true);
       void setSolo(bool val);
diff -rupN muse2.org/muse/widgets/tools.cpp muse2.new/muse/widgets/tools.cpp
--- muse2.org/muse/widgets/tools.cpp	2010-10-22 21:51:41.000000000 -0400
+++ muse2.new/muse/widgets/tools.cpp	2010-10-24 00:37:47.000000000 -0400
@@ -7,13 +7,13 @@
 
 #include "tools.h"
 #include <qpixmap.h>
-#include <q3buttongroup.h>
+//#include <q3buttongroup.h>
 #include <qtoolbutton.h>
-#include <qtooltip.h>
-#include <q3whatsthis.h>
-#include <q3mainwindow.h>
+//#include <qtooltip.h>
+//#include <q3whatsthis.h>
+//#include <q3mainwindow.h>
 //Added by qt3to4:
-#include <Q3ActionGroup>
+#include <QActionGroup>
 
 #include "icons.h"
 #include "action.h"
@@ -56,10 +56,12 @@ ToolB toolList[] = {
 //   EditToolBar
 //---------------------------------------------------------
 
-EditToolBar::EditToolBar(Q3MainWindow* parent, int tools, const char*)
-   : Q3ToolBar(tr("Edit Tools"), parent)
+EditToolBar::EditToolBar(QMainWindow* parent, int tools, const char*)
+   : QToolBar(tr("Edit Tools"), parent)
       {
-      Q3ActionGroup* action = new Q3ActionGroup(parent, "editaction", true);
+      // ORCAN - CHECK:
+      //QActionGroup* action = new QActionGroup(parent, "editaction", true);
+      QActionGroup* action = new QActionGroup(parent);
 
       nactions = 0;
       for (unsigned i = 0; i < sizeof(toolList)/sizeof(*toolList); ++i) {
@@ -86,16 +88,17 @@ EditToolBar::EditToolBar(Q3MainWindow* p
                   }
             ++n;
             }
+      action->setVisible(true);
       action->addTo(this);
-      //connect(action, SIGNAL(selected(Q3Action*)), SLOT(toolChanged(QAction*)));
-      connect(action, SIGNAL(selected(Q3Action*)), SLOT(toolChanged(Q3Action*)));   // p4.0.5
+      //connect(action, SIGNAL(selected(QAction*)), SLOT(toolChanged(QAction*)));
+      connect(action, SIGNAL(selected(QAction*)), SLOT(toolChanged(QAction*)));   // p4.0.5
       }
 
 //---------------------------------------------------------
 //   toolChanged
 //---------------------------------------------------------
 
-void EditToolBar::toolChanged(Q3Action* action)
+void EditToolBar::toolChanged(QAction* action)
       {
       emit toolChanged(((Action*)action)->id());
       }
diff -rupN muse2.org/muse/widgets/tools.h muse2.new/muse/widgets/tools.h
--- muse2.org/muse/widgets/tools.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/tools.h	2010-10-23 00:52:52.000000000 -0400
@@ -8,13 +8,14 @@
 #ifndef __TOOLS_H__
 #define __TOOLS_H__
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 //Added by qt3to4:
 #include <QPixmap>
 
-class Q3Action;
+class QAction;
 class Action;
-class Q3MainWindow;
+class QMainWindow;
 
 enum Tool { PointerTool=1, PencilTool=2, RubberTool=4, CutTool=8,
    ScoreTool=16, GlueTool=32, QuantTool=64, DrawTool=128, MuteTool=256};
@@ -33,13 +34,13 @@ extern ToolB toolList[];
 //   EditToolBar
 //---------------------------------------------------------
 
-class EditToolBar : public Q3ToolBar {
+class EditToolBar : public QToolBar {
       Q_OBJECT
       Action** actions;
       int nactions;
 
    private slots:
-      void toolChanged(Q3Action* action);
+      void toolChanged(QAction* action);
 
    signals:
       void toolChanged(int);
@@ -48,7 +49,7 @@ class EditToolBar : public Q3ToolBar {
       void set(int id);
 
    public:
-      EditToolBar(Q3MainWindow*, int, const char* name = 0);
+      EditToolBar(QMainWindow*, int, const char* name = 0);
       ~EditToolBar();
       int curTool();
       };
diff -rupN muse2.org/muse/widgets/utils.cpp muse2.new/muse/widgets/utils.cpp
--- muse2.org/muse/widgets/utils.cpp	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/utils.cpp	2010-10-23 02:10:06.000000000 -0400
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include "utils.h"
 #include <math.h>
-#include <q3frame.h>
+#include <QFrame>
 #include <sys/time.h>
 
 // Quick bit-shift lookup table
@@ -61,10 +61,10 @@ int num2cols(int min, int max)
 //   hLine
 //---------------------------------------------------------
 
-Q3Frame* hLine(QWidget* w)
+QFrame* hLine(QWidget* w)
       {
-      Q3Frame* delim = new Q3Frame(w);
-      delim->setFrameStyle(Q3Frame::HLine | Q3Frame::Sunken);
+      QFrame* delim = new QFrame(w);
+      delim->setFrameStyle(QFrame::HLine | QFrame::Sunken);
       return delim;
       }
 
@@ -72,10 +72,10 @@ Q3Frame* hLine(QWidget* w)
 //   vLine
 //---------------------------------------------------------
 
-Q3Frame* vLine(QWidget* w)
+QFrame* vLine(QWidget* w)
       {
-      Q3Frame* delim = new Q3Frame(w);
-      delim->setFrameStyle(Q3Frame::VLine | Q3Frame::Sunken);
+      QFrame* delim = new QFrame(w);
+      delim->setFrameStyle(QFrame::VLine | QFrame::Sunken);
       return delim;
       }
 
@@ -307,7 +307,7 @@ unsigned int string2u32bitmap(const QStr
 //---------------------------------------------------------
 // Added by Tim. p3.3.8
 
-bool autoAdjustFontSize(Q3Frame* w, const QString& s, bool ignoreWidth, bool ignoreHeight, int max, int min)
+bool autoAdjustFontSize(QFrame* w, const QString& s, bool ignoreWidth, bool ignoreHeight, int max, int min)
 {
   // In case the max or min was obtained from QFont::pointSize() which returns -1 
   //  if the font is a pixel font, or if min is greater than max...
diff -rupN muse2.org/muse/widgets/utils.h muse2.new/muse/widgets/utils.h
--- muse2.org/muse/widgets/utils.h	2010-10-22 01:14:46.000000000 -0400
+++ muse2.new/muse/widgets/utils.h	2010-10-23 02:10:22.000000000 -0400
@@ -1,5 +1,5 @@
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 //=========================================================
 //  MusE
 //  Linux Music Editor
@@ -10,7 +10,7 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-class Q3Frame;
+class QFrame;
 class QWidget;
 
 #include <qstring.h>
@@ -19,11 +19,11 @@ extern QString bitmap2String(int bm);
 extern int string2bitmap(const QString& str);
 extern QString u32bitmap2String(unsigned int bm);
 extern unsigned int string2u32bitmap(const QString& str);
-extern bool autoAdjustFontSize(Q3Frame* w, const QString& s, bool ignoreWidth = false, bool ignoreHeight = false, int max = 10, int min = 4);
+extern bool autoAdjustFontSize(QFrame* w, const QString& s, bool ignoreWidth = false, bool ignoreHeight = false, int max = 10, int min = 4);
 
 extern int num2cols(int min, int max);
-extern Q3Frame* hLine(QWidget* parent);
-extern Q3Frame* vLine(QWidget* parent);
+extern QFrame* hLine(QWidget* parent);
+extern QFrame* vLine(QWidget* parent);
 extern void dump(const unsigned char* p, int n);
 extern double curTime();