applied WillyFoobar's patch: moved all Q_OBJECT statements to

their appropriate place

27 files changed, 59 insertions, 27 deletions

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;