Merge branch 'master' of github.com:LMMS/lmms

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/Plugin.h

@@ -185,6 +185,7 @@ public:
 protected:
 	// create a view for the model 
 	virtual PluginView* instantiateView( QWidget* ) = 0;
+	void collectErrorForUI( QString err_msg );
 
 
 private: