Merge pull request #1327 from DanWin/stable-1.1

Fix most warnings and errors when generating translation files

include/AutomationTrack.h

@@ -32,6 +32,7 @@
 
 class AutomationTrack : public track
 {
+	Q_OBJECT
 public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );
 	virtual ~AutomationTrack();

include/Effect.h

@@ -39,6 +39,7 @@ class EffectControls;
 
 class EXPORT Effect : public Plugin
 {
+	Q_OBJECT
 public:
 	Effect( const Plugin::Descriptor * _desc,
 			Model * _parent,

include/FxMixer.h

@@ -78,6 +78,7 @@ class FxChannel : public ThreadableJob
 
 class FxRoute : public QObject
 {
+	Q_OBJECT
 	public:		
 		FxRoute( FxChannel * from, FxChannel * to, float amount );
 		virtual ~FxRoute();
@@ -116,8 +117,9 @@ class FxRoute : public QObject
 };
 
 
-class EXPORT FxMixer : public JournallingObject, public Model
+class EXPORT FxMixer : public Model, public JournallingObject
 {
+	Q_OBJECT
 public:
 	FxMixer();
 	virtual ~FxMixer();

include/InstrumentMidiIOView.h

@@ -38,6 +38,7 @@ class QToolButton;
 
 class InstrumentMidiIOView : public QWidget, public ModelView
 {
+	Q_OBJECT
 public:
 	InstrumentMidiIOView( QWidget* parent );
 	virtual ~InstrumentMidiIOView();

include/MeterDialog.h

@@ -35,6 +35,7 @@ class LcdSpinBox;
 
 class MeterDialog : public QWidget, public ModelView
 {
+	Q_OBJECT
 public:
 	MeterDialog( QWidget * _parent, bool _simple = false );
 	virtual ~MeterDialog();

include/Plugin.h

@@ -40,8 +40,9 @@ class PluginView;
 class AutomatableModel;
 
 
-class EXPORT Plugin : public JournallingObject, public Model
+class EXPORT Plugin : public Model, public JournallingObject
 {
+	Q_OBJECT
 public:
 	enum PluginTypes
 	{