some cleanups

8 files changed, 25 insertions, 11 deletions

diff --git a/muse2/muse/dialogs.cpp b/muse2/muse/dialogs.cpp
index 18db2352..b63d86d3 100644
--- a/muse2/muse/dialogs.cpp
+++ b/muse2/muse/dialogs.cpp
@@ -50,8 +50,8 @@ MusEDialog::Move* move_notes_dialog=NULL;
 MusEDialog::Transpose* transpose_dialog=NULL;
 MusEDialog::Crescendo* crescendo_dialog=NULL;
 MusEDialog::Legato* legato_dialog=NULL;
-PasteDialog* paste_dialog=NULL; // FINDMICHJETZT
-PasteEventsDialog* paste_events_dialog=NULL; // FINDMICHJETZT
+MusEDialog::PasteDialog* paste_dialog=NULL;
+MusEDialog::PasteEventsDialog* paste_events_dialog=NULL;
 
 void init_function_dialogs(QWidget* parent)
 {
@@ -65,8 +65,8 @@ void init_function_dialogs(QWidget* parent)
 	transpose_dialog = new MusEDialog::Transpose(parent);
 	crescendo_dialog = new MusEDialog::Crescendo(parent);
 	legato_dialog = new MusEDialog::Legato(parent);
-	paste_dialog = new PasteDialog(parent); // FINDMICHJETZT
-	paste_events_dialog = new PasteEventsDialog(parent); // FINDMICHJETZT
+	paste_dialog = new MusEDialog::PasteDialog(parent);
+	paste_events_dialog = new MusEDialog::PasteEventsDialog(parent);
 }
 
 void read_function_dialog_config(Xml& xml)
diff --git a/muse2/muse/dialogs.h b/muse2/muse/dialogs.h
index 3f966efd..0cb5107a 100644
--- a/muse2/muse/dialogs.h
+++ b/muse2/muse/dialogs.h
@@ -36,9 +36,9 @@ namespace MusEDialog
 	class Transpose;
 	class Crescendo;
 	class Legato;
+	class PasteDialog;
+	class PasteEventsDialog;
 }
-class PasteDialog; //FINDMICHJETZT put into namespace
-class PasteEventsDialog; //FINDMICHJETZT put into namespace
 
 class Xml;
 
@@ -52,8 +52,8 @@ extern MusEDialog::Move* move_notes_dialog;
 extern MusEDialog::Transpose* transpose_dialog;
 extern MusEDialog::Crescendo* crescendo_dialog;
 extern MusEDialog::Legato* legato_dialog;
-extern PasteDialog* paste_dialog; //FINDMICHJETZT
-extern PasteEventsDialog* paste_events_dialog; //FINDMICHJETZT
+extern MusEDialog::PasteDialog* paste_dialog;
+extern MusEDialog::PasteEventsDialog* paste_events_dialog;
 
 void init_function_dialogs(QWidget* parent);
 void read_function_dialog_config(Xml& xml);
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 7f36c7cd..cb96118f 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -400,7 +400,7 @@ void EventCanvas::viewDropEvent(QDropEvent* event)
             int x = editor->rasterVal(event->pos().x());
             if (x < 0)
                   x = 0;
-            paste_at(text,x); //(curPart, text, x); TODO FINDMICHJETZT
+            paste_at(text,x,3072,false,false,curPart);
             //event->accept();  // TODO
             }
       else {
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index a16a872e..6e04e51e 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4539,8 +4539,6 @@ void ScoreCanvas::add_new_parts(const std::map< Part*, std::set<Part*> >& param)
  *     from clipboard failed. ignoring this one... ) [ not reproducible ]
  * 
  * CURRENT TODO
- * M o ecanvas: FINDMICH
- * M o dialog.cpp: FINDMICH
  * M o TEST pasting in editors!
  * 
  *   o ticks-to-quarter spinboxes
diff --git a/muse2/muse/widgets/pastedialog.cpp b/muse2/muse/widgets/pastedialog.cpp
index a053bd79..7c9c2248 100644
--- a/muse2/muse/widgets/pastedialog.cpp
+++ b/muse2/muse/widgets/pastedialog.cpp
@@ -27,6 +27,8 @@
 
 using MusEConfig::config;
 
+namespace MusEDialog {
+
 PasteDialog::PasteDialog(QWidget* parent)
 	: QDialog(parent)
 {
@@ -147,3 +149,5 @@ void PasteDialog::write_configuration(int level, Xml& xml)
 	xml.intTag(level, "all_in_one_track", all_in_one_track);
 	xml.tag(level, "/pastedialog");
 }
+
+} // namespace MusEDialog
diff --git a/muse2/muse/widgets/pastedialog.h b/muse2/muse/widgets/pastedialog.h
index 208ffb35..39121964 100644
--- a/muse2/muse/widgets/pastedialog.h
+++ b/muse2/muse/widgets/pastedialog.h
@@ -28,6 +28,8 @@
 
 class Xml;
 
+namespace MusEDialog {
+
 class PasteDialog : public QDialog, public Ui::PasteDialogBase
 {
  	Q_OBJECT
@@ -59,5 +61,7 @@ class PasteDialog : public QDialog, public Ui::PasteDialogBase
 		int exec();
 };
 
+} // namespace MusEDialog
+
 #endif
 
diff --git a/muse2/muse/widgets/pasteeventsdialog.cpp b/muse2/muse/widgets/pasteeventsdialog.cpp
index be53ef13..04b7cbd7 100644
--- a/muse2/muse/widgets/pasteeventsdialog.cpp
+++ b/muse2/muse/widgets/pasteeventsdialog.cpp
@@ -27,6 +27,8 @@
 
 using MusEConfig::config;
 
+namespace MusEDialog {
+
 PasteEventsDialog::PasteEventsDialog(QWidget* parent)
 	: QDialog(parent)
 {
@@ -169,3 +171,5 @@ void PasteEventsDialog::write_configuration(int level, Xml& xml)
 	xml.intTag(level, "into_single_part", into_single_part);
 	xml.tag(level, "/pasteeventsdialog");
 }
+
+} // namespace MusEDialog
diff --git a/muse2/muse/widgets/pasteeventsdialog.h b/muse2/muse/widgets/pasteeventsdialog.h
index 88971a84..59e6f52b 100644
--- a/muse2/muse/widgets/pasteeventsdialog.h
+++ b/muse2/muse/widgets/pasteeventsdialog.h
@@ -28,6 +28,8 @@
 
 class Xml;
 
+namespace MusEDialog {
+
 class PasteEventsDialog : public QDialog, public Ui::PasteEventsDialogBase
 {
  	Q_OBJECT
@@ -61,5 +63,7 @@ class PasteEventsDialog : public QDialog, public Ui::PasteEventsDialogBase
 		int exec();
 };
 
+} // namespace MusEDialog
+
 #endif