From 845d28b2fba8f2c1d4211aee7beb5ab041315531 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Tue, 3 Jan 2012 17:25:00 +0000
Subject: cleanup

---
 muse2/muse/instruments/editinstrument.cpp |  1 -
 muse2/muse/midiedit/dlist.h               | 20 ++++++++++++++++++++
 muse2/muse/midiedit/drumedit.h            | 20 +-------------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/muse2/muse/instruments/editinstrument.cpp b/muse2/muse/instruments/editinstrument.cpp
index 8a8b4be0..ac3ec68f 100644
--- a/muse2/muse/instruments/editinstrument.cpp
+++ b/muse2/muse/instruments/editinstrument.cpp
@@ -48,7 +48,6 @@
 #include "dlist.h"
 #include "drummap.h"
 #include "header.h"
-#include "drumedit.h" // FINDMICHJETZT only needed for COL_FOO. fix that!
 
 namespace MusEGui {
 
diff --git a/muse2/muse/midiedit/dlist.h b/muse2/muse/midiedit/dlist.h
index cfa10c96..d864f23e 100644
--- a/muse2/muse/midiedit/dlist.h
+++ b/muse2/muse/midiedit/dlist.h
@@ -47,6 +47,26 @@ namespace MusEGui {
 class ScrollScale;
 class DrumCanvas;
 
+
+enum DrumColumn {
+  COL_HIDE = 0,
+  COL_MUTE,
+  COL_NAME,
+  COL_VOLUME,
+  COL_QUANT,
+  COL_INPUTTRIGGER,
+  COL_NOTELENGTH,
+  COL_NOTE,
+  COL_OUTCHANNEL,
+  COL_OUTPORT,
+  COL_LEVEL1,
+  COL_LEVEL2,
+  COL_LEVEL3,
+  COL_LEVEL4,
+  COL_NONE = -1
+};
+
+
 //---------------------------------------------------------
 //   DLineEdit
 //---------------------------------------------------------
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 5bdd54a8..f4e2646b 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -33,7 +33,7 @@
 #include "header.h"
 #include "shortcuts.h"
 #include "event.h"
-#include "dcanvas.h" //FINDMICH UGLY. remove!
+#include "dcanvas.h"
 
 class QCloseEvent;
 class QLabel;
@@ -65,24 +65,6 @@ class ScrollScale;
 class Splitter;
 class Toolbar1;
 
-enum DrumColumn {
-  COL_HIDE = 0,
-  COL_MUTE,
-  COL_NAME,
-  COL_VOLUME,
-  COL_QUANT,
-  COL_INPUTTRIGGER,
-  COL_NOTELENGTH,
-  COL_NOTE,
-  COL_OUTCHANNEL,
-  COL_OUTPORT,
-  COL_LEVEL1,
-  COL_LEVEL2,
-  COL_LEVEL3,
-  COL_LEVEL4,
-  COL_NONE = -1
-};
-
 //---------------------------------------------------------
 //   DrumEdit
 //---------------------------------------------------------
-- 
cgit v1.2.3