added modified project indicator, fixed some segfaults

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@615 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/instrument_track.h

@@ -27,10 +27,8 @@
 #ifndef _INSTRUMENT_TRACK_H
 #define _INSTRUMENT_TRACK_H
 
-#include <QtGui/QApplication>
 #include <QtGui/QPushButton>
 #include <QtGui/QPainter>
-#include <QtGui/QMdiSubWindow>
 
 #include "midi_event_processor.h"
 #include "mixer.h"
@@ -55,7 +53,7 @@ class surroundArea;
 class volumeKnob;
 
 
-class instrumentTrack : public QMdiSubWindow, public track, public midiEventProcessor
+class instrumentTrack : public QWidget, public track, public midiEventProcessor
 {
 	Q_OBJECT
 public:

include/ladspa_base.h

@@ -69,13 +69,6 @@ typedef struct portDescription
 } port_desc_t;
 
 
-inline ladspa_key_t subPluginKeyToLadspaKey(
-		const plugin::descriptor::subPluginFeatures::key * _key )
-{
-	return( ladspa_key_t( _key->user.toStringList().first(),
-				_key->user.toStringList().last() ) );
-}
-
 inline plugin::descriptor::subPluginFeatures::key ladspaKeyToSubPluginKey(
 						plugin::descriptor * _desc,
 						const QString & _name,

include/main_window.h

@@ -58,7 +58,7 @@ public:
 	int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
 	void addSpacingToToolBar( int _size );
 
-	void resetWindowTitle( const QString & _add = "" );
+	void resetWindowTitle( void );
 
 	void clearKeyModifiers( void );
 

include/plugin.h

@@ -93,8 +93,16 @@ public:
 					const QList<QVariant> l =
 						base64::decode( _dump_data ).
 								toList();
-					name = l[0].toString();
-					user = l[1];
+					if( l.empty() )
+					{
+						name = QString::null;
+						user = QVariant();
+					}
+					else
+					{
+						name = l[0].toString();
+						user = l[1];
+					}
 				}
 				inline QString dumpBase64( void ) const
 				{

include/song_editor.h

@@ -28,7 +28,6 @@
 #define _SONG_EDITOR_H
 
 #include "track_container.h"
-#include "tool_button.h"
 
 
 class QLabel;
@@ -40,6 +39,7 @@ class lcdSpinBox;
 class pattern;
 class textFloat;
 class timeLine;
+class toolButton;
 
 
 const bpm_t MIN_BPM = 10;
@@ -183,10 +183,7 @@ public slots:
 	void setMasterVolume( volume _vol );
 	void setMasterPitch( int _master_pitch );
 
-	inline void setModified( void )
-	{
-		m_modified = TRUE;
-	}
+	void setModified( void );
 
 	void clearProject( void );
 
@@ -200,10 +197,7 @@ protected:
 
 	virtual QRect scrollAreaRect( void ) const;
 
-	virtual bool allowRubberband( void ) const
-	{
-		return( m_editModeButton->isChecked() );
-	}
+	virtual bool allowRubberband( void ) const;
 
 
 protected slots:
@@ -275,7 +269,6 @@ private:
 
 	QString m_fileName;
 	QString m_oldFileName;
-	bool m_modified;
 
 	volatile bool m_exporting;
 	volatile bool m_playing;