applied WillyFoobar's patch: moved all Q_OBJECT statements to

their appropriate place

59 files changed, 149 insertions, 70 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 1af47f28..98c03156 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -4,6 +4,8 @@
           only single notes (flo93)
         - the functions now return as boolean, if they have triggered
           undo (flo93)
+        - applied another patch from WillyFoobar: moved Q_OBJECT
+          to the top of each class definition, where it belongs (flo93)
 30.05.2011:
         - implemented cut,copy'n'paste and the "select foo" entries in the score editor (flo93)
         - added select_foo() functions to functions.cpp (flo93)
diff --git a/muse2/awl/midimeter.h b/muse2/awl/midimeter.h
index 2b0d3518..929e648c 100644
--- a/muse2/awl/midimeter.h
+++ b/muse2/awl/midimeter.h
@@ -31,8 +31,9 @@ namespace Awl {
 
 class MidiMeter : public Slider
       {
-      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_OBJECT
+      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+      
 
       double meterval;
       int _meterWidth;
diff --git a/muse2/awl/midimslider.h b/muse2/awl/midimslider.h
index a2a2bdaf..a363348a 100644
--- a/muse2/awl/midimslider.h
+++ b/muse2/awl/midimslider.h
@@ -31,8 +31,9 @@ namespace Awl {
 
 class MidiMeterSlider : public Slider
       {
-      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_OBJECT
+      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+      
 
       double meterval;
       int _meterWidth;
diff --git a/muse2/awl/mslider.h b/muse2/awl/mslider.h
index 4ae888b1..15dd8a7e 100644
--- a/muse2/awl/mslider.h
+++ b/muse2/awl/mslider.h
@@ -32,9 +32,10 @@ namespace Awl {
 
 class MeterSlider : public VolSlider
       {
+      Q_OBJECT
       Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_PROPERTY(int channel READ channel WRITE setChannel)
-      Q_OBJECT
+      
 
       int _channel;
       std::vector<double> meterval;
diff --git a/muse2/awl/pitchlabel.h b/muse2/awl/pitchlabel.h
index e5c34dba..a09d1ced 100644
--- a/muse2/awl/pitchlabel.h
+++ b/muse2/awl/pitchlabel.h
@@ -30,9 +30,11 @@ namespace Awl {
 //---------------------------------------------------------
 
 class PitchLabel : public QLabel {
+      Q_OBJECT
+    
       bool _pitchMode;
       int _value;
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/awl/tempolabel.h b/muse2/awl/tempolabel.h
index df9abfcd..b7df6b56 100644
--- a/muse2/awl/tempolabel.h
+++ b/muse2/awl/tempolabel.h
@@ -30,9 +30,10 @@ namespace Awl {
 //---------------------------------------------------------
 
 class TempoLabel : public QLabel {
+      Q_OBJECT
       double _value;
 
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse/appearance.h b/muse2/muse/appearance.h
index ef99adbe..ec266f8e 100644
--- a/muse2/muse/appearance.h
+++ b/muse2/muse/appearance.h
@@ -15,6 +15,10 @@ class GlobalConfigValues;
 //---------------------------------------------------------
 
 class Appearance : public QDialog, public Ui::AppearanceDialogBase {
+  
+    Q_OBJECT
+    
+ private:
       Arranger* arr;
       QColor* color;
       GlobalConfigValues* config;
@@ -24,7 +28,7 @@ class Appearance : public QDialog, public Ui::AppearanceDialogBase {
       QTreeWidgetItem* lastSelectedBgItem;
       QTreeWidgetItem* lastSelectedColorItem;
 
-      Q_OBJECT
+      
       void updateFonts();
       void updateColor();
 
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index a3dd7900..3145d034 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -57,6 +57,7 @@ class CtrlVal;
 //---------------------------------------------------------
 
 class PartCanvas : public Canvas {
+      Q_OBJECT
       int* _raster;
       TrackList* tracks;
 
@@ -69,7 +70,7 @@ class PartCanvas : public Canvas {
       AutomationObject automation;
 
       //std::vector<TrackAutomationView*> automationViews;
-      Q_OBJECT
+      
       virtual void keyPress(QKeyEvent*);
       virtual void mousePress(QMouseEvent*);
       virtual void mouseMove(QMouseEvent* event);
diff --git a/muse2/muse/confmport.h b/muse2/muse/confmport.h
index 3c139ee2..6901035a 100644
--- a/muse2/muse/confmport.h
+++ b/muse2/muse/confmport.h
@@ -28,6 +28,7 @@ class Xml;
 //---------------------------------------------------------
 
 class MPConfig : public QDialog, Ui::SynthConfigBase {
+      Q_OBJECT
       QMenu* instrPopup;
       //QMenu* popup;
       PopupMenu* defpup;
@@ -36,7 +37,7 @@ class MPConfig : public QDialog, Ui::SynthConfigBase {
       void setToolTip(QTableWidgetItem *item, int col);
       void addItem(int row, int col, QTableWidgetItem *item, QTableWidget *table);
 
-      Q_OBJECT
+      
 
    private slots:
       void rbClicked(QTableWidgetItem*);
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();
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 5cf60a59..397a5e08 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -32,6 +32,8 @@ class Xml;
 //---------------------------------------------------------
 
 class ListEdit : public MidiEditor {
+      Q_OBJECT
+    
       QTreeWidget* liste;
       QMenu* menuEdit;
       QActionGroup* insertItems;
@@ -43,7 +45,7 @@ class ListEdit : public MidiEditor {
 
       enum { CMD_DELETE };
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       void initShortcuts();
diff --git a/muse2/muse/marker/markerview.h b/muse2/muse/marker/markerview.h
index a271873c..5ad4f4bd 100644
--- a/muse2/muse/marker/markerview.h
+++ b/muse2/muse/marker/markerview.h
@@ -49,6 +49,8 @@ class MarkerItem : public QTreeWidgetItem {
 //---------------------------------------------------------
 
 class MarkerView : public TopWin {
+      Q_OBJECT
+    
       QTreeWidget* table;
       QLineEdit* editName;
       ///PosEdit* editSMPTE;
@@ -58,7 +60,7 @@ class MarkerView : public TopWin {
       QToolButton* lock;
       QToolBar* tools;
       
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
 
    private slots:
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/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h
index 364d9268..fa087343 100644
--- a/muse2/muse/midiedit/dcanvas.h
+++ b/muse2/muse/midiedit/dcanvas.h
@@ -41,6 +41,7 @@ class PianoRoll;
 //---------------------------------------------------------
 
 class DrumCanvas : public EventCanvas {
+      Q_OBJECT
       
       StepRec* steprec;
       
@@ -48,7 +49,7 @@ class DrumCanvas : public EventCanvas {
       QPoint cursorPos;
       int _stepSize;
 
-      Q_OBJECT
+      
       virtual void drawCanvas(QPainter&, const QRect&);
       virtual void drawItem(QPainter&, const CItem*, const QRect&);
       void drawTopItem(QPainter& p, const QRect& rect);
diff --git a/muse2/muse/midiedit/dlist.h b/muse2/muse/midiedit/dlist.h
index 03437e64..00f21c55 100644
--- a/muse2/muse/midiedit/dlist.h
+++ b/muse2/muse/midiedit/dlist.h
@@ -70,6 +70,8 @@ class DPitchEdit: public Awl::PitchEdit
 //---------------------------------------------------------
 
 class DList : public View {
+      Q_OBJECT
+    
       QHeaderView* header;
       ScrollScale* scroll;
       QLineEdit* editor;
@@ -92,7 +94,7 @@ class DList : public View {
 
       int x2col(int x) const;
       void devicesPopupMenu(DrumMap* t, int x, int y, bool changeAll);
-      Q_OBJECT
+      
       //void setCurDrumInstrument(int n);
 
    private slots:
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 30fe8487..64390cd9 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -49,6 +49,8 @@ class SNode;
 //---------------------------------------------------------
 
 class DrumEdit : public MidiEditor {
+      Q_OBJECT
+    
       Event selEvent;
       MidiPart* selPart;
       int selTick;
@@ -79,7 +81,7 @@ class DrumEdit : public MidiEditor {
       QAction *sallAction, *snoneAction, *invAction, *inAction , *outAction;
       QAction *prevAction, *nextAction;
 
-      Q_OBJECT
+      
       void initShortcuts();
 
       virtual void closeEvent(QCloseEvent*);
diff --git a/muse2/muse/midiedit/piano.h b/muse2/muse/midiedit/piano.h
index 35106d64..f8deec52 100644
--- a/muse2/muse/midiedit/piano.h
+++ b/muse2/muse/midiedit/piano.h
@@ -23,6 +23,8 @@ class QPixmap;
 
 class Piano : public View
       {
+      Q_OBJECT
+    
       int curPitch;
       QPixmap* octave;
       QPixmap* c_keys[10];
@@ -34,7 +36,7 @@ class Piano : public View
       bool shift;
       int button;
 
-      Q_OBJECT
+      
       int y2pitch(int) const;
       int pitch2y(int) const;
       void viewMouseMoveEvent(QMouseEvent* event);
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index 58c2487a..1f53254d 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -51,6 +51,8 @@ class QScrollArea;
 //---------------------------------------------------------
 
 class PianoRoll : public MidiEditor {
+      Q_OBJECT
+    
       Event selEvent;
       MidiPart* selPart;
       int selTick;
@@ -125,7 +127,7 @@ class PianoRoll : public MidiEditor {
       //QScrollBar* infoScroll;
       QScrollArea* infoScroll;
 
-      Q_OBJECT
+      
       void initShortcuts();
       void setEventColorMode(int);
       QWidget* genToolbar(QWidget* parent);
diff --git a/muse2/muse/midiedit/prcanvas.h b/muse2/muse/midiedit/prcanvas.h
index 96b5b4f5..663b933a 100644
--- a/muse2/muse/midiedit/prcanvas.h
+++ b/muse2/muse/midiedit/prcanvas.h
@@ -40,6 +40,8 @@ class QRect;
 //---------------------------------------------------------
 
 class PianoCanvas : public EventCanvas {
+      Q_OBJECT
+    
       int colorMode;
       int playedPitch;
       
@@ -47,7 +49,7 @@ class PianoCanvas : public EventCanvas {
       
       StepRec* steprec;
 
-      Q_OBJECT
+      
       virtual void viewMouseDoubleClickEvent(QMouseEvent*);
       virtual void drawItem(QPainter&, const CItem*, const QRect&);
       void drawTopItem(QPainter &p, const QRect &rect);
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 0660ebc5..d4915304 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4455,18 +4455,10 @@ void staff_t::update_part_indices()
 
 /* BUGS and potential bugs
  *   o when the keymap is not used, this will probably lead to a bug
- *     same when mastertrack is disabled
  *   o tied notes don't work properly when there's a key-change in
  *     between, for example, when a cis is tied to a des
  * 
  * CURRENT TODO
- *   o batch-movements: they may be destructive: if you move a chord
- *                      upwards, so that some notes get clipped,
- *                      they'll appear "damaged" in undo/redo
- *                      maybe DO apply stuff with undo/redo, but count
- *                      n_steps, and undo all steps before really
- *                      applying the operation then.
- *   o allow batch-movements in score editor
  *   o either remove these "hidden notes", or deal with them in the score editor
  *   o investigate with valgrind
  *   o controller view in score editor
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index f8e365c3..ca8a3f4c 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -62,6 +62,8 @@ class ScrollArea : public QScrollArea
 //---------------------------------------------------------
 
 class AudioMixerApp : public QMainWindow {
+      Q_OBJECT
+    
       //QString name;
       MixerConfig* cfg;
       StripList stripList;
@@ -84,7 +86,7 @@ class AudioMixerApp : public QMainWindow {
       QAction* showAuxTracksId;
       QAction* showSyntiTracksId;
 
-      Q_OBJECT
+      
 
       virtual void closeEvent(QCloseEvent*);
       void addStrip(Track*, int);
diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h
index 33c846bd..2b1bbb66 100644
--- a/muse2/muse/mixer/rack.h
+++ b/muse2/muse/mixer/rack.h
@@ -24,8 +24,11 @@ class Xml;
 //---------------------------------------------------------
 
 class EffectRack : public QListWidget {
-      AudioTrack* track;
       Q_OBJECT
+    
+    
+      AudioTrack* track;
+      
 
       virtual QSize minimumSizeHint() const;
       virtual QSize sizeHint() const;
diff --git a/muse2/muse/transport.h b/muse2/muse/transport.h
index b2d3facf..ce8dcf1b 100644
--- a/muse2/muse/transport.h
+++ b/muse2/muse/transport.h
@@ -34,10 +34,12 @@ class Pos;
 //---------------------------------------------------------
 
 class TempoSig : public QWidget {
+    Q_OBJECT
+    
       DoubleLabel* l1;
       SigLabel* l2;
       QLabel* l3;
-      Q_OBJECT
+      
 
    private slots:
       void configChanged();
@@ -76,6 +78,8 @@ class TimeLLabel;
 
 class Transport : public QWidget
       {
+      Q_OBJECT
+    
       PosEdit* tl1;           // left mark
       PosEdit* tl2;           // right mark
       PosEdit* time1;         // tick time
@@ -99,9 +103,7 @@ class Transport : public QWidget
 
       Handle *lefthandle, *righthandle;
 
-      Q_OBJECT
-
-   private slots:
+ private slots:
       void cposChanged(const Pos&);
       void cposChanged(int);
       void lposChanged(const Pos&);
diff --git a/muse2/muse/value.h b/muse2/muse/value.h
index 22aa9b5a..e5c74b20 100644
--- a/muse2/muse/value.h
+++ b/muse2/muse/value.h
@@ -18,9 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class IValue : public QObject {
-      int val;
-
       Q_OBJECT
+    
+      int val;
 
    signals:
       void valueChanged(int);
@@ -39,9 +39,11 @@ class IValue : public QObject {
 //---------------------------------------------------------
 
 class BValue : public QObject {
+      Q_OBJECT
+    
       bool val;
 
-      Q_OBJECT
+      
 
    signals:
       void valueChanged(bool);
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index e966a635..1ff8a65b 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -33,6 +33,8 @@ class QAction;
 //---------------------------------------------------------
 
 class WaveEdit : public MidiEditor {
+      Q_OBJECT
+    
       WaveView* view;
       QSlider* ymag;
       QToolBar* tools;
@@ -49,7 +51,7 @@ class WaveEdit : public MidiEditor {
       static int _widthInit, _heightInit;
       static QByteArray _toolbarInit;
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       virtual void resizeEvent(QResizeEvent* ev);
diff --git a/muse2/muse/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h
index c7992952..1a646af9 100644
--- a/muse2/muse/waveedit/waveview.h
+++ b/muse2/muse/waveedit/waveview.h
@@ -34,6 +34,8 @@ typedef std::list<WaveEventSelection>::iterator iWaveSelection;
 //---------------------------------------------------------
 
 class WaveView : public View {
+      Q_OBJECT
+    
       MidiEditor* editor;
       unsigned pos[3];
       int yScale;
@@ -50,7 +52,6 @@ class WaveView : public View {
 
       unsigned selectionStart, selectionStop, dragstartx;
 
-      Q_OBJECT
       virtual void pdraw(QPainter&, const QRect&);
       virtual void draw(QPainter&, const QRect&);
       virtual void viewMousePressEvent(QMouseEvent*);
diff --git a/muse2/muse/widgets/bigtime.h b/muse2/muse/widgets/bigtime.h
index bb32cedc..eff0ef92 100644
--- a/muse2/muse/widgets/bigtime.h
+++ b/muse2/muse/widgets/bigtime.h
@@ -13,9 +13,11 @@ class MusE;
 //---------------------------------------------------------
 
 class BigTime : public QWidget {
+      Q_OBJECT
+    
       bool tickmode;
       MusE* seq;
-      Q_OBJECT
+      
 
       bool setString(unsigned);
 
diff --git a/muse2/muse/widgets/comment.h b/muse2/muse/widgets/comment.h
index 688d7b2f..0dbd953b 100644
--- a/muse2/muse/widgets/comment.h
+++ b/muse2/muse/widgets/comment.h
@@ -36,8 +36,10 @@ class Comment : public QWidget, public Ui::CommentBase {
 //---------------------------------------------------------
 
 class TrackComment : public Comment {
-      Track* track;
       Q_OBJECT
+    
+      Track* track;
+      
 
    private:
       virtual void setText(const QString& s);
diff --git a/muse2/muse/widgets/function_dialogs/crescendo.h b/muse2/muse/widgets/function_dialogs/crescendo.h
index eb00e94f..73a7e088 100644
--- a/muse2/muse/widgets/function_dialogs/crescendo.h
+++ b/muse2/muse/widgets/function_dialogs/crescendo.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Crescendo : public QDialog, public Ui::CrescendoBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.h b/muse2/muse/widgets/function_dialogs/deloverlaps.h
index 813192a6..d151d5a5 100644
--- a/muse2/muse/widgets/function_dialogs/deloverlaps.h
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.h
@@ -15,8 +15,9 @@ class Xml;
 
 class DelOverlaps : public QDialog, public Ui::DelOverlapsBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h
index f8f35ffd..baa5a97b 100644
--- a/muse2/muse/widgets/function_dialogs/gatetime.h
+++ b/muse2/muse/widgets/function_dialogs/gatetime.h
@@ -18,8 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class GateTime : public QDialog, public Ui::GateTimeBase {
+ 	Q_OBJECT
    private:
-      Q_OBJECT
+      
       QButtonGroup *rangeGroup;
 
    protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/legato.h b/muse2/muse/widgets/function_dialogs/legato.h
index 80b371ca..00831830 100644
--- a/muse2/muse/widgets/function_dialogs/legato.h
+++ b/muse2/muse/widgets/function_dialogs/legato.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Legato : public QDialog, public Ui::LegatoBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/move.h b/muse2/muse/widgets/function_dialogs/move.h
index 4c90a922..5049c567 100644
--- a/muse2/muse/widgets/function_dialogs/move.h
+++ b/muse2/muse/widgets/function_dialogs/move.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Move : public QDialog, public Ui::MoveBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h
index 399e2545..a857e667 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.h
+++ b/muse2/muse/widgets/function_dialogs/quantize.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Quantize : public QDialog, public Ui::QuantBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/remove.h b/muse2/muse/widgets/function_dialogs/remove.h
index 4c1a91e9..33ac3fd0 100644
--- a/muse2/muse/widgets/function_dialogs/remove.h
+++ b/muse2/muse/widgets/function_dialogs/remove.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Remove : public QDialog, public Ui::RemoveBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/setlen.h b/muse2/muse/widgets/function_dialogs/setlen.h
index ad66a38b..6a052bdb 100644
--- a/muse2/muse/widgets/function_dialogs/setlen.h
+++ b/muse2/muse/widgets/function_dialogs/setlen.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Setlen : public QDialog, public Ui::SetlenBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/transpose.h b/muse2/muse/widgets/function_dialogs/transpose.h
index 97dd443e..b85bb827 100644
--- a/muse2/muse/widgets/function_dialogs/transpose.h
+++ b/muse2/muse/widgets/function_dialogs/transpose.h
@@ -15,7 +15,6 @@ class Xml;
 
 class Transpose : public QDialog, public Ui::TransposeBase
 {
-	private:
 		Q_OBJECT
 		QButtonGroup* range_group;
 		
diff --git a/muse2/muse/widgets/function_dialogs/velocity.h b/muse2/muse/widgets/function_dialogs/velocity.h
index cbea4e22..83aac54d 100644
--- a/muse2/muse/widgets/function_dialogs/velocity.h
+++ b/muse2/muse/widgets/function_dialogs/velocity.h
@@ -18,8 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class Velocity : public QDialog, public Ui::VelocityBase {
-   private:
       Q_OBJECT
+   private:
+      
       QButtonGroup* rangeGroup;
 
    protected slots:
diff --git a/muse2/muse/widgets/lcombo.h b/muse2/muse/widgets/lcombo.h
index b125fce5..760d4512 100644
--- a/muse2/muse/widgets/lcombo.h
+++ b/muse2/muse/widgets/lcombo.h
@@ -20,8 +20,9 @@ class QString;
 //---------------------------------------------------------
 
 class LabelCombo : public QWidget {
-      QComboBox* box;
       Q_OBJECT
+      QComboBox* box;
+      
 
    signals:
       void activated(int);
diff --git a/muse2/muse/widgets/menutitleitem.h b/muse2/muse/widgets/menutitleitem.h
index 0c345ffe..20583bd1 100644
--- a/muse2/muse/widgets/menutitleitem.h
+++ b/muse2/muse/widgets/menutitleitem.h
@@ -15,8 +15,9 @@
 //---------------------------------------------------------
 
 class MenuTitleItem : public QWidgetAction { 
-   private:
       Q_OBJECT
+   private:
+      
         
       QString s;
 
diff --git a/muse2/muse/widgets/meter.h b/muse2/muse/widgets/meter.h
index 2b816040..cced6e7a 100644
--- a/muse2/muse/widgets/meter.h
+++ b/muse2/muse/widgets/meter.h
@@ -17,6 +17,7 @@ class QPainter;
 
 
 class Meter : public QFrame {
+    Q_OBJECT
    public:
       enum MeterType {DBMeter, LinMeter};
    private:
@@ -29,7 +30,7 @@ class Meter : public QFrame {
 
       void drawVU(QPainter& p, int, int, int);
 
-      Q_OBJECT
+      
       void paintEvent(QPaintEvent*);
       void resizeEvent(QResizeEvent*);
       void mousePressEvent(QMouseEvent*);
diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h
index cc8fe16d..64842988 100644
--- a/muse2/muse/widgets/noteinfo.h
+++ b/muse2/muse/widgets/noteinfo.h
@@ -25,6 +25,8 @@ class Pos;
 //---------------------------------------------------------
 
 class NoteInfo : public QToolBar {
+      Q_OBJECT
+    
       ///PosEdit* selTime;
       Awl::PosEdit* selTime;
       QSpinBox* selLen;
@@ -33,7 +35,7 @@ class NoteInfo : public QToolBar {
       QSpinBox* selVelOff;
       bool deltaMode;
 
-      Q_OBJECT
+      
 
    public:
       enum ValType {VAL_TIME, VAL_LEN, VAL_VELON, VAL_VELOFF, VAL_PITCH };
diff --git a/muse2/muse/widgets/pitchlabel.h b/muse2/muse/widgets/pitchlabel.h
index 6372f711..d29a4ee4 100644
--- a/muse2/muse/widgets/pitchlabel.h
+++ b/muse2/muse/widgets/pitchlabel.h
@@ -15,9 +15,11 @@
 //---------------------------------------------------------
 
 class PitchLabel : public QLabel {
+      Q_OBJECT
+    
       bool _pitchMode;
       int _value;
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse/widgets/poslabel.h b/muse2/muse/widgets/poslabel.h
index 29c5297d..7be236ec 100644
--- a/muse2/muse/widgets/poslabel.h
+++ b/muse2/muse/widgets/poslabel.h
@@ -15,10 +15,12 @@
 //---------------------------------------------------------
 
 class PosLabel : public QLabel {
+      Q_OBJECT
+    
       bool _smpte;
       unsigned _tickValue;
       unsigned _sampleValue;
-      Q_OBJECT
+      
 
       void updateValue();
 
diff --git a/muse2/muse/widgets/projectcreateimpl.h b/muse2/muse/widgets/projectcreateimpl.h
index 77547c1a..3ca61e36 100644
--- a/muse2/muse/widgets/projectcreateimpl.h
+++ b/muse2/muse/widgets/projectcreateimpl.h
@@ -6,7 +6,7 @@
 
 class ProjectCreateImpl : public QDialog, Ui::ProjectCreate
 {
-Q_OBJECT
+    Q_OBJECT
 
     QString directoryPath;
 public:
diff --git a/muse2/muse/widgets/scrollscale.h b/muse2/muse/widgets/scrollscale.h
index 32043070..67cfe573 100644
--- a/muse2/muse/widgets/scrollscale.h
+++ b/muse2/muse/widgets/scrollscale.h
@@ -21,6 +21,8 @@ class QToolButton;
 //---------------------------------------------------------
 
 class ScrollScale : public QWidget {
+      Q_OBJECT
+    
       QSlider* scale;
       QScrollBar* scroll;
       int minVal, maxVal;
@@ -38,8 +40,7 @@ class ScrollScale : public QWidget {
       double logbase;
 
       virtual void resizeEvent(QResizeEvent*);
-      Q_OBJECT
-
+      
    private slots:
       void pageUp();
       void pageDown();
diff --git a/muse2/muse/widgets/swidget.h b/muse2/muse/widgets/swidget.h
index c5f4fd6a..45f8cad0 100644
--- a/muse2/muse/widgets/swidget.h
+++ b/muse2/muse/widgets/swidget.h
@@ -17,8 +17,9 @@
 //---------------------------------------------------------
 
 class SWidget : public QWidget {
-      virtual void resizeEvent(QResizeEvent*);
       Q_OBJECT
+      virtual void resizeEvent(QResizeEvent*);
+      
 
    signals:
       void heightChanged(int);
diff --git a/muse2/muse/widgets/tb1.h b/muse2/muse/widgets/tb1.h
index ff31593f..3e721e74 100644
--- a/muse2/muse/widgets/tb1.h
+++ b/muse2/muse/widgets/tb1.h
@@ -23,14 +23,15 @@ class LabelCombo;
 //---------------------------------------------------------
 
 class Toolbar1 : public QToolBar {       
+      Q_OBJECT
+    
       QToolButton* solo;
       PosLabel* pos;
       PitchLabel* pitch;
       LabelCombo* raster;
       QTableWidget* rlist;
       bool showPitch;
-      Q_OBJECT
-
+      
    private slots:
       void _rasterChanged(int);
 
diff --git a/muse2/muse/widgets/tempolabel.h b/muse2/muse/widgets/tempolabel.h
index 71aeb4b8..69dc1450 100644
--- a/muse2/muse/widgets/tempolabel.h
+++ b/muse2/muse/widgets/tempolabel.h
@@ -16,9 +16,11 @@
 //---------------------------------------------------------
 
 class TempoLabel : public QLabel {
+      Q_OBJECT
+    
       double _value;
 
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse/widgets/tools.h b/muse2/muse/widgets/tools.h
index be479a50..2116b958 100644
--- a/muse2/muse/widgets/tools.h
+++ b/muse2/muse/widgets/tools.h
@@ -46,6 +46,7 @@ extern ToolB toolList[];
 
 class EditToolBar : public QToolBar {
       Q_OBJECT
+    
       Action** actions;
       int nactions;
 
diff --git a/muse2/muse/widgets/unusedwavefiles.h b/muse2/muse/widgets/unusedwavefiles.h
index fd1f524c..e28754de 100644
--- a/muse2/muse/widgets/unusedwavefiles.h
+++ b/muse2/muse/widgets/unusedwavefiles.h
@@ -10,6 +10,7 @@ namespace Ui {
 class UnusedWaveFiles : public QDialog
 {
     Q_OBJECT
+    
     QStringList allWaveFiles;
 public:
     explicit UnusedWaveFiles(QWidget *parent = 0);
diff --git a/muse2/muse/widgets/verticalmeter.h b/muse2/muse/widgets/verticalmeter.h
index 699be1e5..facc8b8c 100644
--- a/muse2/muse/widgets/verticalmeter.h
+++ b/muse2/muse/widgets/verticalmeter.h
@@ -17,6 +17,8 @@ class QMouseEvent;
 class QPainter;
 
 class VerticalMeter : public Meter {
+      Q_OBJECT
+    
    private:
       MeterType mtype;
       bool overflow;
@@ -27,7 +29,7 @@ class VerticalMeter : public Meter {
 
       void drawVU(QPainter& p, int, int, int);
 
-      Q_OBJECT
+      
       void paintEvent(QPaintEvent*);
       void resizeEvent(QResizeEvent*);
 
diff --git a/muse2/muse/widgets/view.h b/muse2/muse/widgets/view.h
index f8b0c90f..f53c4c72 100644
--- a/muse2/muse/widgets/view.h
+++ b/muse2/muse/widgets/view.h
@@ -24,12 +24,14 @@ class QResizeEvent;
 //---------------------------------------------------------
 
 class View : public QWidget {
+    Q_OBJECT
+    
       QPixmap pm;             // for double buffering
       bool pmValid;
       QPixmap bgPixmap;       // background Pixmap
       QBrush brush;
       bool _virt;
-      Q_OBJECT
+      
 
    protected:
       int xorg;
diff --git a/muse2/synti/deicsonze/deicsonzegui.h b/muse2/synti/deicsonze/deicsonzegui.h
index 50fb55f6..4c3d5e8e 100644
--- a/muse2/synti/deicsonze/deicsonzegui.h
+++ b/muse2/synti/deicsonze/deicsonzegui.h
@@ -120,6 +120,8 @@ class QTreePreset:public QTreeWidgetItem {
 //   DeicsOnzeGui
 //---------------------------------------------------------
 class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui {
+    Q_OBJECT
+    
     bool _enabledPreset;
 
     QFramePitchEnvelope* pitchEnvelopeGraph;
@@ -134,7 +136,7 @@ class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui
     std::vector<FloatEntry*> _reverbFloatEntryVector;
     std::vector<CheckBox*> _reverbCheckBoxVector;
 
-    Q_OBJECT
+    
     QString lastDir;
   private slots:
     void readMessage(int);
diff --git a/muse2/synti/vam/vamgui.h b/muse2/synti/vam/vamgui.h
index 2271c8aa..b5906ae8 100644
--- a/muse2/synti/vam/vamgui.h
+++ b/muse2/synti/vam/vamgui.h
@@ -38,6 +38,8 @@ class QSignalMapper;
 //---------------------------------------------------------
 
 class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
+      Q_OBJECT
+    
       QSignalMapper* map;
       int ctrlHi;
       int ctrlLo;
@@ -46,7 +48,7 @@ class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
       SynthGuiCtrl dctrl[NUM_CONTROLLER];
       QString * presetFileName;
 
-      Q_OBJECT
+      
       void sendControllerChange(int ctrl, int val);
       void initParameter();
       void setParam(int, int);