name-property in trackContentObject-class

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

include/bb_track.h

@@ -58,7 +58,6 @@ public:
 
 
 private:
-	QString m_name;
 	unsigned int m_color;
 
 

include/pattern.h

@@ -91,19 +91,6 @@ public:
 	void checkType( void );
 
 
-	// pattern-name functions
-	inline const QString & name( void ) const
-	{
-		return( m_name );
-	}
-
-	inline void setName( const QString & _name )
-	{
-		m_name = _name;
-		emit dataChanged();
-	}
-
-
 	// functions which are part of freezing-feature
 	inline bool freezing( void ) const
 	{
@@ -163,7 +150,6 @@ private:
 	instrumentTrack * m_instrumentTrack;
 
 	PatternTypes m_patternType;
-	QString m_name;
 
 	// data-stuff
 	noteVector m_notes;

include/track.h

@@ -66,20 +66,35 @@ class trackContentObject : public model, public journallingObject
 	Q_OBJECT
 public:
 	trackContentObject( track * _track );
-//	trackContentObject( const trackContentObject & _copy );
 	virtual ~trackContentObject();
+
 	inline track * getTrack( void )
 	{
 		return( m_track );
 	}
+
+	inline const QString & name( void ) const
+	{
+		return( m_name );
+	}
+
+	inline void setName( const QString & _name )
+	{
+		m_name = _name;
+		emit dataChanged();
+	}
+
+
 	inline const midiTime & startPosition( void ) const
 	{
 		return( m_startPosition );
 	}
+
 	inline midiTime endPosition( void ) const
 	{
 		return( m_startPosition + m_length );
 	}
+
 	inline const midiTime & length( void ) const
 	{
 		return( m_length );
@@ -96,7 +111,6 @@ public:
 	virtual trackContentObjectView * createView( trackView * _tv ) = 0;
 
 
-
 protected:
 	virtual void undoStep( journalEntry & _je );
 	virtual void redoStep( journalEntry & _je );
@@ -124,6 +138,8 @@ private:
 	} ;
 
 	track * m_track;
+	QString m_name;
+
 	midiTime m_startPosition;
 	midiTime m_length;