(hopefully) final huge namespace update.

6 files changed, 150 insertions, 121 deletions

diff --git a/muse2/muse/waveedit/editgain.cpp b/muse2/muse/waveedit/editgain.cpp
index bcb19928..5738f21d 100644
--- a/muse2/muse/waveedit/editgain.cpp
+++ b/muse2/muse/waveedit/editgain.cpp
@@ -36,6 +36,8 @@
 
 #include "editgain.h"
 
+namespace MusEGui {
+
 EditGain::EditGain(QWidget* parent, int initGainValue)
  : QDialog(parent)
       {
@@ -111,3 +113,5 @@ int EditGain::getGain()
       {
       return gain;
       }
+
+} // namespace MusEGui
diff --git a/muse2/muse/waveedit/editgain.h b/muse2/muse/waveedit/editgain.h
index 5d41c7d4..86474cfc 100644
--- a/muse2/muse/waveedit/editgain.h
+++ b/muse2/muse/waveedit/editgain.h
@@ -39,6 +39,8 @@
 
 class QDialog;
 
+namespace MusEGui {
+
 class EditGain : public QDialog, public Ui::EditGainBase
 {
       Q_OBJECT
@@ -58,4 +60,6 @@ private slots:
     void gainChanged(int value);
 };
 
+} // namespace MusEGui
+
 #endif
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index a2167a50..424f0688 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -52,8 +52,11 @@
 #include "icons.h"
 #include "shortcuts.h"
 
+namespace MusECore {
+extern QColor readColor(MusECore::Xml& xml);
+}
 
-extern QColor readColor(Xml& xml);
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   closeEvent
@@ -72,7 +75,7 @@ void WaveEdit::closeEvent(QCloseEvent* e)
 //   WaveEdit
 //---------------------------------------------------------
 
-WaveEdit::WaveEdit(PartList* pl)
+WaveEdit::WaveEdit(MusECore::PartList* pl)
    : MidiEditor(TopWin::WAVE, 1, pl)
       {
       setFocusPolicy(Qt::StrongFocus);
@@ -202,10 +205,10 @@ WaveEdit::WaveEdit(PartList* pl)
       tb1->addWidget(label);
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
-      pos1 = new MusEWidget::PosLabel(0);
+      pos1 = new PosLabel(0);
       pos1->setFixedHeight(22);
       tb1->addWidget(pos1);
-      pos2 = new MusEWidget::PosLabel(0);
+      pos2 = new PosLabel(0);
       pos2->setFixedHeight(22);
       pos2->setSmpte(true);
       tb1->addWidget(pos2);
@@ -218,14 +221,14 @@ WaveEdit::WaveEdit(PartList* pl)
       int xscale;
 
       if (!parts()->empty()) { // Roughly match total size of part
-            Part* firstPart = parts()->begin()->second;
+            MusECore::Part* firstPart = parts()->begin()->second;
             xscale = 0 - firstPart->lenFrame()/_widthInit[_type];
             }
       else {
             xscale = -8000;
             }
 
-      hscroll = new MusEWidget::ScrollScale(1, -32768, xscale, 10000, Qt::Horizontal, mainw, 0, true, 10000.0);
+      hscroll = new ScrollScale(1, -32768, xscale, 10000, Qt::Horizontal, mainw, 0, true, 10000.0);
       view    = new WaveView(this, mainw, xscale, yscale);
       wview   = view;   // HACK!
 
@@ -236,7 +239,7 @@ WaveEdit::WaveEdit(PartList* pl)
       ymag->setPageStep(256);
       ymag->setValue(yscale);
        
-      time                 = new MusEWidget::MTScale(&_raster, mainw, xscale, true);
+      time                 = new MTScale(&_raster, mainw, xscale, true);
       ymag->setFixedWidth(16);
       connect(view, SIGNAL(mouseWheelMoved(int)), this, SLOT(moveVerticalSlider(int)));
       connect(ymag, SIGNAL(valueChanged(int)), view, SLOT(setYScale(int)));
@@ -249,7 +252,7 @@ WaveEdit::WaveEdit(PartList* pl)
       mainGrid->setColumnStretch(0, 100);
 
       mainGrid->addWidget(time,   0, 0, 1, 2);
-      mainGrid->addWidget(MusEUtil::hLine(mainw),    1, 0, 1, 2);
+      mainGrid->addWidget(MusECore::hLine(mainw),    1, 0, 1, 2);
       mainGrid->addWidget(view,    2, 0);
       mainGrid->addWidget(ymag,    2, 1);
       mainGrid->addWidget(hscroll, 3, 0);
@@ -270,7 +273,7 @@ WaveEdit::WaveEdit(PartList* pl)
       connect(view,  SIGNAL(horizontalScroll(unsigned)),hscroll, SLOT(setPos(unsigned)));
 
       connect(hscroll, SIGNAL(scaleChanged(int)),  SLOT(updateHScrollRange()));
-      connect(song, SIGNAL(songChanged(int)), SLOT(songChanged1(int)));
+      connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged1(int)));
 
       initShortcuts();
       
@@ -279,7 +282,7 @@ WaveEdit::WaveEdit(PartList* pl)
       
       if(!parts()->empty())
       {
-        WavePart* part = (WavePart*)(parts()->begin()->second);
+        MusECore::WavePart* part = (MusECore::WavePart*)(parts()->begin()->second);
         solo->setChecked(part->track()->solo());
       }
 
@@ -301,7 +304,7 @@ void WaveEdit::initShortcuts()
 
 void WaveEdit::configChanged()
       {
-      view->setBg(MusEConfig::config.waveEditBackgroundColor);
+      view->setBg(MusEGlobal::config.waveEditBackgroundColor);
       selectAllAction->setShortcut(shortcuts[SHRT_SELECT_ALL].key);
       selectNoneAction->setShortcut(shortcuts[SHRT_SELECT_NONE].key);
       }
@@ -332,7 +335,7 @@ void WaveEdit::updateHScrollRange()
 void WaveEdit::setTime(unsigned samplepos)
       {
 //    printf("setTime %d %x\n", samplepos, samplepos);
-      unsigned tick = tempomap.frame2tick(samplepos);
+      unsigned tick = MusEGlobal::tempomap.frame2tick(samplepos);
       pos1->setValue(tick);
       //pos2->setValue(tick);
       pos2->setValue(samplepos);
@@ -361,27 +364,27 @@ void WaveEdit::cmd(int n)
 //   loadConfiguration
 //---------------------------------------------------------
 
-void WaveEdit::readConfiguration(Xml& xml)
+void WaveEdit::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::TagStart:
+                  case MusECore::Xml::TagStart:
                         if (tag == "bgcolor")
-                              MusEConfig::config.waveEditBackgroundColor = readColor(xml);
+                              MusEGlobal::config.waveEditBackgroundColor = readColor(xml);
                         else if (tag == "topwin")
                               TopWin::readConfiguration(WAVE, xml);
                         else
                               xml.unknown("WaveEdit");
                         break;
-                  case Xml::TagEnd:
+                  case MusECore::Xml::TagEnd:
                         if (tag == "waveedit")
                               return;
                   default:
                         break;
-                  case Xml::Error:
-                  case Xml::End:
+                  case MusECore::Xml::Error:
+                  case MusECore::Xml::End:
                         return;
                   }
             }
@@ -391,10 +394,10 @@ void WaveEdit::readConfiguration(Xml& xml)
 //   saveConfiguration
 //---------------------------------------------------------
 
-void WaveEdit::writeConfiguration(int level, Xml& xml)
+void WaveEdit::writeConfiguration(int level, MusECore::Xml& xml)
       {
       xml.tag(level++, "waveedit");
-      xml.colorTag(level, "bgcolor", MusEConfig::config.waveEditBackgroundColor);
+      xml.colorTag(level, "bgcolor", MusEGlobal::config.waveEditBackgroundColor);
       TopWin::writeConfiguration(WAVE, level,xml);
       xml.tag(level, "/waveedit");
       }
@@ -403,7 +406,7 @@ void WaveEdit::writeConfiguration(int level, Xml& xml)
 //   writeStatus
 //---------------------------------------------------------
 
-void WaveEdit::writeStatus(int level, Xml& xml) const
+void WaveEdit::writeStatus(int level, MusECore::Xml& xml) const
       {
       writePartList(level, xml);
       xml.tag(level++, "waveedit");
@@ -418,15 +421,15 @@ void WaveEdit::writeStatus(int level, Xml& xml) const
 //   readStatus
 //---------------------------------------------------------
 
-void WaveEdit::readStatus(Xml& xml)
+void WaveEdit::readStatus(MusECore::Xml& xml)
       {
       for (;;) {
-            Xml::Token token = xml.parse();
-            if (token == Xml::Error || token == Xml::End)
+            MusECore::Xml::Token token = xml.parse();
+            if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
                   break;
             QString tag = xml.s1();
             switch (token) {
-                  case Xml::TagStart:
+                  case MusECore::Xml::TagStart:
                         if (tag == "midieditor")
                               MidiEditor::readStatus(xml);
                         else if (tag == "xmag")
@@ -438,7 +441,7 @@ void WaveEdit::readStatus(Xml& xml)
                         else
                               xml.unknown("WaveEdit");
                         break;
-                  case Xml::TagEnd:
+                  case MusECore::Xml::TagEnd:
                         if (tag == "waveedit")
                               return;
                   default:
@@ -458,7 +461,7 @@ void WaveEdit::songChanged1(int bits)
         
         if (bits & SC_SOLO)
         {
-          WavePart* part = (WavePart*)(parts()->begin()->second);
+          MusECore::WavePart* part = (MusECore::WavePart*)(parts()->begin()->second);
           solo->blockSignals(true);
           solo->setChecked(part->track()->solo());
           solo->blockSignals(false);
@@ -475,9 +478,9 @@ void WaveEdit::songChanged1(int bits)
 
 void WaveEdit::soloChanged(bool flag)
       {
-      WavePart* part = (WavePart*)(parts()->begin()->second);
-      audio->msgSetSolo(part->track(), flag);
-      song->update(SC_SOLO);
+      MusECore::WavePart* part = (MusECore::WavePart*)(parts()->begin()->second);
+      MusEGlobal::audio->msgSetSolo(part->track(), flag);
+      MusEGlobal::song->update(SC_SOLO);
       }
 
 //---------------------------------------------------------
@@ -509,11 +512,11 @@ void WaveEdit::moveVerticalSlider(int val)
 void WaveEdit::horizontalZoomIn()
 {
   int mag = hscroll->mag();
-  int zoomlvl = MusEWidget::ScrollScale::getQuickZoomLevel(mag);
+  int zoomlvl = ScrollScale::getQuickZoomLevel(mag);
   if (zoomlvl < 23)
         zoomlvl++;
 
-  int newmag = MusEWidget::ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
+  int newmag = ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
 
   hscroll->setMag(newmag);
 
@@ -522,12 +525,14 @@ void WaveEdit::horizontalZoomIn()
 void WaveEdit::horizontalZoomOut()
 {
   int mag = hscroll->mag();
-  int zoomlvl = MusEWidget::ScrollScale::getQuickZoomLevel(mag);
+  int zoomlvl = ScrollScale::getQuickZoomLevel(mag);
   if (zoomlvl > 1)
         zoomlvl--;
 
-  int newmag = MusEWidget::ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
+  int newmag = ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
 
   hscroll->setMag(newmag);
 
 }
+
+} // namespace MusEGui
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index 64929555..b40aa93a 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -33,18 +33,21 @@
 
 #include "midieditor.h"
 
+class QAction;
+class QResizeEvent;
+class QSlider;
 class QToolButton;
+
+namespace MusECore {
 class PartList;
-class WaveView;
-class ScrollScale;
-class QSlider;
-class QResizeEvent;
-class SNode;
-class QAction;
+}
+
+namespace MusEGui {
 
-namespace MusEWidget {
 class PosLabel;
-}
+class ScrollScale;
+class SNode;
+class WaveView;
 
 //---------------------------------------------------------
 //   WaveEdit
@@ -58,8 +61,8 @@ class WaveEdit : public MidiEditor {
       QToolBar* tools;
       QToolBar* tb1;
       QToolButton* solo;
-      MusEWidget::PosLabel* pos1;
-      MusEWidget::PosLabel* pos2;
+      MusEGui::PosLabel* pos1;
+      MusEGui::PosLabel* pos2;
       QAction* selectAllAction;
       QAction* selectNoneAction;
       QAction* cutAction;
@@ -91,15 +94,15 @@ class WaveEdit : public MidiEditor {
 
 
    signals:
-      void deleted(TopWin*);
+      void deleted(MusEGui::TopWin*);
 
    public:
-      WaveEdit(PartList*);
+      WaveEdit(MusECore::PartList*);
       ~WaveEdit();
-      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&);
 
       enum { CMD_MUTE=0, CMD_NORMALIZE, CMD_FADE_IN, CMD_FADE_OUT, CMD_REVERSE,
              CMD_GAIN_FREE, CMD_GAIN_200, CMD_GAIN_150, CMD_GAIN_75, CMD_GAIN_50, CMD_GAIN_25,
@@ -108,5 +111,7 @@ class WaveEdit : public MidiEditor {
              CMD_SELECT_ALL, CMD_SELECT_NONE };
       };
 
+} // namespace MusEGui
+
 #endif
 
diff --git a/muse2/muse/waveedit/waveview.cpp b/muse2/muse/waveedit/waveview.cpp
index 9b11feb8..f22f842b 100644
--- a/muse2/muse/waveedit/waveview.cpp
+++ b/muse2/muse/waveedit/waveview.cpp
@@ -42,19 +42,21 @@
 #include "gconfig.h"
 #include "fastlog.h"
 
+namespace MusEGui {
+
 bool modifyWarnedYet = false;
 //---------------------------------------------------------
 //   WaveView
 //---------------------------------------------------------
 
 WaveView::WaveView(MidiEditor* pr, QWidget* parent, int xscale, int yscale)
-   : MusEWidget::View(parent, xscale, 1)
+   : View(parent, xscale, 1)
       {
       editor = pr;
       setVirt(true);
-      pos[0] = tempomap.tick2frame(song->cpos());
-      pos[1] = tempomap.tick2frame(song->lpos());
-      pos[2] = tempomap.tick2frame(song->rpos());
+      pos[0] = MusEGlobal::tempomap.tick2frame(MusEGlobal::song->cpos());
+      pos[1] = MusEGlobal::tempomap.tick2frame(MusEGlobal::song->lpos());
+      pos[2] = MusEGlobal::tempomap.tick2frame(MusEGlobal::song->rpos());
       yScale = yscale;
       mode = NORMAL;
       selectionStart = 0;
@@ -71,13 +73,13 @@ WaveView::WaveView(MidiEditor* pr, QWidget* parent, int xscale, int yscale)
             curPartId = -1;
             }
       else {
-            curPart   = (WavePart*)(editor->parts()->begin()->second);
+            curPart   = (MusECore::WavePart*)(editor->parts()->begin()->second);
             curPartId = curPart->sn();
             }
 
 
-      connect(song, SIGNAL(posChanged(int,unsigned,bool)), SLOT(setPos(int,unsigned,bool)));
-      connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
+      connect(MusEGlobal::song, SIGNAL(posChanged(int,unsigned,bool)), SLOT(setPos(int,unsigned,bool)));
+      connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
       songChanged(SC_SELECTION);
       }
 
@@ -112,17 +114,17 @@ void WaveView::pdraw(QPainter& p, const QRect& rr)
       if (xScale < 0)
             xScale = -xScale;
       
-      for (iPart ip = editor->parts()->begin(); ip != editor->parts()->end(); ++ip) {
-            WavePart* wp = (WavePart*)(ip->second);
+      for (MusECore::iPart ip = editor->parts()->begin(); ip != editor->parts()->end(); ++ip) {
+            MusECore::WavePart* wp = (MusECore::WavePart*)(ip->second);
             int channels = wp->track()->channels();
             int px = wp->frame();
 
-            EventList* el = wp->events();
-            for (iEvent e = el->begin(); e != el->end(); ++e) {
-                  Event event  = e->second;
+            MusECore::EventList* el = wp->events();
+            for (MusECore::iEvent e = el->begin(); e != el->end(); ++e) {
+                  MusECore::Event event  = e->second;
                   if (event.empty())
                         continue;
-                  SndFileR f = event.sndFile();
+                  MusECore::SndFileR f = event.sndFile();
                   if (f.isNull())
                         continue;
                   
@@ -149,7 +151,7 @@ void WaveView::pdraw(QPainter& p, const QRect& rr)
 
                   for (int i = sx; i < ex; i++) {
                         y  = rr.y() + h;
-                        SampleV sa[f.channels()];
+                        MusECore::SampleV sa[f.channels()];
                         f.read(sa, xScale, pos);
                         pos += xScale;
                         if (pos < event.spos())
@@ -267,8 +269,8 @@ void WaveView::songChanged(int flags)
             startSample  = MAXINT;
             endSample    = 0;
             curPart      = 0;
-            for (iPart p = editor->parts()->begin(); p != editor->parts()->end(); ++p) {
-                  WavePart* part = (WavePart*)(p->second);
+            for (MusECore::iPart p = editor->parts()->begin(); p != editor->parts()->end(); ++p) {
+                  MusECore::WavePart* part = (MusECore::WavePart*)(p->second);
                   if (part->sn() == curPartId)
                         curPart = part;
                   int ssample = part->frame();
@@ -287,9 +289,9 @@ void WaveView::songChanged(int flags)
             redraw(); // Boring, but the only thing possible to do
             }
       if (flags & SC_TEMPO) {
-            setPos(0, song->cpos(), false);
-            setPos(1, song->lpos(), false);
-            setPos(2, song->rpos(), false);
+            setPos(0, MusEGlobal::song->cpos(), false);
+            setPos(1, MusEGlobal::song->lpos(), false);
+            setPos(2, MusEGlobal::song->rpos(), false);
             }
       redraw();
       }
@@ -303,17 +305,17 @@ void WaveView::songChanged(int flags)
 
 void WaveView::setPos(int idx, unsigned val, bool adjustScrollbar)
       {
-      val = tempomap.tick2frame(val);
+      val = MusEGlobal::tempomap.tick2frame(val);
       if (pos[idx] == val)
             return;
       int opos = mapx(pos[idx]);
       int npos = mapx(val);
 
       if (adjustScrollbar && idx == 0) {
-            switch (song->follow()) {
-                  case  Song::NO:
+            switch (MusEGlobal::song->follow()) {
+                  case  MusECore::Song::NO:
                         break;
-                  case Song::JUMP:
+                  case MusECore::Song::JUMP:
                         if (npos >= width()) {
                               int ppos =  val - xorg - rmapxDev(width()/4);
                               if (ppos < 0)
@@ -331,7 +333,7 @@ void WaveView::setPos(int idx, unsigned val, bool adjustScrollbar)
                               npos = mapx(val);
                               }
                         break;
-                  case Song::CONTINUOUS:
+	    case MusECore::Song::CONTINUOUS:
                         if (npos > (width()*5)/8) {
                               int ppos =  pos[idx] - xorg - rmapxDev(width()*5/8);
                               if (ppos < 0)
@@ -485,7 +487,7 @@ void WaveView::viewMouseMoveEvent(QMouseEvent* event)
                   i = 1;
                   break;
             case Qt::RightButton:
-                  if ((MusEConfig::config.rangeMarkerWithoutMMB) && (event->modifiers() & Qt::ControlModifier))
+                  if ((MusEGlobal::config.rangeMarkerWithoutMMB) && (event->modifiers() & Qt::ControlModifier))
                       i = 1;
                   else
                       i = 2;
@@ -493,8 +495,8 @@ void WaveView::viewMouseMoveEvent(QMouseEvent* event)
             default:
                   return;
             }
-      Pos p(tempomap.frame2tick(x), true);
-      song->setPos(i, p);
+      MusECore::Pos p(MusEGlobal::tempomap.frame2tick(x), true);
+      MusEGlobal::song->setPos(i, p);
       }
 
 //---------------------------------------------------------
@@ -505,16 +507,16 @@ void WaveView::viewMouseMoveEvent(QMouseEvent* event)
 void WaveView::range(int* s, int *e)
       {
       
-      PartList* lst = editor->parts();
+      MusECore::PartList* lst = editor->parts();
       if(lst->empty())
       {
         *s = 0;
-        *e = tempomap.tick2frame(song->len());
+        *e = MusEGlobal::tempomap.tick2frame(MusEGlobal::song->len());
         return;  
       }
-      int ps = song->len(), pe = 0;
+      int ps = MusEGlobal::song->len(), pe = 0;
       int tps, tpe;
-      for(iPart ip = lst->begin(); ip != lst->end(); ++ip) 
+      for(MusECore::iPart ip = lst->begin(); ip != lst->end(); ++ip) 
       {
         tps = ip->second->tick();
         if(tps < ps)
@@ -523,8 +525,8 @@ void WaveView::range(int* s, int *e)
         if(tpe > pe)
           pe = tpe;
       }
-      *s = tempomap.tick2frame(ps);
-      *e = tempomap.tick2frame(pe);
+      *s = MusEGlobal::tempomap.tick2frame(ps);
+      *e = MusEGlobal::tempomap.tick2frame(pe);
       }
 
 //---------------------------------------------------------
@@ -538,11 +540,11 @@ void WaveView::cmd(int n)
       switch(n) {
             case WaveEdit::CMD_SELECT_ALL:
             if (!editor->parts()->empty()) {
-                  iPart iBeg = editor->parts()->begin();
-                  iPart iEnd = editor->parts()->end();
+                  MusECore::iPart iBeg = editor->parts()->begin();
+                  MusECore::iPart iEnd = editor->parts()->end();
                   iEnd--;
-                  WavePart* beg = (WavePart*) iBeg->second;
-                  WavePart* end = (WavePart*) iEnd->second;
+                  MusECore::WavePart* beg = (MusECore::WavePart*) iBeg->second;
+                  MusECore::WavePart* end = (MusECore::WavePart*) iEnd->second;
                   selectionStart = beg->frame();
                   selectionStop  = end->frame() + end->lenFrame();
                   redraw();
@@ -655,22 +657,22 @@ void WaveView::cmd(int n)
 //---------------------------------------------------------
 //   getSelection
 //---------------------------------------------------------
-WaveSelectionList WaveView::getSelection(unsigned startpos, unsigned stoppos)
+MusECore::WaveSelectionList WaveView::getSelection(unsigned startpos, unsigned stoppos)
       {
-      WaveSelectionList selection;
+      MusECore::WaveSelectionList selection;
 
-      for (iPart ip = editor->parts()->begin(); ip != editor->parts()->end(); ++ip) {
-            WavePart* wp = (WavePart*)(ip->second);
+      for (MusECore::iPart ip = editor->parts()->begin(); ip != editor->parts()->end(); ++ip) {
+            MusECore::WavePart* wp = (MusECore::WavePart*)(ip->second);
             unsigned part_offset = wp->frame();
             
-            EventList* el = wp->events();
+            MusECore::EventList* el = wp->events();
             //printf("eventlist length=%d\n",el->size());
 
-            for (iEvent e = el->begin(); e != el->end(); ++e) {
-                  Event event  = e->second;
+            for (MusECore::iEvent e = el->begin(); e != el->end(); ++e) {
+                  MusECore::Event event  = e->second;
                   if (event.empty())
                         continue;
-                  SndFileR file = event.sndFile();
+                  MusECore::SndFileR file = event.sndFile();
                   if (file.isNull())
                         continue;
                   
@@ -690,7 +692,7 @@ WaveSelectionList WaveView::getSelection(unsigned startpos, unsigned stoppos)
                         tmp_ex > (int)event_length   ? ex = event_length   : ex = tmp_ex;
 
                         //printf("Event data affected: %d->%d filename:%s\n", sx, ex, file.name().toLatin1().constData());
-                        WaveEventSelection s;
+                        MusECore::WaveEventSelection s;
                         s.file = file;
                         s.startframe = sx;
                         s.endframe   = ex+1;
@@ -708,13 +710,13 @@ WaveSelectionList WaveView::getSelection(unsigned startpos, unsigned stoppos)
 //---------------------------------------------------------
 void WaveView::modifySelection(int operation, unsigned startpos, unsigned stoppos, double paramA)
       {
-         song->startUndo();
+         MusEGlobal::song->startUndo();
 
          if (operation == PASTE) {
            // we need to redefine startpos and stoppos
            if (copiedPart =="")
              return;
-           SndFile pasteFile(copiedPart);
+           MusECore::SndFile pasteFile(copiedPart);
            pasteFile.openRead();
            startpos = pos[0];
            stoppos = startpos+ pasteFile.samples(); // possibly this is wrong if there are tempo changes
@@ -722,10 +724,10 @@ void WaveView::modifySelection(int operation, unsigned startpos, unsigned stoppo
            pos[0]=stoppos;
          }
 
-         WaveSelectionList selection = getSelection(startpos, stoppos);
-         for (iWaveSelection i = selection.begin(); i != selection.end(); i++) {
-               WaveEventSelection w = *i;
-               SndFileR& file         = w.file;
+	 MusECore::WaveSelectionList selection = getSelection(startpos, stoppos);
+         for (MusECore::iWaveSelection i = selection.begin(); i != selection.end(); i++) {
+               MusECore::WaveEventSelection w = *i;
+               MusECore::SndFileR& file         = w.file;
                unsigned sx            = w.startframe;
                unsigned ex            = w.endframe;
                unsigned file_channels = file.channels();
@@ -735,11 +737,11 @@ void WaveView::modifySelection(int operation, unsigned startpos, unsigned stoppo
                      break;
                      }
 
-               audio->msgIdle(true); // Not good with playback during operations
-               SndFile tmpFile(tmpWavFile);
+               MusEGlobal::audio->msgIdle(true); // Not good with playback during operations
+               MusECore::SndFile tmpFile(tmpWavFile);
                tmpFile.setFormat(file.format(), file_channels, file.samplerate());
                if (tmpFile.openWrite()) {
-                     audio->msgIdle(false);
+                     MusEGlobal::audio->msgIdle(false);
                      printf("Could not open temporary file...\n");
                      break;
                      }
@@ -793,7 +795,7 @@ void WaveView::modifySelection(int operation, unsigned startpos, unsigned stoppo
                            break;
                      case PASTE:
                            {
-                           SndFile pasteFile(copiedPart);
+                           MusECore::SndFile pasteFile(copiedPart);
                            pasteFile.openRead();
                            pasteFile.seek(tmpdataoffset, 0);
                            pasteFile.readWithHeap(file_channels, tmpdata, tmpdatalen);
@@ -822,10 +824,10 @@ void WaveView::modifySelection(int operation, unsigned startpos, unsigned stoppo
                      }
 
                // Undo handling
-               song->cmdChangeWave(file.dirPath() + "/" + file.name(), tmpWavFile, sx, ex);
-               audio->msgIdle(false); // Not good with playback during operations
+               MusEGlobal::song->cmdChangeWave(file.dirPath() + "/" + file.name(), tmpWavFile, sx, ex);
+               MusEGlobal::audio->msgIdle(false); // Not good with playback during operations
                }
-         song->endUndo(SC_CLIP_MODIFIED);
+         MusEGlobal::song->endUndo(SC_CLIP_MODIFIED);
          redraw();
       }
 
@@ -841,7 +843,7 @@ void WaveView::copySelection(unsigned file_channels, float** tmpdata, unsigned l
             return;
             }
 
-      SndFile tmpFile(copiedPart);
+      MusECore::SndFile tmpFile(copiedPart);
       tmpFile.setFormat(format, file_channels, sampleRate);
       tmpFile.openWrite();
       tmpFile.write(file_channels, tmpdata, length);
@@ -959,7 +961,7 @@ void WaveView::editExternal(unsigned file_format, unsigned file_samplerate, unsi
             return;
             }
 
-      SndFile exttmpFile(exttmpFileName);
+      MusECore::SndFile exttmpFile(exttmpFileName);
       exttmpFile.setFormat(file_format, file_channels, file_samplerate);
       if (exttmpFile.openWrite()) {
             printf("Could not open temporary file...\n");
@@ -972,7 +974,7 @@ void WaveView::editExternal(unsigned file_format, unsigned file_samplerate, unsi
       // Forkaborkabork
       int pid = fork();
       if (pid == 0) {
-            if (execlp(MusEConfig::config.externalWavEditor.toLatin1().constData(), MusEConfig::config.externalWavEditor.toLatin1().constData(), exttmpFileName.toLatin1().constData(), NULL) == -1) {
+            if (execlp(MusEGlobal::config.externalWavEditor.toLatin1().constData(), MusEGlobal::config.externalWavEditor.toLatin1().constData(), exttmpFileName.toLatin1().constData(), NULL) == -1) {
                   perror("Failed to launch external editor");
                   // Get out of here
                   
@@ -1020,4 +1022,4 @@ void WaveView::editExternal(unsigned file_format, unsigned file_samplerate, unsi
             }
       }
 
-
+} // namespace MusECore
diff --git a/muse2/muse/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h
index 664fcb51..a3fcf9c5 100644
--- a/muse2/muse/waveedit/waveview.h
+++ b/muse2/muse/waveedit/waveview.h
@@ -28,12 +28,13 @@
 #include <QMouseEvent>
 #include "wave.h"
 
-class PartList;
 class QPainter;
 class QRect;
-class WavePart;
-class MidiEditor;
+
+namespace MusECore {
+class PartList;
 class SndFileR;
+class WavePart;
 
 struct WaveEventSelection {
       SndFileR file;
@@ -44,11 +45,17 @@ struct WaveEventSelection {
 typedef std::list<WaveEventSelection> WaveSelectionList;
 typedef std::list<WaveEventSelection>::iterator iWaveSelection;
 
+} // namespace MusECore
+
+namespace MusEGui {
+
+class MidiEditor;
+
 //---------------------------------------------------------
 //   WaveView
 //---------------------------------------------------------
 
-class WaveView : public MusEWidget::View {
+class WaveView : public View {
       Q_OBJECT
     
       MidiEditor* editor;
@@ -58,7 +65,7 @@ class WaveView : public MusEWidget::View {
       int startSample;
       int endSample;
 
-      WavePart* curPart;
+      MusECore::WavePart* curPart;
       QString copiedPart;
       int curPartId;
 
@@ -75,7 +82,7 @@ class WaveView : public MusEWidget::View {
       virtual void wheelEvent(QWheelEvent*);
 
       //bool getUniqueTmpfileName(QString& newFilename); //!< Generates unique filename for temporary SndFile
-      WaveSelectionList getSelection(unsigned startpos, unsigned stoppos);
+      MusECore::WaveSelectionList getSelection(unsigned startpos, unsigned stoppos);
 
       int lastGainvalue; //!< Stores the last used gainvalue when specifiying gain value in the editgain dialog
       void modifySelection(int operation, unsigned startpos, unsigned stoppos, double paramA); //!< Modifies selection
@@ -113,8 +120,10 @@ class WaveView : public MusEWidget::View {
       QString getCaption() const;
       void range(int*, int*);
       void cmd(int n);
-      WavePart* part() { return curPart; }
+      MusECore::WavePart* part() { return curPart; }
       };
 
+} // namespace MusEGui
+
 #endif