(hopefully) final huge namespace update.

1 files changed, 34 insertions, 30 deletions

diff --git a/muse2/muse/dialogs.cpp b/muse2/muse/dialogs.cpp
index b63d86d3..d88977ff 100644
--- a/muse2/muse/dialogs.cpp
+++ b/muse2/muse/dialogs.cpp
@@ -40,36 +40,38 @@
 
 using namespace std;
 
-MusEDialog::GateTime* gatetime_dialog=NULL;
-MusEDialog::Velocity* velocity_dialog=NULL;
-MusEDialog::Quantize* quantize_dialog=NULL;
-MusEDialog::Remove* erase_dialog=NULL;
-MusEDialog::DelOverlaps* del_overlaps_dialog=NULL;
-MusEDialog::Setlen* set_notelen_dialog=NULL;
-MusEDialog::Move* move_notes_dialog=NULL;
-MusEDialog::Transpose* transpose_dialog=NULL;
-MusEDialog::Crescendo* crescendo_dialog=NULL;
-MusEDialog::Legato* legato_dialog=NULL;
-MusEDialog::PasteDialog* paste_dialog=NULL;
-MusEDialog::PasteEventsDialog* paste_events_dialog=NULL;
+namespace MusEGui {
+
+GateTime* gatetime_dialog=NULL;
+Velocity* velocity_dialog=NULL;
+Quantize* quantize_dialog=NULL;
+Remove* erase_dialog=NULL;
+DelOverlaps* del_overlaps_dialog=NULL;
+Setlen* set_notelen_dialog=NULL;
+Move* move_notes_dialog=NULL;
+Transpose* transpose_dialog=NULL;
+Crescendo* crescendo_dialog=NULL;
+Legato* legato_dialog=NULL;
+PasteDialog* paste_dialog=NULL;
+PasteEventsDialog* paste_events_dialog=NULL;
 
 void init_function_dialogs(QWidget* parent)
 {
-	gatetime_dialog = new MusEDialog::GateTime(parent);
-	velocity_dialog = new MusEDialog::Velocity(parent);
-	quantize_dialog = new MusEDialog::Quantize(parent);
-	erase_dialog = new MusEDialog::Remove(parent);
-	del_overlaps_dialog = new MusEDialog::DelOverlaps(parent);
-	set_notelen_dialog = new MusEDialog::Setlen(parent);
-	move_notes_dialog = new MusEDialog::Move(parent);
-	transpose_dialog = new MusEDialog::Transpose(parent);
-	crescendo_dialog = new MusEDialog::Crescendo(parent);
-	legato_dialog = new MusEDialog::Legato(parent);
-	paste_dialog = new MusEDialog::PasteDialog(parent);
-	paste_events_dialog = new MusEDialog::PasteEventsDialog(parent);
+	gatetime_dialog = new GateTime(parent);
+	velocity_dialog = new Velocity(parent);
+	quantize_dialog = new Quantize(parent);
+	erase_dialog = new Remove(parent);
+	del_overlaps_dialog = new DelOverlaps(parent);
+	set_notelen_dialog = new Setlen(parent);
+	move_notes_dialog = new Move(parent);
+	transpose_dialog = new Transpose(parent);
+	crescendo_dialog = new Crescendo(parent);
+	legato_dialog = new Legato(parent);
+	paste_dialog = new PasteDialog(parent);
+	paste_events_dialog = new PasteEventsDialog(parent);
 }
 
-void read_function_dialog_config(Xml& xml)
+void read_function_dialog_config(MusECore::Xml& xml)
 {
 	if (erase_dialog==NULL)
 	{
@@ -80,14 +82,14 @@ void read_function_dialog_config(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 == "mod_len")
 					gatetime_dialog->read_configuration(xml);
 				else if (tag == "mod_velo")
@@ -116,7 +118,7 @@ void read_function_dialog_config(Xml& xml)
 					xml.unknown("dialogs");
 				break;
 				
-			case Xml::TagEnd:
+			case MusECore::Xml::TagEnd:
 				if (tag == "dialogs")
 					return;
 				
@@ -126,7 +128,7 @@ void read_function_dialog_config(Xml& xml)
 	}
 }
 
-void write_function_dialog_config(int level, Xml& xml)
+void write_function_dialog_config(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "dialogs");
 
@@ -145,3 +147,5 @@ void write_function_dialog_config(int level, Xml& xml)
 
 	xml.tag(level, "/dialogs");
 }
+
+}