introducing namespaces

4 files changed, 35 insertions, 35 deletions

diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp
index 5b95a6f7..7c77a836 100644
--- a/muse2/muse/ctrl/ctrlcanvas.cpp
+++ b/muse2/muse/ctrl/ctrlcanvas.cpp
@@ -199,10 +199,10 @@ CtrlCanvas::CtrlCanvas(MidiEditor* e, QWidget* parent, int xmag,
    const char* name, CtrlPanel* pnl) : View(parent, xmag, 1, name)
       {
       setBg(Qt::white);
-      setFont(config.fonts[3]);  
+      setFont(MusEConfig::config.fonts[3]);  
       editor = e;
       drag   = DRAG_OFF;
-      tool   = PointerTool;
+      tool   = MusEWidget::PointerTool;
       pos[0] = 0;
       pos[1] = 0;
       pos[2] = 0;
@@ -227,7 +227,7 @@ CtrlCanvas::CtrlCanvas(MidiEditor* e, QWidget* parent, int xmag,
             setCurTrackAndPart();
             }
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
-      connect(muse, SIGNAL(configChanged()), SLOT(configChanged()));
+      connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged()));
       
       curDrumInstrument = editor->curDrumInstrument();
       //printf("CtrlCanvas::CtrlCanvas curDrumInstrument:%d\n", curDrumInstrument);
@@ -472,7 +472,7 @@ void CtrlCanvas::songChanged(int type)
     return;
             
   if(type & SC_CONFIG)
-    setFont(config.fonts[3]);  
+    setFont(MusEConfig::config.fonts[3]);  
   
   bool changed = false;
   if(type & (SC_CONFIG | SC_PART_MODIFIED | SC_SELECTION))
@@ -678,7 +678,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
         return;
         
       start = event->pos();
-      Tool activeTool = tool;
+      MusEWidget::Tool activeTool = tool;
       
       bool ctrlKey = event->modifiers() & Qt::ControlModifier;
       int xpos = start.x();
@@ -687,7 +687,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
       MidiController::ControllerType type = midiControllerType(_controller->num());
 
       switch (activeTool) {
-            case PointerTool:
+            case MusEWidget::PointerTool:
                   if(curPart)      // p4.0.27
                   {
                     drag = DRAG_LASSO_START;
@@ -732,7 +732,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
                   
                   break;
 
-            case PencilTool:
+           case MusEWidget::PencilTool:
                   if ((!ctrlKey) && (type != MidiController::Velo)) {
                               drag = DRAG_NEW;
                               song->startUndo();
@@ -745,7 +745,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
                         }
                   break;
 
-            case RubberTool:
+            case MusEWidget::RubberTool:
                   if (type != MidiController::Velo) {
                         drag = DRAG_DELETE;
                         song->startUndo();
@@ -753,7 +753,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
                         }
                   break;
 
-            case DrawTool:
+            case MusEWidget::DrawTool:
                   if (drawLineMode) {
                         line2x = xpos;
                         line2y = ypos;
@@ -817,7 +817,7 @@ void CtrlCanvas::viewMouseMoveEvent(QMouseEvent* event)
             default:
                   break;
             }
-      if (tool == DrawTool && drawLineMode) {
+      if (tool == MusEWidget::DrawTool && drawLineMode) {
             line2x = pos.x();
             line2y = pos.y();
             redraw();
@@ -930,8 +930,8 @@ void CtrlCanvas::newValRamp(int x1, int y1, int x2, int y2)
       int raster = editor->raster();
       if (raster == 1)          // set reasonable raster
       {
-        //raster = config.division/4;
-        raster = config.division/16;  // Let's use 64th notes, for a bit finer resolution. p4.0.18 Tim.
+        //raster = MusEConfig::config.division/4;
+        raster = MusEConfig::config.division/16;  // Let's use 64th notes, for a bit finer resolution. p4.0.18 Tim.
         useRaster = true;
       }  
 
@@ -1388,8 +1388,8 @@ void CtrlCanvas::newVal(int x1, int y1, int x2, int y2)
       int raster = editor->raster();
       if (raster == 1)          // set reasonable raster
       {
-        //raster = config.division/4;
-        raster = config.division/16;  // Let's use 64th notes, for a bit finer resolution. p4.0.18 Tim.
+        //raster = MusEConfig::config.division/4;
+        raster = MusEConfig::config.division/16;  // Let's use 64th notes, for a bit finer resolution. p4.0.18 Tim.
         useRaster = true;
       }  
 
@@ -1621,14 +1621,14 @@ void CtrlCanvas::deleteVal(int x1, int x2, int)
 
 void CtrlCanvas::setTool(int t)
       {
-      if (tool == Tool(t))
+      if (tool == MusEWidget::Tool(t))
             return;
-      tool = Tool(t);
+      tool = MusEWidget::Tool(t);
       switch(tool) {
-            case PencilTool:
+            case MusEWidget::PencilTool:
                   setCursor(QCursor(*pencilIcon, 4, 15));
                   break;
-            case DrawTool:
+            case MusEWidget::DrawTool:
                   drawLineMode = false;
                   break;
             default:
@@ -1673,7 +1673,7 @@ void CtrlCanvas::pdrawItems(QPainter& p, const QRect& rect, const MidiPart* part
         //if(!event.empty() && event.selected())
           p.setPen(QPen(Qt::blue, 3));
         else
-          p.setPen(QPen(config.ctrlGraphFg, 3));
+          p.setPen(QPen(MusEConfig::config.ctrlGraphFg, 3));
       }  
       else  
         p.setPen(QPen(Qt::darkGray, 3));
@@ -1765,7 +1765,7 @@ void CtrlCanvas::pdrawItems(QPainter& p, const QRect& rect, const MidiPart* part
           p.drawLine(x1, lval, tick, lval);
         }  
         else
-          p.fillRect(x1, lval, tick - x1, wh - lval, selected ? Qt::blue : config.ctrlGraphFg);
+          p.fillRect(x1, lval, tick - x1, wh - lval, selected ? Qt::blue : MusEConfig::config.ctrlGraphFg);
       }
       
       
@@ -1797,8 +1797,8 @@ void CtrlCanvas::pdrawItems(QPainter& p, const QRect& rect, const MidiPart* part
         p.drawLine(x1, lval, x + w, lval);
       }  
       else
-        //p.fillRect(x1, lval, (x+w) - x1, wh - lval, config.ctrlGraphFg);
-        p.fillRect(x1, lval, (x+w) - x1, wh - lval, selected ? Qt::blue : config.ctrlGraphFg);
+        //p.fillRect(x1, lval, (x+w) - x1, wh - lval, MusEConfig::config.ctrlGraphFg);
+        p.fillRect(x1, lval, (x+w) - x1, wh - lval, selected ? Qt::blue : MusEConfig::config.ctrlGraphFg);
     }
   }       
 }
@@ -1911,18 +1911,18 @@ void CtrlCanvas::drawOverlay(QPainter& p)
       {
       QString s(_controller ? _controller->name() : QString(""));
       
-      //p.setFont(config.fonts[3]);  // Use widget font instead. 
+      //p.setFont(MusEConfig::config.fonts[3]);  // Use widget font instead. 
       p.setFont(font());
       
       p.setPen(Qt::black);
       
-      //QFontMetrics fm(config.fonts[3]);  // Use widget font metrics instead. 
+      //QFontMetrics fm(MusEConfig::config.fonts[3]);  // Use widget font metrics instead. 
       //int y = fm.lineSpacing() + 2;
       int y = fontMetrics().lineSpacing() + 2;
       
       p.drawText(2, y, s);
       if (noEvents) {
-           //p.setFont(config.fonts[3]);
+           //p.setFont(MusEConfig::config.fonts[3]);
            //p.setPen(Qt::black);
            //p.drawText(width()/2-100,height()/2-10, "Use shift + pencil or line tool to draw new events");
            p.drawText(2 , y * 2, "Use shift + pencil or line tool to draw new events");
@@ -1936,7 +1936,7 @@ void CtrlCanvas::drawOverlay(QPainter& p)
 
 QRect CtrlCanvas::overlayRect() const
 {
-      //QFontMetrics fm(config.fonts[3]);   // Use widget font metrics instead (and set a widget font) !!! 
+      //QFontMetrics fm(MusEConfig::config.fonts[3]);   // Use widget font metrics instead (and set a widget font) !!! 
       QFontMetrics fm(fontMetrics());
       QRect r(fm.boundingRect(_controller ? _controller->name() : QString("")));
       
@@ -1969,7 +1969,7 @@ void CtrlCanvas::draw(QPainter& p, const QRect& rect)
       //    draw line tool
       //---------------------------------------------------
 
-      if (drawLineMode && (tool == DrawTool)) {
+      if (drawLineMode && (tool == MusEWidget::DrawTool)) {
             p.setPen(Qt::black);
             p.drawLine(line1x, line1y, line2x, line2y);
             }
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index 5fc31ed4..8846d2ce 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -153,7 +153,7 @@ class CtrlCanvas : public View {
       DragMode drag;
       QRect lasso;
       QPoint start;
-      Tool tool;
+      MusEWidget::Tool tool;
       unsigned pos[3];
       int curDrumInstrument;    //Used by the drum-editor to view velocity of only one key (one drum)
       
diff --git a/muse2/muse/ctrl/ctrledit.cpp b/muse2/muse/ctrl/ctrledit.cpp
index 836ebcfb..c9c33999 100644
--- a/muse2/muse/ctrl/ctrledit.cpp
+++ b/muse2/muse/ctrl/ctrledit.cpp
@@ -60,7 +60,7 @@ CtrlEdit::CtrlEdit(QWidget* parent, MidiEditor* e, int xmag,
       hbox->setContentsMargins(0, 0, 0, 0);
       hbox->setSpacing (0);
 
-      canvas->setOrigin(-(config.division/4), 0);
+      canvas->setOrigin(-(MusEConfig::config.division/4), 0);
 
       canvas->setMinimumHeight(50);
       
diff --git a/muse2/muse/ctrl/ctrlpanel.cpp b/muse2/muse/ctrl/ctrlpanel.cpp
index f9f399c4..998058d7 100644
--- a/muse2/muse/ctrl/ctrlpanel.cpp
+++ b/muse2/muse/ctrl/ctrlpanel.cpp
@@ -87,7 +87,7 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
       dbox->setContentsMargins(0, 0, 0, 0);
 
       selCtrl = new QPushButton(tr("S"));
-      selCtrl->setFont(config.fonts[3]);
+      selCtrl->setFont(MusEConfig::config.fonts[3]);
       selCtrl->setFixedHeight(20);
       selCtrl->setSizePolicy(
          QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
@@ -97,7 +97,7 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
 
       // destroy button
       QPushButton* destroy = new QPushButton(tr("X"));
-      destroy->setFont(config.fonts[3]);
+      destroy->setFont(MusEConfig::config.fonts[3]);
       destroy->setFixedHeight(20);
       destroy->setSizePolicy(
          QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
@@ -125,7 +125,7 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
       _dl->setPrecision(0);
       _dl->setToolTip(tr("double click on/off"));
       _dl->setSpecialText(tr("off"));
-      _dl->setFont(config.fonts[1]);
+      _dl->setFont(MusEConfig::config.fonts[1]);
       _dl->setBackgroundRole(QPalette::Mid);
       _dl->setFrame(true);
       _dl->setFixedWidth(36);
@@ -149,7 +149,7 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
       dbox->addStretch();
       dbox->addWidget(_dl);
       dbox->addStretch();
-      connect(heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
+      connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
       inHeartBeat = false;
       setLayout(vbox);
       }
@@ -871,7 +871,7 @@ void CtrlPanel::ctrlPopup()
               int rv2 = act2->data().toInt();
               
               if (rv2 == max + 2)            // edit instrument
-                muse->startEditInstrument();
+                MusEGlobal::muse->startEditInstrument();
               else                           // select new instrument control
               {
                 MidiController* c;
@@ -903,7 +903,7 @@ void CtrlPanel::ctrlPopup()
             }
       
       //else if (rv == max + 2)             // edit instrument
-      //      muse->startEditInstrument();
+      //      MusEGlobal::muse->startEditInstrument();
       
       else if (rv == max + 3) {             // add new other controller
             PopupMenu* ctrlSubPop = new PopupMenu(this);