Rename track class to Track

include/AutomationTrack.h

@@ -30,7 +30,7 @@
 #include "track.h"
 
 
-class AutomationTrack : public track
+class AutomationTrack : public Track
 {
 public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );

include/Instrument.h

@@ -38,7 +38,7 @@ class InstrumentView;
 class MidiEvent;
 class MidiTime;
 class NotePlayHandle;
-class track;
+class Track;
 
 
 class EXPORT Instrument : public Plugin
@@ -118,7 +118,7 @@ public:
 	static Instrument * instantiate( const QString & _plugin_name,
 									InstrumentTrack * _instrument_track );
 
-	virtual bool isFromTrack( const track * _track ) const;
+	virtual bool isFromTrack( const Track * _track ) const;
 
 	inline InstrumentTrack * instrumentTrack() const
 	{

include/InstrumentPlayHandle.h

@@ -76,7 +76,7 @@ public:
 		return false;
 	}
 
-	virtual bool isFromTrack( const track* _track ) const
+	virtual bool isFromTrack( const Track* _track ) const
 	{
 		return m_instrument->isFromTrack( _track );
 	}

include/InstrumentTrack.h

@@ -57,7 +57,7 @@ class tabWidget;
 class trackLabelButton;
 
 
-class EXPORT InstrumentTrack : public track, public MidiEventProcessor
+class EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -136,7 +136,7 @@ public:
 							QDomElement & _parent );
 	virtual void loadTrackSpecificSettings( const QDomElement & _this );
 
-	using track::setJournalling;
+	using Track::setJournalling;
 
 
 	// load instrument whose name matches given one

include/Mixer.h

@@ -225,7 +225,7 @@ public:
 		return m_playHandles;
 	}
 
-	void removePlayHandles( track * _track, bool removeIPHs = true );
+	void removePlayHandles( Track * _track, bool removeIPHs = true );
 
 	bool hasNotePlayHandles();
 

include/NotePlayHandle.h

@@ -121,7 +121,7 @@ public:
 	fpp_t framesLeftForCurrentPeriod() const;
 
 	/*! Returns whether the play handle plays on a certain track */
-	virtual bool isFromTrack( const track* _track ) const;
+	virtual bool isFromTrack( const Track* _track ) const;
 
 	/*! Releases the note (and plays release frames */
 	void noteOff( const f_cnt_t offset = 0 );
@@ -211,7 +211,7 @@ public:
 
 	/*! returns list of note-play-handles belonging to given instrument track,
 	    if allPlayHandles = true, also released note-play-handles are returned */
-	static ConstNotePlayHandleList nphsOfInstrumentTrack( const InstrumentTrack* track, bool allPlayHandles = false );
+	static ConstNotePlayHandleList nphsOfInstrumentTrack( const InstrumentTrack* Track, bool allPlayHandles = false );
 
 	/*! Returns whether given NotePlayHandle instance is equal to *this */
 	bool operator==( const NotePlayHandle & _nph ) const;
@@ -223,7 +223,7 @@ public:
 	}
 
 	/*! Sets attached BB track */
-	void setBBTrack( track* t )
+	void setBBTrack( Track* t )
 	{
 		m_bbTrack = t;
 	}
@@ -294,7 +294,7 @@ private:
 	NotePlayHandle * m_parent;			// parent note
 	bool m_hadChildren;
 	bool m_muted;							// indicates whether note is muted
-	track* m_bbTrack;						// related BB track
+	Track* m_bbTrack;						// related BB track
 
 	// tempo reaction
 	bpm_t m_origTempo;						// original tempo

include/PlayHandle.h

@@ -32,7 +32,7 @@
 #include "ThreadableJob.h"
 #include "lmms_basics.h"
 
-class track;
+class Track;
 class AudioPort;
 
 class PlayHandle : public ThreadableJob
@@ -111,7 +111,7 @@ public:
 	}
 
 
-	virtual bool isFromTrack( const track * _track ) const = 0;
+	virtual bool isFromTrack( const Track * _track ) const = 0;
 
 	bool usesBuffer() const
 	{

include/PresetPreviewPlayHandle.h

@@ -41,7 +41,7 @@ public:
 	virtual void play( sampleFrame* buffer );
 	virtual bool isFinished() const;
 
-	virtual bool isFromTrack( const track * _track ) const;
+	virtual bool isFromTrack( const Track * _track ) const;
 
 	static void init();
 	static void cleanup();

include/SamplePlayHandle.h

@@ -31,7 +31,7 @@
 
 class bbTrack;
 class SampleTCO;
-class track;
+class Track;
 class AudioPort;
 
 
@@ -52,7 +52,7 @@ public:
 	virtual void play( sampleFrame * buffer );
 	virtual bool isFinished() const;
 
-	virtual bool isFromTrack( const track * _track ) const;
+	virtual bool isFromTrack( const Track * _track ) const;
 
 	f_cnt_t totalFrames() const;
 	inline f_cnt_t framesDone() const
@@ -86,7 +86,7 @@ private:
 
 	FloatModel m_defaultVolumeModel;
 	FloatModel * m_volumeModel;
-	track * m_track;
+	Track * m_track;
 
 	bbTrack * m_bbTrack;
 

include/SampleRecordHandle.h

@@ -34,7 +34,7 @@
 
 class bbTrack;
 class SampleTCO;
-class track;
+class Track;
 
 
 class SampleRecordHandle : public PlayHandle
@@ -46,7 +46,7 @@ public:
 	virtual void play( sampleFrame * _working_buffer );
 	virtual bool isFinished() const;
 
-	virtual bool isFromTrack( const track * _track ) const;
+	virtual bool isFromTrack( const Track * _track ) const;
 
 	f_cnt_t framesRecorded() const;
 	void createSampleBuffer( SampleBuffer * * _sample_buf );
@@ -61,7 +61,7 @@ private:
 	f_cnt_t m_framesRecorded;
 	MidiTime m_minLength;
 
-	track * m_track;
+	Track * m_track;
 	bbTrack * m_bbTrack;
 	SampleTCO * m_tco;
 

include/SampleTrack.h

@@ -40,7 +40,7 @@ class SampleTCO : public trackContentObject
 	Q_OBJECT
 	mapPropertyFromModel(bool,isRecord,setRecord,m_recordModel);
 public:
-	SampleTCO( track * _track );
+	SampleTCO( Track * _track );
 	virtual ~SampleTCO();
 
 	virtual void changeLength( const MidiTime & _length );
@@ -118,7 +118,7 @@ private:
 
 
 
-class SampleTrack : public track
+class SampleTrack : public Track
 {
 	Q_OBJECT
 public:
@@ -161,7 +161,7 @@ class SampleTrackView : public trackView
 {
 	Q_OBJECT
 public:
-	SampleTrackView( SampleTrack* track, TrackContainerView* tcv );
+	SampleTrackView( SampleTrack* Track, TrackContainerView* tcv );
 	virtual ~SampleTrackView();
 
 

include/TrackContainer.h

@@ -41,7 +41,7 @@ class EXPORT TrackContainer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:
-	typedef QVector<track *> TrackList;
+	typedef QVector<Track *> TrackList;
 
 	TrackContainer();
 	virtual ~TrackContainer();
@@ -56,11 +56,11 @@ public:
 		return NULL;
 	}
 
-	int countTracks( track::TrackTypes _tt = track::NumTrackTypes ) const;
+	int countTracks( Track::TrackTypes _tt = Track::NumTrackTypes ) const;
 
 
-	void addTrack( track * _track );
-	void removeTrack( track * _track );
+	void addTrack( Track * _track );
+	void removeTrack( Track * _track );
 
 	virtual void updateAfterTrackAdd();
 
@@ -80,7 +80,7 @@ public:
 
 
 signals:
-	void trackAdded( track * _track );
+	void trackAdded( Track * _track );
 
 protected:
 	mutable QReadWriteLock m_tracksMutex;
@@ -90,7 +90,7 @@ private:
 
 
 	friend class TrackContainerView;
-	friend class track;
+	friend class Track;
 
 } ;
 

include/TrackContainerView.h

@@ -120,7 +120,7 @@ public:
 
 public slots:
 	void realignTracks();
-	void createTrackView( track * _t );
+	void createTrackView( Track * _t );
 	void deleteTrackView( trackView * _tv );
 
 

include/bb_track.h

@@ -39,7 +39,7 @@ class TrackContainer;
 class bbTCO : public trackContentObject
 {
 public:
-	bbTCO( track * _track );
+	bbTCO( Track * _track );
 	virtual ~bbTCO();
 
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
@@ -120,7 +120,7 @@ private:
 
 
 
-class EXPORT bbTrack : public track
+class EXPORT bbTrack : public Track
 {
 	Q_OBJECT
 public:
@@ -137,22 +137,22 @@ public:
 	virtual void loadTrackSpecificSettings( const QDomElement & _this );
 
 	static bbTrack * findBBTrack( int _bb_num );
-	static void swapBBTracks( track * _track1, track * _track2 );
+	static void swapBBTracks( Track * _track1, Track * _track2 );
 
 	int index()
 	{
 		return s_infoMap[this];
 	}
 
-	bool automationDisabled( track * _track )
+	bool automationDisabled( Track * _track )
 	{
 		return( m_disabledTracks.contains( _track ) );
 	}
-	void disableAutomation( track * _track )
+	void disableAutomation( Track * _track )
 	{
 		m_disabledTracks.append( _track );
 	}
-	void enableAutomation( track * _track )
+	void enableAutomation( Track * _track )
 	{
 		m_disabledTracks.removeAll( _track );
 	}
@@ -186,7 +186,7 @@ protected:
 
 
 private:
-	QList<track *> m_disabledTracks;
+	QList<Track *> m_disabledTracks;
 
 	typedef QMap<bbTrack *, int> infoMap;
 	static infoMap s_infoMap;

include/export_project_dialog.h

@@ -64,7 +64,7 @@ private:
 	RenderVector m_renderers;
 	bool m_multiExport;
 
-	typedef QVector<track*> TrackVector;
+	typedef QVector<Track*> TrackVector;
 	TrackVector m_unmuted;
 	TrackVector m_unmutedBB;
 	ProjectRenderer::ExportFileFormats m_ft;

include/song.h

@@ -261,7 +261,7 @@ public slots:
 	void playSong();
 	void record();
 	void playAndRecord();
-	void playTrack( track * _trackToPlay );
+	void playTrack( Track * _trackToPlay );
 	void playBB();
 	void playPattern( Pattern* patternToPlay, bool _loop = true );
 	void togglePause();
@@ -353,7 +353,7 @@ private:
 	playPos m_playPos[Mode_Count];
 	tact_t m_length;
 
-	track * m_trackToPlay;
+	Track * m_trackToPlay;
 	Pattern* m_patternToPlay;
 	bool m_loopPattern;
 

include/track.h

@@ -46,7 +46,7 @@ class QPushButton;
 
 class pixmapButton;
 class textFloat;
-class track;
+class Track;
 class trackContentObjectView;
 class TrackContainer;
 class TrackContainerView;
@@ -80,10 +80,10 @@ class trackContentObject : public Model, public JournallingObject
 	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public:
-	trackContentObject( track * _track );
+	trackContentObject( Track * _track );
 	virtual ~trackContentObject();
 
-	inline track * getTrack() const
+	inline Track * getTrack() const
 	{
 		return m_track;
 	}
@@ -157,7 +157,7 @@ private:
 		Resize
 	} ;
 
-	track * m_track;
+	Track * m_track;
 	QString m_name;
 
 	MidiTime m_startPosition;
@@ -342,7 +342,7 @@ protected:
 
 
 private:
-	track * getTrack();
+	Track * getTrack();
 	MidiTime getPosition( int _mouse_x );
 
 	trackView * m_trackView;
@@ -404,7 +404,7 @@ signals:
 
 
 // base-class for all tracks
-class EXPORT track : public Model, public JournallingObject
+class EXPORT Track : public Model, public JournallingObject
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -425,11 +425,11 @@ public:
 		NumTrackTypes
 	} ;
 
-	track( TrackTypes _type, TrackContainer * _tc );
-	virtual ~track();
+	Track( TrackTypes _type, TrackContainer * _tc );
+	virtual ~Track();
 
-	static track * create( TrackTypes _tt, TrackContainer * _tc );
-	static track * create( const QDomElement & _this,
+	static Track * create( TrackTypes _tt, TrackContainer * _tc );
+	static Track * create( const QDomElement & _this,
 							TrackContainer * _tc );
 	void clone();
 
@@ -566,15 +566,15 @@ class trackView : public QWidget, public ModelView, public JournallingObject
 {
 	Q_OBJECT
 public:
-	trackView( track * _track, TrackContainerView* tcv );
+	trackView( Track * _track, TrackContainerView* tcv );
 	virtual ~trackView();
 
-	inline const track * getTrack() const
+	inline const Track * getTrack() const
 	{
 		return( m_track );
 	}
 
-	inline track * getTrack()
+	inline Track * getTrack()
 	{
 		return( m_track );
 	}
@@ -648,7 +648,7 @@ private:
 		ResizeTrack
 	} ;
 
-	track * m_track;
+	Track * m_track;
 	TrackContainerView * m_trackContainerView;
 
 	trackOperationsWidget m_trackOperationsWidget;