Removed more namespace artifacts. Searched on "MusEGlobal "MusEConfig etc.

5 files changed, 16 insertions, 16 deletions

diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 5eaaca72..aab80a2c 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -1063,7 +1063,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
 
       tools1 = new MusEWidget::EditToolBar(this, MusEWidget::arrangerTools);
       addToolBar(tools1);
-      tools1->setObjectName("MusEWidget::arrangerTools");
+      tools1->setObjectName("arrangerTools");
 
       QToolBar* transportToolbar = addToolBar(tr("Transport"));
       transportToolbar->setObjectName("Transport");
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index 551b640d..0ed6b1b3 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -899,7 +899,7 @@ void AudioTrack::writeProperties(int level, Xml& xml) const
       Track::writeProperties(level, xml);
       xml.intTag(level, "prefader", prefader());
       xml.intTag(level, "sendMetronome", sendMetronome());
-      xml.intTag(level, "MusEGlobal::automation", int(automationType()));
+      xml.intTag(level, "automation", int(automationType()));
       if (hasAuxSend()) {
             int naux = song->auxs()->size();
             for (int idx = 0; idx < naux; ++idx) {
@@ -1003,7 +1003,7 @@ bool AudioTrack::readProperties(Xml& xml, const QString& tag)
             _prefader = xml.parseInt();
       else if (tag == "sendMetronome")
             _sendMetronome = xml.parseInt();
-      else if (tag == "MusEGlobal::automation")
+      else if (tag == "automation")
             setAutomationType(AutomationType(xml.parseInt()));
       // Removed by T356
       // "recfile" tag not saved anymore
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index dc43855b..35829657 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -1371,13 +1371,13 @@ void MusE::writeConfiguration(int level, Xml& xml) const
       xml.tag(level++, "configuration");
 
       xml.intTag(level, "midiInputDevice",  MusEGlobal::midiInputPorts);
-      xml.intTag(level, "MusEGlobal::midiInputChannel", MusEGlobal::midiInputChannel);
-      xml.intTag(level, "MusEGlobal::midiRecordType",   MusEGlobal::midiRecordType);
-      xml.intTag(level, "MusEGlobal::midiThruType",     MusEGlobal::midiThruType);
-      xml.intTag(level, "MusEGlobal::midiFilterCtrl1",  MusEGlobal::midiFilterCtrl1);
-      xml.intTag(level, "MusEGlobal::midiFilterCtrl2",  MusEGlobal::midiFilterCtrl2);
-      xml.intTag(level, "MusEGlobal::midiFilterCtrl3",  MusEGlobal::midiFilterCtrl3);
-      xml.intTag(level, "MusEGlobal::midiFilterCtrl4",  MusEGlobal::midiFilterCtrl4);
+      xml.intTag(level, "midiInputChannel", MusEGlobal::midiInputChannel);
+      xml.intTag(level, "midiRecordType",   MusEGlobal::midiRecordType);
+      xml.intTag(level, "midiThruType",     MusEGlobal::midiThruType);
+      xml.intTag(level, "midiFilterCtrl1",  MusEGlobal::midiFilterCtrl1);
+      xml.intTag(level, "midiFilterCtrl2",  MusEGlobal::midiFilterCtrl2);
+      xml.intTag(level, "midiFilterCtrl3",  MusEGlobal::midiFilterCtrl3);
+      xml.intTag(level, "midiFilterCtrl4",  MusEGlobal::midiFilterCtrl4);
 
       xml.intTag(level, "waveTracksVisible",  WaveTrack::visible());
       xml.intTag(level, "auxTracksVisible",  AudioAux::visible());
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index f0dfdaf0..874e2a9a 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -3498,7 +3498,7 @@ PluginGui::PluginGui(PluginIBase* p)
                   gw[nobj].param  = parameter;
                   gw[nobj].type   = -1;
 
-                  if (strcmp(obj->metaObject()->className(), "MusEWidget::Slider") == 0) {
+                  if (strcmp(obj->metaObject()->className(), "Slider") == 0) {
                         gw[nobj].type = GuiWidgets::SLIDER;
                         ((MusEWidget::Slider*)obj)->setId(nobj);
                         ((MusEWidget::Slider*)obj)->setCursorHoming(true);
@@ -3513,7 +3513,7 @@ PluginGui::PluginGui(PluginIBase* p)
                         connect(obj, SIGNAL(sliderReleased(int)), SLOT(guiSliderReleased(int)));
                         connect(obj, SIGNAL(sliderRightClicked(const QPoint &, int)), SLOT(guiSliderRightClicked(const QPoint &, int)));
                         }
-                  else if (strcmp(obj->metaObject()->className(), "MusEWidget::DoubleLabel") == 0) {
+                  else if (strcmp(obj->metaObject()->className(), "DoubleLabel") == 0) {
                         gw[nobj].type = GuiWidgets::DOUBLE_LABEL;
                         ((MusEWidget::DoubleLabel*)obj)->setId(nobj);
                         //for(int i = 0; i < nobj; i++)
@@ -4554,9 +4554,9 @@ void PluginGui::guiSliderRightClicked(const QPoint &p, int idx)
 //---------------------------------------------------------
 QWidget* PluginLoader::createWidget(const QString & className, QWidget * parent, const QString & name)
 {
-  if(className == QString("MusEWidget::DoubleLabel"))
+  if(className == QString("DoubleLabel"))
     return new MusEWidget::DoubleLabel(parent, name.toLatin1().constData()); 
-  if(className == QString("MusEWidget::Slider"))
+  if(className == QString("Slider"))
     return new MusEWidget::Slider(parent, name.toLatin1().constData(), Qt::Horizontal); 
 
   return QUiLoader::createWidget(className, parent, name);
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp
index 0f2f3527..9678b99b 100644
--- a/muse2/muse/songfile.cpp
+++ b/muse2/muse/songfile.cpp
@@ -1442,7 +1442,7 @@ void Song::read(Xml& xml, bool isTemplate)
                               readMarker(xml);
                         else if (tag == "globalPitchShift")
                               _globalPitchShift = xml.parseInt();
-                        else if (tag == "MusEGlobal::automation")
+                        else if (tag == "automation")
                               MusEGlobal::automation = xml.parseInt();
                         else if (tag == "cpos") {
                               int pos = xml.parseInt();
@@ -1490,7 +1490,7 @@ void Song::write(int level, Xml& xml) const
       xml.tag(level++, "song");
       xml.strTag(level, "info", songInfoStr);
       xml.intTag(level, "showinfo", showSongInfo);
-      xml.intTag(level, "MusEGlobal::automation", MusEGlobal::automation);
+      xml.intTag(level, "automation", MusEGlobal::automation);
       xml.intTag(level, "cpos", song->cpos());
       xml.intTag(level, "rpos", song->rpos());
       xml.intTag(level, "lpos", song->lpos());