merged namespace changes. HOPEFULLY the last one.

4 files changed, 228 insertions, 209 deletions

diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 702e61e5..ce53069d 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -53,6 +53,8 @@
 #include "midi.h"
 #include "popupmenu.h"
 
+namespace MusEGui {
+
 //---------------------------------------------------------
 //   string2qhex
 //---------------------------------------------------------
@@ -114,10 +116,10 @@ char* hex2string(QWidget* parent, const char* src, int& len)
 //   getEvent
 //---------------------------------------------------------
 
-Event EditNoteDialog::getEvent(int tick, const Event& event, QWidget* parent)
+MusECore::Event EditNoteDialog::getEvent(int tick, const MusECore::Event& event, QWidget* parent)
       {
       EditNoteDialog* dlg = new EditNoteDialog(tick, event, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -125,10 +127,10 @@ Event EditNoteDialog::getEvent(int tick, const Event& event, QWidget* parent)
       return nevent;
       }
 
-Event EditSysexDialog::getEvent(int tick, const Event& event, QWidget* parent)
+MusECore::Event EditSysexDialog::getEvent(int tick, const MusECore::Event& event, QWidget* parent)
       {
       EditSysexDialog* dlg = new EditSysexDialog(tick, event, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -136,10 +138,10 @@ Event EditSysexDialog::getEvent(int tick, const Event& event, QWidget* parent)
       return nevent;
       }
 
-Event EditMetaDialog::getEvent(int tick, const Event& event, QWidget* parent)
+MusECore::Event EditMetaDialog::getEvent(int tick, const MusECore::Event& event, QWidget* parent)
       {
       EditEventDialog* dlg = new EditMetaDialog(tick, event, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -147,10 +149,10 @@ Event EditMetaDialog::getEvent(int tick, const Event& event, QWidget* parent)
       return nevent;
       }
 
-Event EditCAfterDialog::getEvent(int tick, const Event& event, QWidget* parent)
+MusECore::Event EditCAfterDialog::getEvent(int tick, const MusECore::Event& event, QWidget* parent)
       {
       EditEventDialog* dlg = new EditCAfterDialog(tick, event, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -158,10 +160,10 @@ Event EditCAfterDialog::getEvent(int tick, const Event& event, QWidget* parent)
       return nevent;
       }
 
-Event EditPAfterDialog::getEvent(int tick, const Event& event, QWidget* parent)
+MusECore::Event EditPAfterDialog::getEvent(int tick, const MusECore::Event& event, QWidget* parent)
       {
       EditEventDialog* dlg = new EditPAfterDialog(tick, event, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -204,7 +206,7 @@ EditEventDialog::EditEventDialog(QWidget* parent)
 //   EditNoteDialog
 //---------------------------------------------------------
 
-EditNoteDialog::EditNoteDialog(int tick, const Event& event,
+EditNoteDialog::EditNoteDialog(int tick, const MusECore::Event& event,
    QWidget* parent)
    : QDialog(parent)
       {
@@ -229,9 +231,9 @@ EditNoteDialog::EditNoteDialog(int tick, const Event& event,
 //   EditNoteDialog::event
 //---------------------------------------------------------
 
-Event EditNoteDialog::event()
+MusECore::Event EditNoteDialog::event()
       {
-      Event event(Note);
+      MusECore::Event event(MusECore::Note);
       event.setTick(epos->pos().tick());
       event.setA(pl->value());
       event.setB(il2->value());
@@ -244,7 +246,7 @@ Event EditNoteDialog::event()
 //   EditSysExDialog
 //---------------------------------------------------------
 
-EditSysexDialog::EditSysexDialog(int tick, const Event& event,
+EditSysexDialog::EditSysexDialog(int tick, const MusECore::Event& event,
    QWidget* parent)
    : QDialog(parent)
       {
@@ -273,9 +275,9 @@ EditSysexDialog::~EditSysexDialog()
 //   EditSysExDialog::event
 //---------------------------------------------------------
 
-Event EditSysexDialog::event()
+MusECore::Event EditSysexDialog::event()
       {
-      Event event(Sysex);
+      MusECore::Event event(MusECore::Sysex);
       event.setTick(epos->pos().tick());
       event.setData(sysex, len);
       return event;
@@ -300,7 +302,7 @@ void EditSysexDialog::accept()
 //   EditMetaDialog
 //---------------------------------------------------------
 
-EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
+EditMetaDialog::EditMetaDialog(int tick, const MusECore::Event& ev,
    QWidget* parent)
    : EditEventDialog(parent)
       {
@@ -312,7 +314,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Meta Type"));
-      il2 = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
+      il2 = new MusEGui::IntLabel(-1, 0, 127, this, -1);
       il2->setFixedWidth(100);
       il2->setFrame(true);
       il2->setDark();
@@ -328,7 +330,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       connect(hexButton, SIGNAL(toggled(bool)), SLOT(toggled(bool)));
 
       edit = new QTextEdit;
-      edit->setFont(MusEConfig::config.fonts[5]);
+      edit->setFont(MusEGlobal::config.fonts[5]);
 
       if (!ev.empty()) {
             epos->setValue(tick);
@@ -363,7 +365,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
 
 void EditMetaDialog::typeChanged(int val)
 {
-  typeLabel->setText(midiMetaName(val));
+  typeLabel->setText(MusECore::midiMetaName(val));
 }
 
 //---------------------------------------------------------
@@ -402,9 +404,9 @@ EditMetaDialog::~EditMetaDialog()
 //   EditMetaDialog::event
 //---------------------------------------------------------
 
-Event EditMetaDialog::event()
+MusECore::Event EditMetaDialog::event()
       {
-      Event event(Meta);
+      MusECore::Event event(MusECore::Meta);
       event.setTick(epos->pos().tick());
       event.setA(il2->value());
       event.setData(meta, len);  // TODO ??
@@ -436,7 +438,7 @@ void EditMetaDialog::accept()
 //   EditCAfterDialog
 //---------------------------------------------------------
 
-EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
+EditCAfterDialog::EditCAfterDialog(int tick, const MusECore::Event& event,
    QWidget* parent)
    : EditEventDialog(parent)
       {
@@ -447,7 +449,7 @@ EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pressure"));
-      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEGui::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -483,9 +485,9 @@ EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
 //   EditCAfterDialog::event
 //---------------------------------------------------------
 
-Event EditCAfterDialog::event()
+MusECore::Event EditCAfterDialog::event()
       {
-      Event event(CAfter);
+      MusECore::Event event(MusECore::CAfter);
       event.setTick(epos->pos().tick());
       event.setA(il2->value());
       return event;
@@ -495,7 +497,7 @@ Event EditCAfterDialog::event()
 //   EditPAfterDialog
 //---------------------------------------------------------
 
-EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
+EditPAfterDialog::EditPAfterDialog(int tick, const MusECore::Event& event,
    QWidget* parent)
    : EditEventDialog(parent)
       {
@@ -506,9 +508,9 @@ EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pitch"));
-      pl = new MusEWidget::PitchEdit;
+      pl = new MusEGui::PitchEdit;
       QLabel* l3 = new QLabel(tr("Pressure"));
-      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEGui::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -548,9 +550,9 @@ EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
 //   EditPAfterDialog::event
 //---------------------------------------------------------
 
-Event EditPAfterDialog::event()
+MusECore::Event EditPAfterDialog::event()
       {
-      Event event(PAfter);
+      MusECore::Event event(MusECore::PAfter);
       event.setTick(epos->pos().tick());
       event.setA(pl->value());
       event.setB(il2->value());
@@ -560,11 +562,11 @@ Event EditPAfterDialog::event()
 //   getEvent
 //---------------------------------------------------------
 
-Event EditCtrlDialog::getEvent(int tick, const Event& event,
-   const MidiPart* part, QWidget* parent)
+MusECore::Event EditCtrlDialog::getEvent(int tick, const MusECore::Event& event,
+    const MusECore::MidiPart* part, QWidget* parent)
       {
       EditCtrlDialog* dlg = new EditCtrlDialog(tick, event, part, parent);
-      Event nevent;
+      MusECore::Event nevent;
       if (dlg->exec() == QDialog::Accepted) {
             nevent = dlg->event();
             }
@@ -576,15 +578,15 @@ Event EditCtrlDialog::getEvent(int tick, const Event& event,
 //   EditCtrlDialog::event
 //---------------------------------------------------------
 
-Event EditCtrlDialog::event()
+MusECore::Event EditCtrlDialog::event()
       {
-      Event event(Controller);
+      MusECore::Event event(MusECore::Controller);
       event.setTick(timePos->pos().tick());
       event.setA(num);
-      if (num == CTRL_PROGRAM)
+      if (num == MusECore::CTRL_PROGRAM)
             event.setB(val);
       else
-            event.setB(valSlider->value() + midiPorts[part->track()->outPort()].midiController(num)->bias());
+            event.setB(valSlider->value() + MusEGlobal::midiPorts[part->track()->outPort()].midiController(num)->bias());
       return event;
       }
 
@@ -598,8 +600,8 @@ Event EditCtrlDialog::event()
 //    QPushButton* buttonNewController;
 //---------------------------------------------------------
 
-EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
-   const MidiPart* p, QWidget* parent)
+EditCtrlDialog::EditCtrlDialog(int tick, const MusECore::Event& event,
+   const MusECore::MidiPart* p, QWidget* parent)
    : QDialog(parent), part(p)
       {
       setupUi(this);
@@ -614,11 +616,11 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
       ///pop = new QMenu(this);
       //pop->setCheckable(false);//not necessary in Qt4
 
-      MidiTrack* track   = part->track();
+      MusECore::MidiTrack* track   = part->track();
       int portn          = track->outPort();
-      MidiPort* port     = &midiPorts[portn];
-      bool isDrum        = track->type() == Track::DRUM; //FINDMICHJETZT was soll das?
-      MidiCtrlValListList* cll = port->controller();
+      MusECore::MidiPort* port     = &MusEGlobal::midiPorts[portn];
+      bool isDrum        = track->type() == MusECore::Track::DRUM; //FINDMICHJETZT was soll das?
+      MusECore::MidiCtrlValListList* cll = port->controller();
 
       ctrlList->clear();
       ctrlList->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -630,8 +632,8 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
       std::list<QString> sList;
       typedef std::list<QString>::iterator isList;
 
-      for (iMidiCtrlValList i = cll->begin(); i != cll->end(); ++i) {
-            MidiCtrlValList* cl = i->second;
+      for (MusECore::iMidiCtrlValList i = cll->begin(); i != cll->end(); ++i) {
+            MusECore::MidiCtrlValList* cl = i->second;
             int num             = cl->num();
 
             // dont show drum specific controller if not a drum track
@@ -639,7 +641,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
                   if (!isDrum)
                         continue;
                   }
-            MidiController* c = port->midiController(num);
+            MusECore::MidiController* c = port->midiController(num);
             isList i = sList.begin();
             for (; i != sList.end(); ++i) {
                   if (*i == c->name())
@@ -648,7 +650,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
             if (i == sList.end())
                   sList.push_back(c->name());
             }
-      MidiController* mc = port->midiController(num);
+      MusECore::MidiController* mc = port->midiController(num);
       int idx = 0;
       int selectionIndex = 0;
       for (isList i = sList.begin(); i != sList.end(); ++i, ++idx) {
@@ -665,7 +667,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 
       if(!event.empty())
       {
-        if(num == CTRL_PROGRAM)
+        if(num == MusECore::CTRL_PROGRAM)
         {
           widgetStack->setCurrentIndex(1);
           updatePatch();
@@ -696,22 +698,22 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 void EditCtrlDialog::newController()
       {
       //QMenu* pup = new QMenu(this);
-      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
+      MusEGui::PopupMenu* pup = new MusEGui::PopupMenu(this);
       //pup->setCheckable(this);//not necessary in Qt4
       //
       // populate popup with all controllers available for
       // current instrument
       //
-      MidiTrack* track        = part->track();
+      MusECore::MidiTrack* track        = part->track();
       int portn               = track->outPort();
-      MidiPort* port          = &midiPorts[portn];
-      MidiInstrument* instr   = port->instrument();
-      MidiControllerList* mcl = instr->controller();
+      MusECore::MidiPort* port          = &MusEGlobal::midiPorts[portn];
+      MusECore::MidiInstrument* instr   = port->instrument();
+      MusECore::MidiControllerList* mcl = instr->controller();
       
-      MidiCtrlValListList* cll = port->controller();
+      MusECore::MidiCtrlValListList* cll = port->controller();
       int channel              = track->outChannel();
       int nn = 0;
-      for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci)
+      for (MusECore::iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci)
       {
             if(cll->find(channel, ci->second->num()) == cll->end())
             {
@@ -723,14 +725,14 @@ void EditCtrlDialog::newController()
       QAction* rv = pup->exec(buttonNewController->mapToGlobal(QPoint(0,0)));
       if (rv) {
             QString s = rv->text();
-            for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci) {
-                  MidiController* mc = ci->second;
+            for (MusECore::iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci) {
+                  MusECore::MidiController* mc = ci->second;
                   if (mc->name() == s) {
                         if(cll->find(channel, mc->num()) == cll->end())
                         {
-                          MidiCtrlValList* vl = new MidiCtrlValList(mc->num());
+                          MusECore::MidiCtrlValList* vl = new MusECore::MidiCtrlValList(mc->num());
                           cll->add(channel, vl);
-                          //song->update(SC_MIDI_CONTROLLER_ADD);
+                          //MusEGlobal::song->update(SC_MIDI_CONTROLLER_ADD);
                         }
                         //for (int idx = 0; ;++idx) {
                         int idx = 0;
@@ -773,22 +775,22 @@ void EditCtrlDialog::ctrlListClicked(QListWidgetItem* item)
             return;
       QString s(item->text());
 
-      MidiTrack* track         = part->track();
+      MusECore::MidiTrack* track         = part->track();
       int portn                = track->outPort();
-      MidiPort* port           = &midiPorts[portn];
-      MidiCtrlValListList* cll = port->controller();
+      MusECore::MidiPort* port           = &MusEGlobal::midiPorts[portn];
+      MusECore::MidiCtrlValListList* cll = port->controller();
       
-      iMidiCtrlValList i;
+      MusECore::iMidiCtrlValList i;
       for (i = cll->begin(); i != cll->end(); ++i) {
-            MidiCtrlValList* cl = i->second;
+            MusECore::MidiCtrlValList* cl = i->second;
             num                 = cl->num();
-            MidiController* c   = port->midiController(num);
+            MusECore::MidiController* c   = port->midiController(num);
             if (s == c->name()) {
-                  if (num == CTRL_PROGRAM) {
+                  if (num == MusECore::CTRL_PROGRAM) {
                         widgetStack->setCurrentIndex(1);
                         
                         val = c->initVal();
-                        if(val == CTRL_VAL_UNKNOWN)
+                        if(val == MusECore::CTRL_VAL_UNKNOWN)
                           val = 0;
                         updatePatch();
                         }
@@ -799,14 +801,14 @@ void EditCtrlDialog::ctrlListClicked(QListWidgetItem* item)
                         controllerName->setText(s);
                         val = c->initVal();
                         
-                        if(val == CTRL_VAL_UNKNOWN || val == 0)
+                        if(val == MusECore::CTRL_VAL_UNKNOWN || val == 0)
                         {
                           switch(num)
                           {
-                            case CTRL_PANPOT:
+                            case MusECore::CTRL_PANPOT:
                               val = 64 - c->bias();
                             break;
-                            case CTRL_VOLUME:
+                            case MusECore::CTRL_VOLUME:
                               val = 100;
                             break;
                             default:  
@@ -829,11 +831,11 @@ void EditCtrlDialog::ctrlListClicked(QListWidgetItem* item)
 
 void EditCtrlDialog::updatePatch()
       {
-      MidiTrack* track      = part->track();
+      MusECore::MidiTrack* track      = part->track();
       int port              = track->outPort();
       int channel           = track->outChannel();
-      MidiInstrument* instr = midiPorts[port].instrument();
-      patchName->setText(instr->getPatchName(channel, val, song->mtype(), track->type() == Track::DRUM));  //FINDMICHJETZT was soll das?
+      MusECore::MidiInstrument* instr = MusEGlobal::midiPorts[port].instrument();
+      patchName->setText(instr->getPatchName(channel, val, MusEGlobal::song->mtype(), track->type() == MusECore::Track::DRUM));  //FINDMICHJETZT was soll das?
 
       int hb = ((val >> 16) & 0xff) + 1;
       if (hb == 0x100)
@@ -864,15 +866,15 @@ void EditCtrlDialog::updatePatch()
 
 void EditCtrlDialog::instrPopup()
       {
-      MidiTrack* track = part->track();
+      MusECore::MidiTrack* track = part->track();
       int channel = track->outChannel();
       int port    = track->outPort();
-      MidiInstrument* instr = midiPorts[port].instrument();
+      MusECore::MidiInstrument* instr = MusEGlobal::midiPorts[port].instrument();
       
-      ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
+      ///instr->populatePatchPopup(pop, channel, MusEGlobal::song->mtype(), track->type() == MusECore::Track::DRUM);
       //QMenu* pup = new QMenu(this);
-      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
-      instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);  //FINDMICHJETZT was soll das?
+      MusEGui::PopupMenu* pup = new MusEGui::PopupMenu(this);
+      populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->type() == MusECore::Track::DRUM);  //FINDMICHJETZT was soll das?
 
       ///if(pop->actions().count() == 0)
       ///  return;
@@ -898,7 +900,7 @@ void EditCtrlDialog::instrPopup()
 
 void EditCtrlDialog::programChanged()
       {
-//      MidiTrack* track = part->track();
+//      MusECore::MidiTrack* track = part->track();
 //      int channel = track->outChannel();
 //      int port    = track->outPort();
       int hb   = hbank->value();
@@ -922,3 +924,4 @@ void EditCtrlDialog::programChanged()
       updatePatch();
       }
 
+} // namespace MusEGui
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index 02befe7e..51ba80d0 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -28,24 +28,29 @@
 #include "ui_editctrlbase.h"
 #include "event.h"
 
-namespace Awl {
-      class PosEdit;
-      };
-
-///class PosEdit;
-namespace MusEWidget {
-class IntLabel;
-class PitchEdit;
-}
-
 class QDialog;
 class QLabel;
 class QGridLayout;
 class QTextEdit;
 class QRadioButton;
-class MidiPart;
 class QListWidgetItem;
 class QMenu;
+
+namespace Awl {
+      class PosEdit;
+      };
+
+namespace MusECore {
+class MidiPart;
+}
+
+namespace MusEGui {
+
+class IntLabel;
+class PitchEdit;
+///class PosEdit;
+
+
 //---------------------------------------------------------
 //   EditEventDialog
 //---------------------------------------------------------
@@ -58,7 +63,7 @@ class EditEventDialog : public QDialog {
 
    public:
       EditEventDialog(QWidget* parent=0);
-      virtual Event event() = 0;
+      virtual MusECore::Event event() = 0;
       };
 
 //---------------------------------------------------------
@@ -69,11 +74,11 @@ class EditNoteDialog : public QDialog, public Ui::EditNoteDialogBase {
       Q_OBJECT
 
    public:
-      EditNoteDialog(int tick, const Event&,
+      EditNoteDialog(int tick, const MusECore::Event&,
          QWidget* parent=0);
-      static Event getEvent(int tick, const Event&,
+      static MusECore::Event getEvent(int tick, const MusECore::Event&,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
 //---------------------------------------------------------
@@ -93,12 +98,12 @@ class EditSysexDialog : public QDialog, public Ui::EditSysexDialogBase {
       virtual void accept();
 
    public:
-      EditSysexDialog(int tick, const Event&,
+      EditSysexDialog(int tick, const MusECore::Event&,
          QWidget* parent=0);
       ~EditSysexDialog();
-      static Event getEvent(int tick, const Event&,
+      static MusECore::Event getEvent(int tick, const MusECore::Event&,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
 //---------------------------------------------------------
@@ -111,7 +116,7 @@ class EditCtrlDialog : public QDialog, public Ui::EditCtrlBase  {
       int num;          // controller number
       int val;          // controller value (for prog. changes)
 
-      const MidiPart* part;
+      const MusECore::MidiPart* part;
       ///QMenu* pop;
 
       void updatePatch();
@@ -127,11 +132,11 @@ class EditCtrlDialog : public QDialog, public Ui::EditCtrlBase  {
 
 
    public:
-      EditCtrlDialog(int tick, const Event&,
-         const MidiPart*, QWidget* parent=0);
-      static Event getEvent(int tick, const Event&, const MidiPart*,
+      EditCtrlDialog(int tick, const MusECore::Event&,
+         const MusECore::MidiPart*, QWidget* parent=0);
+      static MusECore::Event getEvent(int tick, const MusECore::Event&, const MusECore::MidiPart*,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
 //---------------------------------------------------------
@@ -146,7 +151,7 @@ class EditMetaDialog : public EditEventDialog {
       ///PosEdit* epos;
       Awl::PosEdit* epos;
       QTextEdit* edit;
-      MusEWidget::IntLabel* il2;
+      MusEGui::IntLabel* il2;
       QRadioButton* hexButton;
       QLabel* typeLabel;
 
@@ -159,12 +164,12 @@ class EditMetaDialog : public EditEventDialog {
       void typeChanged(int);
 
    public:
-      EditMetaDialog(int tick, const Event&,
+      EditMetaDialog(int tick, const MusECore::Event&,
          QWidget* parent=0);
       ~EditMetaDialog();
-      static Event getEvent(int tick, const Event&,
+      static MusECore::Event getEvent(int tick, const MusECore::Event&,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
 //---------------------------------------------------------
@@ -176,17 +181,17 @@ class EditCAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      MusEWidget::IntLabel* il2;
+      MusEGui::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
 
    public:
-      EditCAfterDialog(int tick, const Event&,
+      EditCAfterDialog(int tick, const MusECore::Event&,
          QWidget* parent=0);
-      static Event getEvent(int tick, const Event&,
+      static MusECore::Event getEvent(int tick, const MusECore::Event&,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
 //---------------------------------------------------------
@@ -198,19 +203,21 @@ class EditPAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      MusEWidget::PitchEdit* pl;
-      MusEWidget::IntLabel* il2;
+      MusEGui::PitchEdit* pl;
+      MusEGui::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
 
    public:
-      EditPAfterDialog(int tick, const Event&,
+      EditPAfterDialog(int tick, const MusECore::Event&,
          QWidget* parent=0);
-      static Event getEvent(int tick, const Event&,
+      static MusECore::Event getEvent(int tick, const MusECore::Event&,
          QWidget* parent = 0);
-      virtual Event event();
+      virtual MusECore::Event event();
       };
 
+} // namespace MusEGui
+
 #endif
 
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 9766ba71..eadfa68c 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -46,16 +46,18 @@
 #include "midiport.h"
 #include "midictrl.h"
 
+namespace MusEGui {
+
 //---------------------------------------------------------
 //   EventListItem
 //---------------------------------------------------------
 
 class EventListItem : public QTreeWidgetItem {
    public:
-      Event event;
-      MidiPart* part;
+      MusECore::Event event;
+      MusECore::MidiPart* part;
 
-      EventListItem(QTreeWidget* parent, Event ev, MidiPart* p)
+      EventListItem(QTreeWidget* parent, MusECore::Event ev, MusECore::MidiPart* p)
          : QTreeWidgetItem(parent) {
             event = ev;
             part  = p;
@@ -107,10 +109,10 @@ class EventListItem : public QTreeWidgetItem {
  *    midi_meta_name
  *---------------------------------------------------------*/
 
-static QString midiMetaComment(const Event& ev)
+static QString midiMetaComment(const MusECore::Event& ev)
       {
       int meta  = ev.dataA();
-      QString s = midiMetaName(meta);
+      QString s = MusECore::midiMetaName(meta);
 
       switch (meta) {
             case 0:
@@ -260,12 +262,12 @@ void ListEdit::songChanged(int type)
                   curTrack = 0;
                   liste->blockSignals(true);
                   liste->clear();
-                  for (iPart p = parts()->begin(); p != parts()->end(); ++p) {
-                        MidiPart* part = (MidiPart*) (p->second);
+                  for (MusECore::iPart p = parts()->begin(); p != parts()->end(); ++p) {
+                        MusECore::MidiPart* part = (MusECore::MidiPart*) (p->second);
                         if (part->sn() == curPartId)
                               curPart  = part;
-                        EventList* el = part->events();
-                        for (iEvent i = el->begin(); i != el->end(); ++i) {
+                        MusECore::EventList* el = part->events();
+                        for (MusECore::iEvent i = el->begin(); i != el->end(); ++i) {
                               EventListItem* item = new EventListItem(liste, i->second, part);
                               for (int col = 0; col < liste->columnCount(); ++col)
                                     item->setText(col, item->text(col));
@@ -284,7 +286,7 @@ void ListEdit::songChanged(int type)
             {
               if(!parts()->empty())
               {
-                curPart  = (MidiPart*)(parts()->begin()->second);
+                curPart  = (MusECore::MidiPart*)(parts()->begin()->second);
                 if(curPart)
                   curTrack = curPart->track();
                 else  
@@ -318,27 +320,27 @@ QString EventListItem::text(int col) const
                   break;
             case 2:
                   switch(event.type()) {
-                        case Note:
+                        case MusECore::Note:
                               s = QString("Note");
                               break;
-                        case Controller:
+                        case MusECore::Controller:
                               {
                               const char* cs;
-                              switch (midiControllerType(event.dataA())) {
-                                    case MidiController::Controller7:  cs = "Ctrl7"; break;
-                                    case MidiController::Controller14: cs = "Ctrl14"; break;
-                                    case MidiController::RPN:          cs = "RPN"; break;
-                                    case MidiController::NRPN:         cs = "NRPN"; break;
-                                    case MidiController::Pitch:        cs = "Pitch"; break;
-                                    case MidiController::Program:      cs = "Program"; break;
-                                    case MidiController::RPN14:        cs = "RPN14"; break;
-                                    case MidiController::NRPN14:       cs = "NRPN14"; break;
+                              switch (MusECore::midiControllerType(event.dataA())) {
+                                    case MusECore::MidiController::Controller7:  cs = "Ctrl7"; break;
+                                    case MusECore::MidiController::Controller14: cs = "Ctrl14"; break;
+                                    case MusECore::MidiController::RPN:          cs = "RPN"; break;
+                                    case MusECore::MidiController::NRPN:         cs = "NRPN"; break;
+                                    case MusECore::MidiController::Pitch:        cs = "Pitch"; break;
+                                    case MusECore::MidiController::Program:      cs = "Program"; break;
+                                    case MusECore::MidiController::RPN14:        cs = "RPN14"; break;
+                                    case MusECore::MidiController::NRPN14:       cs = "NRPN14"; break;
                                     default:           cs = "Ctrl?"; break;
                                     }
                               s = QString(cs);
                               }
                               break;
-                        case Sysex:
+                        case MusECore::Sysex:
                               {
                               commentLabel = QString("len ");
                               QString k;
@@ -346,7 +348,7 @@ QString EventListItem::text(int col) const
                               commentLabel += k;
                               commentLabel += QString(" ");
 
-                              commentLabel += nameSysex(event.dataLen(), event.data());
+                              commentLabel += MusECore::nameSysex(event.dataLen(), event.data());
                               int i;
                               for (i = 0; i < 10; ++i) {
                                     if (i >= event.dataLen())
@@ -361,17 +363,17 @@ QString EventListItem::text(int col) const
                               }
                               s = QString("SysEx");
                               break;
-                        case PAfter:
+                        case MusECore::PAfter:
                               s = QString("PoAT");
                               break;
-                        case CAfter:
+                        case MusECore::CAfter:
                               s = QString("ChAT");
                               break;
-                        case Meta:
+                        case MusECore::Meta:
                               commentLabel = midiMetaComment(event);
                               s = QString("Meta");
                               break;
-                        case Wave:
+                        case MusECore::Wave:
                               break;
                         default:
                               printf("unknown event type %d\n", event.type());
@@ -381,16 +383,16 @@ QString EventListItem::text(int col) const
                   s.setNum(part->track()->outChannel() + 1);
                   break;
             case 4:
-                  if (event.isNote() || event.type() == PAfter)
-                        s =  MusEUtil::pitch2string(event.dataA());
-                  else if (event.type() == Controller)
+                  if (event.isNote() || event.type() == MusECore::PAfter)
+                        s =  MusECore::pitch2string(event.dataA());
+                  else if (event.type() == MusECore::Controller)
                         s.setNum(event.dataA() & 0xffff);  // mask off type bits
                   else
                         s.setNum(event.dataA());
                   break;
             case 5:
-                  if(event.type() == Controller &&
-                     midiControllerType(event.dataA()) == MidiController::Program) 
+                  if(event.type() == MusECore::Controller &&
+                    MusECore::midiControllerType(event.dataA()) == MusECore::MidiController::Program) 
                   {
                     int val = event.dataB();
                     int hb = ((val >> 16) & 0xff) + 1;
@@ -415,14 +417,14 @@ QString EventListItem::text(int col) const
                   break;
             case 8:
                   switch(event.type()) {
-                        case Controller:
+                        case MusECore::Controller:
                               {
-                              MidiPort* mp = &midiPorts[part->track()->outPort()];
-                              MidiController* mc = mp->midiController(event.dataA());
+                              MusECore::MidiPort* mp = &MusEGlobal::midiPorts[part->track()->outPort()];
+                              MusECore::MidiController* mc = mp->midiController(event.dataA());
                               s = mc->name();
                               }
                               break;
-                        case Sysex:
+                        case MusECore::Sysex:
                               {
                               s = QString("len ");
                               QString k;
@@ -430,7 +432,7 @@ QString EventListItem::text(int col) const
                               s += k;
                               s += QString(" ");
 
-                              commentLabel += nameSysex(event.dataLen(), event.data());
+                              commentLabel += MusECore::nameSysex(event.dataLen(), event.data());
                               int i;
                               for (i = 0; i < 10; ++i) {
                                     if (i >= event.dataLen())
@@ -444,7 +446,7 @@ QString EventListItem::text(int col) const
                                     s += QString("...");
                               }
                               break;
-                        case Meta:
+                        case MusECore::Meta:
                               s = midiMetaComment(event);
                               break;
                         default:
@@ -460,7 +462,7 @@ QString EventListItem::text(int col) const
 //   ListEdit
 //---------------------------------------------------------
 
-ListEdit::ListEdit(PartList* pl)
+ListEdit::ListEdit(MusECore::PartList* pl)
    : MidiEditor(TopWin::LISTE, 0, pl)
       {
       insertItems = new QActionGroup(this);
@@ -584,7 +586,7 @@ ListEdit::ListEdit(PartList* pl)
       mainGrid->setRowStretch(1, 100);
       mainGrid->setColumnStretch(0, 100);
       mainGrid->addWidget(liste, 1, 0, 2, 1);
-      connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
+      connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
       songChanged(-1);
 
       if(pl->empty())
@@ -594,7 +596,7 @@ ListEdit::ListEdit(PartList* pl)
       }
       else
       {
-        curPart   = (MidiPart*)pl->begin()->second;
+        curPart   = (MusECore::MidiPart*)pl->begin()->second;
         if(curPart)
           curPartId = curPart->sn();
         else
@@ -627,7 +629,7 @@ void ListEdit::editInsertNote()
       if(!curPart)
         return;
         
-      Event event = EditNoteDialog::getEvent(curPart->tick(), Event(), this);
+      MusECore::Event event = EditNoteDialog::getEvent(curPart->tick(), MusECore::Event(), this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -637,7 +639,7 @@ void ListEdit::editInsertNote()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do not handle port controller values. 
-            audio->msgAddEvent(event, curPart, true, false, false);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, false, false);
             }
       }
 
@@ -650,7 +652,7 @@ void ListEdit::editInsertSysEx()
       if(!curPart)
         return;
       
-      Event event = EditSysexDialog::getEvent(curPart->tick(), Event(), this);
+      MusECore::Event event = EditSysexDialog::getEvent(curPart->tick(), MusECore::Event(), this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -660,7 +662,7 @@ void ListEdit::editInsertSysEx()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do not handle port controller values. 
-            audio->msgAddEvent(event, curPart, true, false, false);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, false, false);
             }
       }
 
@@ -673,7 +675,7 @@ void ListEdit::editInsertCtrl()
       if(!curPart)
         return;
       
-      Event event = EditCtrlDialog::getEvent(curPart->tick(), Event(), curPart, this);
+      MusECore::Event event = EditCtrlDialog::getEvent(curPart->tick(), MusECore::Event(), curPart, this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -683,7 +685,7 @@ void ListEdit::editInsertCtrl()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do port controller values and clone parts. 
-            audio->msgAddEvent(event, curPart, true, true, true);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, true, true);
             }
       }
 
@@ -696,7 +698,7 @@ void ListEdit::editInsertMeta()
       if(!curPart)
         return;
       
-      Event event = EditMetaDialog::getEvent(curPart->tick(), Event(), this);
+      MusECore::Event event = EditMetaDialog::getEvent(curPart->tick(), MusECore::Event(), this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -706,7 +708,7 @@ void ListEdit::editInsertMeta()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do not handle port controller values. 
-            audio->msgAddEvent(event, curPart, true, false, false);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, false, false);
             }
       }
 
@@ -719,7 +721,7 @@ void ListEdit::editInsertCAfter()
       if(!curPart)
         return;
       
-      Event event = EditCAfterDialog::getEvent(curPart->tick(), Event(), this);
+      MusECore::Event event = EditCAfterDialog::getEvent(curPart->tick(), MusECore::Event(), this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -729,7 +731,7 @@ void ListEdit::editInsertCAfter()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do not handle port controller values. 
-            audio->msgAddEvent(event, curPart, true, false, false);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, false, false);
             }
       }
 
@@ -742,8 +744,8 @@ void ListEdit::editInsertPAfter()
       if(!curPart)
         return;
       
-      Event ev;
-      Event event = EditPAfterDialog::getEvent(curPart->tick(), ev, this);
+      MusECore::Event ev;
+      MusECore::Event event = EditPAfterDialog::getEvent(curPart->tick(), ev, this);
       if (!event.empty()) {
             //No events before beginning of part + take Part offset into consideration
             unsigned tick = event.tick();
@@ -753,7 +755,7 @@ void ListEdit::editInsertPAfter()
                   tick-= curPart->tick();
             event.setTick(tick);
             // Indicate do undo, and do not handle port controller values. 
-            audio->msgAddEvent(event, curPart, true, false, false);
+            MusEGlobal::audio->msgAddEvent(event, curPart, true, false, false);
             }
       }
 
@@ -761,27 +763,27 @@ void ListEdit::editInsertPAfter()
 //   editEvent
 //---------------------------------------------------------
 
-void ListEdit::editEvent(Event& event, MidiPart* part)
+void ListEdit::editEvent(MusECore::Event& event, MusECore::MidiPart* part)
       {
       int tick = event.tick() + part->tick();
-      Event nevent;
+      MusECore::Event nevent;
       switch(event.type()) {
-            case Note:
+            case MusECore::Note:
                   nevent = EditNoteDialog::getEvent(tick, event, this);
                   break;
-            case Controller:
+            case MusECore::Controller:
                   nevent = EditCtrlDialog::getEvent(tick, event, part, this);
                   break;
-            case Sysex:
+            case MusECore::Sysex:
                   nevent = EditSysexDialog::getEvent(tick, event, this);
                   break;
-            case PAfter:
+            case MusECore::PAfter:
                   nevent = EditPAfterDialog::getEvent(tick, event, this);
                   break;
-            case CAfter:
+            case MusECore::CAfter:
                   nevent = EditCAfterDialog::getEvent(tick, event, this);
                   break;
-            case Meta:
+            case MusECore::Meta:
                   nevent = EditMetaDialog::getEvent(tick, event, this);
                   break;
             default:
@@ -796,12 +798,12 @@ void ListEdit::editEvent(Event& event, MidiPart* part)
                      nevent.tick(), part->tick() + part->lenTick());
             else
             {
-              if(event.type() == Controller)
+              if(event.type() == MusECore::Controller)
                 // Indicate do undo, and do port controller values and clone parts. 
-                audio->msgChangeEvent(event, nevent, part, true, true, true);
+                MusEGlobal::audio->msgChangeEvent(event, nevent, part, true, true, true);
               else  
                 // Indicate do undo, and do not do port controller values and clone parts. 
-                audio->msgChangeEvent(event, nevent, part, true, false, false);
+                MusEGlobal::audio->msgChangeEvent(event, nevent, part, true, false, false);
             }      
           }
       }
@@ -810,21 +812,21 @@ void ListEdit::editEvent(Event& event, MidiPart* part)
 //   readStatus
 //---------------------------------------------------------
 
-void ListEdit::readStatus(Xml& xml)
+void ListEdit::readStatus(MusECore::Xml& xml)
       {
       for (;;) {
-            Xml::Token token = xml.parse();
+            MusECore::Xml::Token token = xml.parse();
             const QString& tag = xml.s1();
-            if (token == Xml::Error || token == Xml::End)
+            if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
                   break;
             switch (token) {
-                  case Xml::TagStart:
+                  case MusECore::Xml::TagStart:
                         if (tag == "midieditor")
                               MidiEditor::readStatus(xml);
                         else
                               xml.unknown("ListEdit");
                         break;
-                  case Xml::TagEnd:
+                  case MusECore::Xml::TagEnd:
                         if (tag == "listeditor")
                               return;
                   default:
@@ -837,7 +839,7 @@ void ListEdit::readStatus(Xml& xml)
 //   writeStatus
 //---------------------------------------------------------
 
-void ListEdit::writeStatus(int level, Xml& xml) const
+void ListEdit::writeStatus(int level, MusECore::Xml& xml) const
       {
       writePartList(level, xml);
       xml.tag(level++, "listeditor");
@@ -849,22 +851,22 @@ void ListEdit::writeStatus(int level, Xml& xml) const
 //   readConfiguration
 //---------------------------------------------------------
 
-void ListEdit::readConfiguration(Xml& xml)
+void ListEdit::readConfiguration(MusECore::Xml& xml)
       {
       for (;;) {
-            Xml::Token token = xml.parse();
+            MusECore::Xml::Token token = xml.parse();
             const QString& tag = xml.s1();
             switch (token) {
-                  case Xml::Error:
-                  case Xml::End:
+                  case MusECore::Xml::Error:
+                  case MusECore::Xml::End:
                         return;
-                  case Xml::TagStart:
+                  case MusECore::Xml::TagStart:
                         if (tag == "topwin")
                               TopWin::readConfiguration(LISTE, xml);
                         else
                               xml.unknown("ListEdit");
                         break;
-                  case Xml::TagEnd:
+                  case MusECore::Xml::TagEnd:
                         if (tag == "listedit")
                               return;
                   default:
@@ -877,7 +879,7 @@ void ListEdit::readConfiguration(Xml& xml)
 //   writeConfiguration
 //---------------------------------------------------------
 
-void ListEdit::writeConfiguration(int level, Xml& xml)
+void ListEdit::writeConfiguration(int level, MusECore::Xml& xml)
       {
       xml.tag(level++, "listedit");
       TopWin::writeConfiguration(LISTE, level, xml);
@@ -899,7 +901,7 @@ void ListEdit::selectionChanged()
                   }
             }
       if (update)
-            song->update(SC_SELECTION);
+            MusEGlobal::song->update(SC_SELECTION);
       }
 
 //---------------------------------------------------------
@@ -935,7 +937,7 @@ void ListEdit::cmd(int cmd)
                   if(!found)
                     break;
                   
-                  Undo operations;
+                  MusECore::Undo operations;
                   
                   EventListItem *deletedEvent=NULL;
                   for (int row = 0; row < liste->topLevelItemCount(); ++row) {
@@ -945,7 +947,7 @@ void ListEdit::cmd(int cmd)
                         if (i->isSelected() || item->event.selected()) {
                               deletedEvent=item;
                               // Port controller values and clone parts. 
-                              operations.push_back(UndoOp(UndoOp::DeleteEvent,item->event, item->part, true, true));
+                              operations.push_back(MusECore::UndoOp(MusECore::UndoOp::DeleteEvent,item->event, item->part, true, true));
                               }
                         }
                   
@@ -969,7 +971,7 @@ void ListEdit::cmd(int cmd)
                   }
                   selectedTick=nextTick;
 
-                  song->applyOperationGroup(operations);
+                  MusEGlobal::song->applyOperationGroup(operations);
                   break;
             }
       }
@@ -1009,3 +1011,5 @@ if (key == Qt::Key_Escape) {
             return;
             }
       }
+
+} // namespace MusEGui
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index ba26b6b6..7548fc86 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -35,12 +35,15 @@ class QTreeWidget;
 class QTreeWidgetItem;
 
 
+namespace MusECore {
 class Event;
+class MidiPart;
 class MidiTrack;
 class PartList;
-class MidiPart;
-class MidiPart;
 class Xml;
+}
+
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   ListEdit
@@ -53,8 +56,8 @@ class ListEdit : public MidiEditor {
       QMenu* menuEdit;
       QActionGroup* insertItems;
       QToolBar* listTools;
-      MidiTrack* curTrack;
-      MidiPart* curPart;
+      MusECore::MidiTrack* curTrack;
+      MusECore::MidiPart* curPart;
       int selectedTick;
       int curPartId;
 
@@ -73,7 +76,7 @@ class ListEdit : public MidiEditor {
       void editInsertMeta();
       void editInsertCAfter();
       void editInsertPAfter();
-      void editEvent(Event&, MidiPart*);
+      void editEvent(MusECore::Event&, MusECore::MidiPart*);
       void selectionChanged();
       void doubleClicked(QTreeWidgetItem*);
       void cmd(int cmd);
@@ -83,16 +86,18 @@ class ListEdit : public MidiEditor {
       void songChanged(int);
 
    signals:
-      void deleted(TopWin*);
+      void deleted(MusEGui::TopWin*);
 
    public:
-      ListEdit(PartList*);
+      ListEdit(MusECore::PartList*);
       ~ListEdit();
-      virtual void readStatus(Xml&);
-      virtual void writeStatus(int, Xml&) const;
-      static void readConfiguration(Xml&);
-      static void writeConfiguration(int, Xml&);
+      virtual void readStatus(MusECore::Xml&);
+      virtual void writeStatus(int, MusECore::Xml&) const;
+      static void readConfiguration(MusECore::Xml&);
+      static void writeConfiguration(int, MusECore::Xml&);
       };
 
+} // namespace MusEGui
+
 #endif