(hopefully) final huge namespace update.

20 files changed, 150 insertions, 120 deletions

diff --git a/muse2/muse/widgets/function_dialogs/crescendo.cpp b/muse2/muse/widgets/function_dialogs/crescendo.cpp
index f8245b24..fa94f58e 100644
--- a/muse2/muse/widgets/function_dialogs/crescendo.cpp
+++ b/muse2/muse/widgets/function_dialogs/crescendo.cpp
@@ -24,7 +24,7 @@
 #include "crescendo.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Crescendo::Crescendo(QWidget* parent)
 	: QDialog(parent)
@@ -66,18 +66,18 @@ int Crescendo::exec()
 	return QDialog::exec();
 }
 
-void Crescendo::read_configuration(Xml& xml)
+void Crescendo::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "start")
@@ -90,7 +90,7 @@ void Crescendo::read_configuration(Xml& xml)
 					xml.unknown("Crescendo");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "crescendo")
 					return;
 				
@@ -100,7 +100,7 @@ void Crescendo::read_configuration(Xml& xml)
 	}
 }
 
-void Crescendo::write_configuration(int level, Xml& xml)
+void Crescendo::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "crescendo");
 	xml.intTag(level, "range", range);
@@ -128,4 +128,4 @@ void Crescendo::absolute_changed(bool val)
 	}
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/crescendo.h b/muse2/muse/widgets/function_dialogs/crescendo.h
index c0871ab8..ccd3030e 100644
--- a/muse2/muse/widgets/function_dialogs/crescendo.h
+++ b/muse2/muse/widgets/function_dialogs/crescendo.h
@@ -26,9 +26,12 @@
 #include "ui_crescendobase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Crescendo : public QDialog, public Ui::CrescendoBase
 {
@@ -49,8 +52,8 @@ class Crescendo : public QDialog, public Ui::CrescendoBase
 		int end_val;
 		bool absolute;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
@@ -60,7 +63,7 @@ class Crescendo : public QDialog, public Ui::CrescendoBase
 		void absolute_changed(bool);
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.cpp b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp
index 0841b6e9..b6a0bf3f 100644
--- a/muse2/muse/widgets/function_dialogs/deloverlaps.cpp
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp
@@ -24,7 +24,7 @@
 #include "deloverlaps.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 DelOverlaps::DelOverlaps(QWidget* parent)
 	: QDialog(parent)
@@ -59,25 +59,25 @@ int DelOverlaps::exec()
 	return QDialog::exec();
 }
 
-void DelOverlaps::read_configuration(Xml& xml)
+void DelOverlaps::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else
 					xml.unknown("DelOverlaps");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "del_overlaps")
 					return;
 				
@@ -87,11 +87,11 @@ void DelOverlaps::read_configuration(Xml& xml)
 	}
 }
 
-void DelOverlaps::write_configuration(int level, Xml& xml)
+void DelOverlaps::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "del_overlaps");
 	xml.intTag(level, "range", range);
 	xml.tag(level, "/del_overlaps");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.h b/muse2/muse/widgets/function_dialogs/deloverlaps.h
index 2fc470cd..0036a2d4 100644
--- a/muse2/muse/widgets/function_dialogs/deloverlaps.h
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.h
@@ -26,9 +26,12 @@
 #include "ui_deloverlapsbase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class DelOverlaps : public QDialog, public Ui::DelOverlapsBase
 {
@@ -46,14 +49,14 @@ class DelOverlaps : public QDialog, public Ui::DelOverlapsBase
 
 		int range;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/gatetime.cpp b/muse2/muse/widgets/function_dialogs/gatetime.cpp
index 537260ca..987e53a5 100644
--- a/muse2/muse/widgets/function_dialogs/gatetime.cpp
+++ b/muse2/muse/widgets/function_dialogs/gatetime.cpp
@@ -28,7 +28,7 @@
 #include "xml.h"
 #include "song.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   GateTime
@@ -83,18 +83,18 @@ int GateTime::exec()
       }
 
 
-void GateTime::read_configuration(Xml& xml)
+void GateTime::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "rate")
@@ -105,7 +105,7 @@ void GateTime::read_configuration(Xml& xml)
 					xml.unknown("ModLen");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "mod_len")
 					return;
 				
@@ -115,7 +115,7 @@ void GateTime::read_configuration(Xml& xml)
 	}
 }
 
-void GateTime::write_configuration(int level, Xml& xml)
+void GateTime::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "mod_len");
 	xml.intTag(level, "range", range);
@@ -124,4 +124,4 @@ void GateTime::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/mod_len");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h
index 20d28948..b0c3987b 100644
--- a/muse2/muse/widgets/function_dialogs/gatetime.h
+++ b/muse2/muse/widgets/function_dialogs/gatetime.h
@@ -26,9 +26,12 @@
 #include "ui_gatetimebase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   GateTime
@@ -51,15 +54,15 @@ class GateTime : public QDialog, public Ui::GateTimeBase {
       int rateVal;
       int offsetVal;
       
-      void read_configuration(Xml& xml);
-      void write_configuration(int level, Xml& xml);
+      void read_configuration(MusECore::Xml& xml);
+      void write_configuration(int level, MusECore::Xml& xml);
 
       
    public slots:
       int exec();
       };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/legato.cpp b/muse2/muse/widgets/function_dialogs/legato.cpp
index 5ca6e29b..0d31017c 100644
--- a/muse2/muse/widgets/function_dialogs/legato.cpp
+++ b/muse2/muse/widgets/function_dialogs/legato.cpp
@@ -24,7 +24,7 @@
 #include "legato.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Legato::Legato(QWidget* parent)
 	: QDialog(parent)
@@ -63,18 +63,18 @@ int Legato::exec()
 	return QDialog::exec();
 }
 
-void Legato::read_configuration(Xml& xml)
+void Legato::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "min_len")
@@ -85,7 +85,7 @@ void Legato::read_configuration(Xml& xml)
 					xml.unknown("Legato");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "legato")
 					return;
 				
@@ -95,7 +95,7 @@ void Legato::read_configuration(Xml& xml)
 	}
 }
 
-void Legato::write_configuration(int level, Xml& xml)
+void Legato::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "legato");
 	xml.intTag(level, "range", range);
@@ -104,4 +104,4 @@ void Legato::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/legato");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/legato.h b/muse2/muse/widgets/function_dialogs/legato.h
index c2cbeabc..1c25fef1 100644
--- a/muse2/muse/widgets/function_dialogs/legato.h
+++ b/muse2/muse/widgets/function_dialogs/legato.h
@@ -26,9 +26,12 @@
 #include "ui_legatobase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Legato : public QDialog, public Ui::LegatoBase
 {
@@ -48,15 +51,15 @@ class Legato : public QDialog, public Ui::LegatoBase
 		int min_len;
 		bool allow_shortening;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/move.cpp b/muse2/muse/widgets/function_dialogs/move.cpp
index 2529cb68..e0a1fddf 100644
--- a/muse2/muse/widgets/function_dialogs/move.cpp
+++ b/muse2/muse/widgets/function_dialogs/move.cpp
@@ -24,7 +24,7 @@
 #include "move.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Move::Move(QWidget* parent)
 	: QDialog(parent)
@@ -62,18 +62,18 @@ int Move::exec()
 }
 
 
-void Move::read_configuration(Xml& xml)
+void Move::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "amount")
@@ -82,7 +82,7 @@ void Move::read_configuration(Xml& xml)
 					xml.unknown("Move");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "move")
 					return;
 				
@@ -92,7 +92,7 @@ void Move::read_configuration(Xml& xml)
 	}
 }
 
-void Move::write_configuration(int level, Xml& xml)
+void Move::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "move");
 	xml.intTag(level, "range", range);
@@ -100,4 +100,4 @@ void Move::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/move");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/move.h b/muse2/muse/widgets/function_dialogs/move.h
index 39718134..c3c8b83c 100644
--- a/muse2/muse/widgets/function_dialogs/move.h
+++ b/muse2/muse/widgets/function_dialogs/move.h
@@ -26,9 +26,12 @@
 #include "ui_movebase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Move : public QDialog, public Ui::MoveBase
 {
@@ -47,15 +50,15 @@ class Move : public QDialog, public Ui::MoveBase
 		int range;
 		int amount;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 	
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/quantize.cpp b/muse2/muse/widgets/function_dialogs/quantize.cpp
index 0841e106..df7c0298 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.cpp
+++ b/muse2/muse/widgets/function_dialogs/quantize.cpp
@@ -24,7 +24,7 @@
 #include "quantize.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Quantize::Quantize(QWidget* parent)
 	: QDialog(parent)
@@ -69,18 +69,18 @@ int Quantize::exec()
 	return QDialog::exec();
 }
 
-void Quantize::read_configuration(Xml& xml)
+void Quantize::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "strength")
@@ -97,7 +97,7 @@ void Quantize::read_configuration(Xml& xml)
 					xml.unknown("Quantize");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "quantize")
 					return;
 				
@@ -107,7 +107,7 @@ void Quantize::read_configuration(Xml& xml)
 	}
 }
 
-void Quantize::write_configuration(int level, Xml& xml)
+void Quantize::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "quantize");
 	xml.intTag(level, "range", range);
@@ -119,5 +119,5 @@ void Quantize::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/quantize");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
diff --git a/muse2/muse/widgets/function_dialogs/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h
index 69498810..6ce74215 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.h
+++ b/muse2/muse/widgets/function_dialogs/quantize.h
@@ -26,9 +26,12 @@
 #include "ui_quantbase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Quantize : public QDialog, public Ui::QuantBase
 {
@@ -51,15 +54,15 @@ class Quantize : public QDialog, public Ui::QuantBase
 		int swing;
 		bool quant_len;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/remove.cpp b/muse2/muse/widgets/function_dialogs/remove.cpp
index 69558fc3..c0b31ec4 100644
--- a/muse2/muse/widgets/function_dialogs/remove.cpp
+++ b/muse2/muse/widgets/function_dialogs/remove.cpp
@@ -24,7 +24,7 @@
 #include "remove.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Remove::Remove(QWidget* parent)
 	: QDialog(parent)
@@ -67,18 +67,18 @@ int Remove::exec()
 	return QDialog::exec();
 }
 
-void Remove::read_configuration(Xml& xml)
+void Remove::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "velo_threshold")
@@ -93,7 +93,7 @@ void Remove::read_configuration(Xml& xml)
 					xml.unknown("Erase");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "erase")
 					return;
 				
@@ -103,7 +103,7 @@ void Remove::read_configuration(Xml& xml)
 	}
 }
 
-void Remove::write_configuration(int level, Xml& xml)
+void Remove::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "erase");
 	xml.intTag(level, "range", range);
@@ -114,5 +114,5 @@ void Remove::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/erase");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
diff --git a/muse2/muse/widgets/function_dialogs/remove.h b/muse2/muse/widgets/function_dialogs/remove.h
index aba05909..a572be62 100644
--- a/muse2/muse/widgets/function_dialogs/remove.h
+++ b/muse2/muse/widgets/function_dialogs/remove.h
@@ -26,9 +26,12 @@
 #include "ui_removebase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Remove : public QDialog, public Ui::RemoveBase
 {
@@ -50,15 +53,15 @@ class Remove : public QDialog, public Ui::RemoveBase
 		int len_threshold;
 		bool len_thres_used;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/setlen.cpp b/muse2/muse/widgets/function_dialogs/setlen.cpp
index 81a589ae..4154f8e5 100644
--- a/muse2/muse/widgets/function_dialogs/setlen.cpp
+++ b/muse2/muse/widgets/function_dialogs/setlen.cpp
@@ -24,7 +24,7 @@
 #include "setlen.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Setlen::Setlen(QWidget* parent)
 	: QDialog(parent)
@@ -61,18 +61,18 @@ int Setlen::exec()
 	return QDialog::exec();
 }
 
-void Setlen::read_configuration(Xml& xml)
+void Setlen::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "len")
@@ -81,7 +81,7 @@ void Setlen::read_configuration(Xml& xml)
 					xml.unknown("SetLen");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "setlen")
 					return;
 				
@@ -91,7 +91,7 @@ void Setlen::read_configuration(Xml& xml)
 	}
 }
 
-void Setlen::write_configuration(int level, Xml& xml)
+void Setlen::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "setlen");
 	xml.intTag(level, "range", range);
@@ -99,4 +99,4 @@ void Setlen::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/setlen");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/setlen.h b/muse2/muse/widgets/function_dialogs/setlen.h
index fea6a5dd..dc577e6b 100644
--- a/muse2/muse/widgets/function_dialogs/setlen.h
+++ b/muse2/muse/widgets/function_dialogs/setlen.h
@@ -26,9 +26,12 @@
 #include "ui_setlenbase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Setlen : public QDialog, public Ui::SetlenBase
 {
@@ -47,15 +50,15 @@ class Setlen : public QDialog, public Ui::SetlenBase
 		int range;
 		int len;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/transpose.cpp b/muse2/muse/widgets/function_dialogs/transpose.cpp
index dd642050..c4088d99 100644
--- a/muse2/muse/widgets/function_dialogs/transpose.cpp
+++ b/muse2/muse/widgets/function_dialogs/transpose.cpp
@@ -24,7 +24,7 @@
 #include "transpose.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 Transpose::Transpose(QWidget* parent)
 	: QDialog(parent)
@@ -61,18 +61,18 @@ int Transpose::exec()
 	return QDialog::exec();
 }
 
-void Transpose::read_configuration(Xml& xml)
+void Transpose::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "amount")
@@ -81,7 +81,7 @@ void Transpose::read_configuration(Xml& xml)
 					xml.unknown("Transpose");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "transpose")
 					return;
 				
@@ -91,7 +91,7 @@ void Transpose::read_configuration(Xml& xml)
 	}
 }
 
-void Transpose::write_configuration(int level, Xml& xml)
+void Transpose::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "transpose");
 	xml.intTag(level, "range", range);
@@ -99,4 +99,4 @@ void Transpose::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/transpose");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/transpose.h b/muse2/muse/widgets/function_dialogs/transpose.h
index b6363ae5..5e0bd82f 100644
--- a/muse2/muse/widgets/function_dialogs/transpose.h
+++ b/muse2/muse/widgets/function_dialogs/transpose.h
@@ -26,9 +26,12 @@
 #include "ui_transposebase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 class Transpose : public QDialog, public Ui::TransposeBase
 {
@@ -45,15 +48,15 @@ class Transpose : public QDialog, public Ui::TransposeBase
 		int range;
 		int amount;
 		
-		void read_configuration(Xml& xml);
-		void write_configuration(int level, Xml& xml);
+		void read_configuration(MusECore::Xml& xml);
+		void write_configuration(int level, MusECore::Xml& xml);
 		
 		
 	public slots:
 		int exec();
 };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif
 
diff --git a/muse2/muse/widgets/function_dialogs/velocity.cpp b/muse2/muse/widgets/function_dialogs/velocity.cpp
index 81655b5f..2db17b6d 100644
--- a/muse2/muse/widgets/function_dialogs/velocity.cpp
+++ b/muse2/muse/widgets/function_dialogs/velocity.cpp
@@ -24,7 +24,7 @@
 #include "velocity.h"
 #include "xml.h"
 
-namespace MusEDialog {
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   Velocity
@@ -77,18 +77,18 @@ int Velocity::exec()
       return QDialog::exec();
       }
 
-void Velocity::read_configuration(Xml& xml)
+void Velocity::read_configuration(MusECore::Xml& xml)
 {
 	for (;;)
 	{
-		Xml::Token token = xml.parse();
-		if (token == Xml::Error || token == Xml::End)
+		MusECore::Xml::Token token = xml.parse();
+		if (token == MusECore::Xml::Error || token == MusECore::Xml::End)
 			break;
 			
 		const QString& tag = xml.s1();
 		switch (token)
 		{
-			case Xml::TagStart:
+			case MusECore::Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
 				else if (tag == "rate")
@@ -99,7 +99,7 @@ void Velocity::read_configuration(Xml& xml)
 					xml.unknown("ModVelo");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "mod_velo")
 					return;
 				
@@ -109,7 +109,7 @@ void Velocity::read_configuration(Xml& xml)
 	}
 }
 
-void Velocity::write_configuration(int level, Xml& xml)
+void Velocity::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "mod_velo");
 	xml.intTag(level, "range", range);
@@ -118,4 +118,4 @@ void Velocity::write_configuration(int level, Xml& xml)
 	xml.tag(level, "/mod_velo");
 }
 
-} // namespace MusEDialog
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/function_dialogs/velocity.h b/muse2/muse/widgets/function_dialogs/velocity.h
index 9ef6cd2a..e73b8207 100644
--- a/muse2/muse/widgets/function_dialogs/velocity.h
+++ b/muse2/muse/widgets/function_dialogs/velocity.h
@@ -26,9 +26,12 @@
 #include "ui_velocitybase.h"
 
 class QButtonGroup;
+
+namespace MusECore {
 class Xml;
+}
 
-namespace MusEDialog {
+namespace MusEGui {
 
 //---------------------------------------------------------
 //   Velocity
@@ -51,15 +54,15 @@ class Velocity : public QDialog, public Ui::VelocityBase {
       int rateVal;
       int offsetVal;
       
-      void read_configuration(Xml& xml);
-      void write_configuration(int level, Xml& xml);
+      void read_configuration(MusECore::Xml& xml);
+      void write_configuration(int level, MusECore::Xml& xml);
       
       
    public slots:
       int exec();
       };
 
-} // namespace MusEDialog
+} // namespace MusEGui
 
 #endif