applied WillyFoobar's patch: moved all Q_OBJECT statements to

their appropriate place

3 files changed, 8 insertions, 3 deletions

diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index 300cac19..e6864003 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -81,6 +81,8 @@ class CEventList: public std::list<CEvent*> {
 //---------------------------------------------------------
 
 class CtrlCanvas : public View {
+      Q_OBJECT
+    
       MidiEditor* editor;
       MidiTrack* curTrack;
       MidiPart* curPart;
@@ -120,7 +122,7 @@ class CtrlCanvas : public View {
       void pdrawItems(QPainter&, const QRect&, const MidiPart*, bool, bool);
       void partControllers(const MidiPart*, int, int*, int*, MidiController**, MidiCtrlValList**);
       
-      Q_OBJECT
+      
 
    protected:
       enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE,
diff --git a/muse2/muse/ctrl/ctrledit.h b/muse2/muse/ctrl/ctrledit.h
index eec235b1..c5f5935e 100644
--- a/muse2/muse/ctrl/ctrledit.h
+++ b/muse2/muse/ctrl/ctrledit.h
@@ -24,10 +24,11 @@ class Xml;
 //---------------------------------------------------------
 
 class CtrlEdit : public QWidget {
+      Q_OBJECT
       CtrlCanvas* canvas;
       CtrlPanel* panel;
 
-      Q_OBJECT
+      
 
    private slots:
       void destroy();
diff --git a/muse2/muse/ctrl/ctrlpanel.h b/muse2/muse/ctrl/ctrlpanel.h
index 92911b8e..3f6de205 100644
--- a/muse2/muse/ctrl/ctrlpanel.h
+++ b/muse2/muse/ctrl/ctrlpanel.h
@@ -25,6 +25,8 @@ class MidiTrack;
 //---------------------------------------------------------
 
 class CtrlPanel: public QWidget {
+      Q_OBJECT
+    
       //QMenu* pop;
       QPushButton* selCtrl;
       MidiEditor* editor;
@@ -37,7 +39,7 @@ class CtrlPanel: public QWidget {
       DoubleLabel* _dl;
       int _val;
       
-      Q_OBJECT
+      
 
    signals:
       void destroyPanel();