introducing namespaces

1 files changed, 16 insertions, 16 deletions

diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index f19b8ba0..60baebce 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -61,10 +61,10 @@ void MidiTrackInfo::setTrack(Track* t)
   
   QPalette pal;
   if(selected->type() == Track::DRUM) {
-    pal.setColor(trackNameLabel->backgroundRole(), config.drumTrackLabelBg); 
+    pal.setColor(trackNameLabel->backgroundRole(), MusEConfig::config.drumTrackLabelBg); 
     iOutputChannel->setEnabled(false);
   } else  {
-    pal.setColor(trackNameLabel->backgroundRole(), config.midiTrackLabelBg);
+    pal.setColor(trackNameLabel->backgroundRole(), MusEConfig::config.midiTrackLabelBg);
     iOutputChannel->setEnabled(true);
   }
   trackNameLabel->setPalette(pal);
@@ -90,7 +90,7 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, Track* sel_track) : QWidget(parent
   pan      = -65;
   volume   = -1;
   
-  setFont(config.fonts[2]);
+  setFont(MusEConfig::config.fonts[2]);
   
   //iChanDetectLabel->setPixmap(*darkgreendotIcon);
   iChanDetectLabel->setPixmap(*darkRedLedIcon);
@@ -115,14 +115,14 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, Track* sel_track) : QWidget(parent
     QPalette pal;
     //pal.setColor(trackNameLabel->backgroundRole(), QColor(0, 160, 255)); // Med blue
     if(selected->type() == Track::DRUM)
-      pal.setColor(trackNameLabel->backgroundRole(), config.drumTrackLabelBg); 
+      pal.setColor(trackNameLabel->backgroundRole(), MusEConfig::config.drumTrackLabelBg); 
     else  
-      pal.setColor(trackNameLabel->backgroundRole(), config.midiTrackLabelBg); 
+      pal.setColor(trackNameLabel->backgroundRole(), MusEConfig::config.midiTrackLabelBg); 
     trackNameLabel->setPalette(pal);
   }    
   //else
   //{
-  //  pal.setColor(trackNameLabel->backgroundRole(), config.midiTrackLabelBg); 
+  //  pal.setColor(trackNameLabel->backgroundRole(), MusEConfig::config.midiTrackLabelBg); 
   //  trackNameLabel->setPalette(pal);
   //}  
   
@@ -180,9 +180,9 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, Track* sel_track) : QWidget(parent
   connect(oRButton, SIGNAL(pressed()), SLOT(outRoutesPressed()));
   
   connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
-  connect(muse, SIGNAL(configChanged()), SLOT(configChanged()));
+  connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged()));
   
-  connect(heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
+  connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
 }
 
 //---------------------------------------------------------
@@ -502,15 +502,15 @@ void MidiTrackInfo::configChanged()
       {
       //printf("MidiTrackInfo::configChanged\n");
       
-      //if (config.canvasBgPixmap.isEmpty()) {
-      //      canvas->setBg(config.partCanvasBg);
+      //if (MusEConfig::config.canvasBgPixmap.isEmpty()) {
+      //      canvas->setBg(MusEConfig::config.partCanvasBg);
       //      canvas->setBg(QPixmap());
       //}
       //else {
-      //      canvas->setBg(QPixmap(config.canvasBgPixmap));
+      //      canvas->setBg(QPixmap(MusEConfig::config.canvasBgPixmap));
       //}
       
-      setFont(config.fonts[2]);
+      setFont(MusEConfig::config.fonts[2]);
       //updateTrackInfo(type);
       }
 
@@ -555,9 +555,9 @@ void MidiTrackInfo::setLabelFont()
         
       // Use the new font #6 I created just for these labels (so far).
       // Set the label's font.
-      trackNameLabel->setFont(config.fonts[6]);
+      trackNameLabel->setFont(MusEConfig::config.fonts[6]);
       // Dealing with a horizontally constrained label. Ignore vertical. Use a minimum readable point size.
-      autoAdjustFontSize(trackNameLabel, trackNameLabel->text(), false, true, config.fonts[6].pointSize(), 5); 
+      autoAdjustFontSize(trackNameLabel, trackNameLabel->text(), false, true, MusEConfig::config.fonts[6].pointSize(), 5); 
 }
   
 //---------------------------------------------------------
@@ -622,7 +622,7 @@ void MidiTrackInfo::inRoutesPressed()
   if(!selected->isMidiTrack())
     return;
   
-  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+  RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
   iRButton->setDown(false);     
   pup->exec(QCursor::pos(), selected, false);
 }
@@ -638,7 +638,7 @@ void MidiTrackInfo::outRoutesPressed()
   if(!selected->isMidiTrack())
     return;
   
-  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+  RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
   oRButton->setDown(false);     
   pup->exec(QCursor::pos(), selected, true);
 }