introducing namespaces

3 files changed, 7 insertions, 7 deletions

diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 7e1d0133..01608fcb 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -125,7 +125,7 @@ DeicsOnze::DeicsOnze() : Mess(2) {
   _saveConfig = true;
   _isInitSet = true; //false if an initial bank must be download
   
-  QString sharePath(museGlobalShare);
+  QString sharePath(MusEGlobal::museGlobalShare);
   _initSetPath = sharePath + QString("/presets/deicsonze/SutulaBank.dei");
   
   
@@ -170,7 +170,7 @@ DeicsOnze::DeicsOnze() : Mess(2) {
   
   //Load configuration
   QString defaultConf = 
-    (configPath + QString("/" DEICSONZESTR ".dco"));
+    (MusEGlobal::configPath + QString("/" DEICSONZESTR ".dco"));
   FILE* f;
   f = fopen(defaultConf.toAscii().data(), "r");
   if(f) {
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index 4b0c0132..b88a47fc 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -418,7 +418,7 @@ DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
   QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
   connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
 
-  QString sharePath(museGlobalShare);
+  QString sharePath(MusEGlobal::museGlobalShare);
   // Tim.
   updateInitSetPath(sharePath + QString("/presets/deicsonze/SutulaBank.dei"));    // Tim.
   updateBackgroundPixPath(sharePath + QString("/wallpapers/paper2.jpg"));    // Tim.
@@ -555,7 +555,7 @@ void DeicsOnzeGui::saveConfiguration() {
 // saveDefaultConfiguration
 //-----------------------------------------------------------
 void DeicsOnzeGui::saveDefaultConfiguration() {
-  QString filename = configPath + QString("/" DEICSONZESTR ".dco");
+  QString filename = MusEGlobal::configPath + QString("/" DEICSONZESTR ".dco");
   if(!filename.isEmpty()) {
     QFile f(filename);
     f.open(QIODevice::WriteOnly);
diff --git a/muse2/synti/vam/vamgui.cpp b/muse2/synti/vam/vamgui.cpp
index c75b2568..0993087b 100644
--- a/muse2/synti/vam/vamgui.cpp
+++ b/muse2/synti/vam/vamgui.cpp
@@ -601,7 +601,7 @@ void VAMGui::loadPresetsPressed()
 {
 #if 1   // TODO
 	QString iname;
-	QString s(configPath);
+	QString s(MusEGlobal::configPath);
 	
 /*      QString filename = QFileDialog::getOpenFileName(lastdir, QString("*.[Ss][Ff]2"),
                                                       this,
@@ -716,7 +716,7 @@ void VAMGui::doSavePresets(const QString& fn, bool showWarning)
 void VAMGui::savePresetsPressed()
 {
 #if 1 // TODO
-	QString s(configPath);
+        QString s(MusEGlobal::configPath);
 	QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                   s, "Presets (*.vam)");
 	if (fn.isEmpty())
@@ -734,7 +734,7 @@ void VAMGui::savePresetsToFilePressed()
 {
 	if (!presetFileName ) {
  
-      QString s(configPath);
+      QString s(MusEGlobal::configPath);
       QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                 s, "Presets (*.vam)");
       presetFileName = new QString(fn);