Merge branch 'master' into rename

Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp

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

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

include/FxMixer.h

@@ -82,6 +82,7 @@ class FxChannel : public ThreadableJob
 
 class FxRoute : public QObject
 {
+	Q_OBJECT
 	public:		
 		FxRoute( FxChannel * from, FxChannel * to, float amount );
 		virtual ~FxRoute();
@@ -120,8 +121,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/MainWindow.h

@@ -95,6 +95,11 @@ public:
 	static void saveWidgetState( QWidget * _w, QDomElement & _de );
 	static void restoreWidgetState( QWidget * _w, const QDomElement & _de );
 
+	void collectErrors( const QList<QString>* errors );
+	void collectError( const QString error );
+	void clearErrors();
+	void showErrors( const QString reason );
+
 
 public slots:
 	void resetWindowTitle();
@@ -170,6 +175,7 @@ private:
 	QBasicTimer m_updateTimer;
 	QTimer m_autoSaveTimer;
 
+	QList<QString>* m_errors;
 
 	friend class Engine;
 

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

@@ -41,9 +41,10 @@ class PluginView;
 class AutomatableModel;
 
 
-class EXPORT Plugin : public JournallingObject, public Model
+class EXPORT Plugin : public Model, public JournallingObject
 {
 	MM_OPERATORS
+	Q_OBJECT
 public:
 	enum PluginTypes
 	{
@@ -184,6 +185,7 @@ public:
 protected:
 	// create a view for the model 
 	virtual PluginView* instantiateView( QWidget* ) = 0;
+	void collectErrorForUI( QString err_msg );
 
 
 private: