merged with trunk and adapted new functions

4 files changed, 10 insertions, 4 deletions

diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 150e8236..b2919b23 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -114,13 +114,15 @@ class LMasterSigEventItem : public LMasterLViewItem {
 //---------------------------------------------------------
 
 class LMaster : public MidiEditor {
+      Q_OBJECT
+    
       QTreeWidget* view;
       QToolBar* tools;
       QMenu* menuEdit;
 
       enum { CMD_DELETE, CMD_INSERT_SIG, CMD_INSERT_TEMPO, CMD_EDIT_BEAT, CMD_EDIT_VALUE, CMD_INSERT_KEY };
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       void updateList();
       void insertTempo(const TEvent*);
diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h
index 52040aeb..2415b15e 100644
--- a/muse2/muse/master/master.h
+++ b/muse2/muse/master/master.h
@@ -26,6 +26,7 @@ class ScrollScale;
 //---------------------------------------------------------
 
 class Master : public View {
+      Q_OBJECT
       enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE,
             DRAG_DELETE, DRAG_COPY_START, DRAG_COPY,
             DRAG_RESIZE, DRAG_LASSO_START, DRAG_LASSO
@@ -37,7 +38,7 @@ class Master : public View {
       DragMode drag;
       MidiEditor* editor;
 
-      Q_OBJECT
+      
       virtual void pdraw(QPainter&, const QRect&);
       virtual void viewMouseMoveEvent(QMouseEvent* event);
       virtual void leaveEvent(QEvent*e);
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 59a5ab05..b2b06291 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -40,6 +40,8 @@ class TempoLabel;
 //---------------------------------------------------------
 
 class MasterEdit : public MidiEditor {
+      Q_OBJECT
+    
       Master* canvas;
       ScrollScale* hscroll;
       ScrollScale* vscroll;
@@ -62,7 +64,7 @@ class MasterEdit : public MidiEditor {
       static int _widthInit, _heightInit;
       static QByteArray _toolbarInit;
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void resizeEvent(QResizeEvent*);
       virtual void focusOutEvent(QFocusEvent*);
diff --git a/muse2/muse/master/tscale.h b/muse2/muse/master/tscale.h
index 35fa39f2..d7ce86c9 100644
--- a/muse2/muse/master/tscale.h
+++ b/muse2/muse/master/tscale.h
@@ -15,8 +15,9 @@
 //---------------------------------------------------------
 
 class TScale : public View {
-      double curTempo;
       Q_OBJECT
+        
+      double curTempo;
 
       virtual void viewMouseMoveEvent(QMouseEvent* event);
       virtual void leaveEvent(QEvent*e);