fixed various leaks I found using Valgrind

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

include/automatable_model.h

@@ -295,7 +295,7 @@ public:
 			const QString & _display_name  = QString::null,
 			bool _default_constructed = FALSE ) :
 		automatableModel( Float, _val, _min, _max, _step,
-					_parent, _display_name, _default_constructed )
+				_parent, _display_name, _default_constructed )
 	{
 	}
 
@@ -312,7 +312,7 @@ public:
 			const QString & _display_name  = QString::null,
 			bool _default_constructed = FALSE ) :
 		automatableModel( Integer, _val, _min, _max, 1,
-					_parent, _display_name, _default_constructed )
+				_parent, _display_name, _default_constructed )
 	{
 	}
 
@@ -329,7 +329,7 @@ public:
 				const QString & _display_name  = QString::null,
 				bool _default_constructed = FALSE ) : 
 		automatableModel( Bool, _val, FALSE, TRUE, 1,
-						_parent, _display_name, _default_constructed )
+				_parent, _display_name, _default_constructed )
 	{
 	}
 

include/combobox_model.h

@@ -39,11 +39,18 @@ class comboBoxModel : public intModel
 {
 	Q_OBJECT
 public:
-	comboBoxModel( ::model * _parent = NULL, const QString & _display_name = QString::null ) :
+	comboBoxModel( ::model * _parent = NULL,
+			const QString & _display_name = QString::null,
+				bool _default_constructed = FALSE ) :
 		intModel( 0, 0, 0, _parent, _display_name )
 	{
 	}
 
+	virtual ~comboBoxModel()
+	{
+		clear();
+	}
+
 	void addItem( const QString & _item, pixmapLoader * _loader = NULL );
 
 	void clear( void );

include/mv_base.h

@@ -91,12 +91,15 @@ class EXPORT modelView
 {
 public:
 	modelView( model * _model, QWidget * _this );
-	virtual ~modelView()
-	{
-	}
+	virtual ~modelView();
 
 	virtual void setModel( model * _model, bool _old_model_valid = TRUE );
 
+	inline model * getModel( void )
+	{
+		return( m_model );
+	}
+
 	template<class T>
 	T * castModel( void )
 	{

include/piano_roll.h

@@ -29,9 +29,10 @@
 
 #include <QtGui/QWidget>
 
-#include "types.h"
-#include "note.h"
+#include "combobox_model.h"
 #include "journalling_object.h"
+#include "note.h"
+#include "types.h"
 
 
 class QPainter;
@@ -39,7 +40,6 @@ class QPixmap;
 class QScrollBar;
 
 class comboBox;
-class comboBoxModel;
 class notePlayHandle;
 class pattern;
 class timeLine;
@@ -198,9 +198,9 @@ private:
 	comboBox * m_quantizeComboBox;
 	comboBox * m_noteLenComboBox;
 
-	comboBoxModel * m_zoomingModel;
-	comboBoxModel * m_quantizeModel;
-	comboBoxModel * m_noteLenModel;
+	comboBoxModel m_zoomingModel;
+	comboBoxModel m_quantizeModel;
+	comboBoxModel m_noteLenModel;