merged namespace changes. HOPEFULLY the last one.

1 files changed, 7 insertions, 8 deletions

diff --git a/muse2/muse/helper.h b/muse2/muse/helper.h
index b8ff391e..f014ee1e 100644
--- a/muse2/muse/helper.h
+++ b/muse2/muse/helper.h
@@ -32,21 +32,20 @@ class QString;
 class QMenu;
 class QWidget;
 
-class Part;
-
-namespace MusEUtil {
 
+namespace MusECore {
+class Part;
 QString pitch2string(int v);
-
 Part* partFromSerialNumber(int serial);
-
 bool any_event_selected(const std::set<Part*>&, bool in_range=false);
 
+bool drummaps_almost_equal(DrumMap* one, DrumMap* two, int drummap_size=128);
+}
+
+namespace MusEGui {
 QMenu* populateAddSynth(QWidget* parent);
 QActionGroup* populateAddTrack(QMenu* addTrack);
+} 
 
-bool drummaps_almost_equal(DrumMap* one, DrumMap* two, int drummap_size=128);
-
-}
 #endif