Rename Timeline to TimeLineWidget

include/AutomationEditor.h

@@ -44,7 +44,7 @@ class QScrollBar;
 
 class ComboBox;
 class NotePlayHandle;
-class Timeline;
+class TimeLineWidget;
 
 
 
@@ -226,7 +226,7 @@ private:
 	EditModes m_editMode;
 
 
-	Timeline * m_timeLine;
+	TimeLineWidget * m_timeLine;
 	bool m_scrollBack;
 
 	void drawCross(QPainter & p );

include/Editor.h

@@ -28,7 +28,7 @@
 #include <QMainWindow>
 #include <QToolBar>
 
-#include "Timeline.h"
+#include "TimeLineWidget.h"
 #include "ToolButton.h"
 
 /// \brief Superclass for editors with a toolbar.

include/PianoRoll.h

@@ -48,7 +48,7 @@ class QSignalMapper;
 class ComboBox;
 class NotePlayHandle;
 class Pattern;
-class Timeline;
+class TimeLineWidget;
 
 class PianoRoll : public QWidget
 {
@@ -317,7 +317,7 @@ private:
 	bool m_mouseDownLeft; //true if left click is being held down
 	bool m_mouseDownRight; //true if right click is being held down
 
-	Timeline * m_timeLine;
+	TimeLineWidget * m_timeLine;
 	bool m_scrollBack;
 
 	void copy_to_clipboard( const NoteVector & _notes ) const;

include/Song.h

@@ -36,7 +36,7 @@
 
 class AutomationTrack;
 class Pattern;
-class Timeline;
+class TimeLineWidget;
 
 
 const bpm_t MinTempo = 10;
@@ -83,7 +83,7 @@ public:
 		{
 			return m_currentFrame;
 		}
-		Timeline * m_timeLine;
+		TimeLineWidget * m_timeLine;
 		bool m_timeLineUpdate;
 
 	private:

include/SongEditor.h

@@ -40,7 +40,7 @@ class LcdSpinBox;
 class MeterDialog;
 class Song;
 class TextFloat;
-class Timeline;
+class TimeLineWidget;
 
 class positionLine : public QWidget
 {
@@ -108,7 +108,7 @@ private:
 
 	LcdSpinBox * m_tempoSpinBox;
 
-	Timeline * m_timeLine;
+	TimeLineWidget * m_timeLine;
 
 	MeterDialog * m_timeSigDisplay;
 	AutomatableSlider * m_masterVolumeSlider;

include/TimeLineWidget.h

@@ -1,5 +1,5 @@
 /*
- * Timeline.h - class timeLine, representing a time-line with position marker
+ * TimeLineWidget.h - class timeLine, representing a time-line with position marker
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -37,7 +37,7 @@ class NStateButton;
 class TextFloat;
 
 
-class Timeline : public QWidget, public JournallingObject
+class TimeLineWidget : public QWidget, public JournallingObject
 {
 	Q_OBJECT
 public:
@@ -61,9 +61,9 @@ public:
 	} ;
 
 
-	Timeline( int _xoff, int _yoff, float _ppt, Song::playPos & _pos,
+	TimeLineWidget( int _xoff, int _yoff, float _ppt, Song::playPos & _pos,
 				const MidiTime & _begin, QWidget * _parent );
-	virtual ~Timeline();
+	virtual ~TimeLineWidget();
 
 	inline Song::playPos & pos()
 	{