namespace work (part deux)

3 files changed, 14 insertions, 11 deletions

diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 0da0bbcb..e211e7f7 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -312,7 +312,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Meta Type"));
-      il2 = new IntLabel(-1, 0, 127, this, -1);
+      il2 = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFixedWidth(100);
       il2->setFrame(true);
       il2->setDark();
@@ -447,7 +447,7 @@ EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pressure"));
-      il2  = new IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -506,9 +506,9 @@ EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pitch"));
-      pl = new PitchEdit;
+      pl = new MusEWidget::PitchEdit;
       QLabel* l3 = new QLabel(tr("Pressure"));
-      il2  = new IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -696,7 +696,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 void EditCtrlDialog::newController()
       {
       //QMenu* pup = new QMenu(this);
-      PopupMenu* pup = new PopupMenu(this);
+      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
       //pup->setCheckable(this);//not necessary in Qt4
       //
       // populate popup with all controllers available for
@@ -871,7 +871,7 @@ void EditCtrlDialog::instrPopup()
       
       ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
       //QMenu* pup = new QMenu(this);
-      PopupMenu* pup = new PopupMenu(this);
+      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
       instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);
 
       ///if(pop->actions().count() == 0)
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index 454d81bc..02befe7e 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -33,8 +33,11 @@ namespace Awl {
       };
 
 ///class PosEdit;
+namespace MusEWidget {
 class IntLabel;
 class PitchEdit;
+}
+
 class QDialog;
 class QLabel;
 class QGridLayout;
@@ -143,7 +146,7 @@ class EditMetaDialog : public EditEventDialog {
       ///PosEdit* epos;
       Awl::PosEdit* epos;
       QTextEdit* edit;
-      IntLabel* il2;
+      MusEWidget::IntLabel* il2;
       QRadioButton* hexButton;
       QLabel* typeLabel;
 
@@ -173,7 +176,7 @@ class EditCAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      IntLabel* il2;
+      MusEWidget::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
@@ -195,8 +198,8 @@ class EditPAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      PitchEdit* pl;
-      IntLabel* il2;
+      MusEWidget::PitchEdit* pl;
+      MusEWidget::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index cfc7132f..37989ca9 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -381,7 +381,7 @@ QString EventListItem::text(int col) const
                   break;
             case 4:
                   if (event.isNote() || event.type() == PAfter)
-                        s = pitch2string(event.dataA());
+                        s =  pitch2string(event.dataA());
                   else if (event.type() == Controller)
                         s.setNum(event.dataA() & 0xffff);  // mask off type bits
                   else