moved displayName-property from automatableModel to model base-class

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1322 0778d3d1-df1d-0410-868b-ea421aaaa00d
2008-07-18 10:05:56 +00:00
parent 3b3a8afe6b
commit 0de1e6ffd3
3 changed files with 11 additions and 21 deletions
--- a/src/core/automatable_model.cpp
+++ b/src/core/automatable_model.cpp
@@ -52,7 +52,7 @@ automatableModel::automatableModel( DataType _type,
 						::model * _parent,
 						const QString & _display_name,
 						bool _default_constructed ) :
-	model( _parent, _default_constructed ),
+	model( _parent, _display_name, _default_constructed ),
 	m_dataType( _type ),
 	m_value( _val ),
 	m_initValue( _val ),
@@ -60,7 +60,6 @@ automatableModel::automatableModel( DataType _type,
 	m_maxValue( _max ),
 	m_step( _step ),
 	m_range( _max - _min ),
-	m_displayName( _display_name ),
 	m_journalEntryReady( FALSE ),
 	m_controllerConnection( NULL )
 {