Rename MidiTime to TimePos (after Track split)

include/Track.h

@@ -28,15 +28,12 @@
 
 
 #include <QtCore/QVector>
-#include <QSize>
 #include <QColor>
 
 #include "AutomatableModel.h"
-#include "DataFile.h"
 #include "JournallingObject.h"
 #include "lmms_basics.h"
 #include "TimePos.h"
-#include "ModelView.h"
 
 
 class TrackContainer;

include/TrackContentObject.h

@@ -32,9 +32,9 @@
 #include "FadeButton.h"
 #include "JournallingObject.h"
 #include "lmms_basics.h"
-#include "MidiTime.h"
 #include "Model.h"
 #include "Rubberband.h"
+#include "TimePos.h"
 
 
 class QMenu;
@@ -82,18 +82,18 @@ class LMMS_EXPORT TrackContentObject : public Model, public JournallingObject
 	}
 
 
-	inline const MidiTime & startPosition() const
+	inline const TimePos & startPosition() const
 	{
 		return m_startPosition;
 	}
 
-	inline MidiTime endPosition() const
+	inline TimePos endPosition() const
 	{
 		const int sp = m_startPosition;
 		return sp + m_length;
 	}
 
-	inline const MidiTime & length() const
+	inline const TimePos & length() const
 	{
 		return m_length;
 	}
@@ -127,8 +127,8 @@ class LMMS_EXPORT TrackContentObject : public Model, public JournallingObject
 		return m_useCustomClipColor;
 	}
 
-	virtual void movePosition( const MidiTime & pos );
-	virtual void changeLength( const MidiTime & length );
+	virtual void movePosition( const TimePos & pos );
+	virtual void changeLength( const TimePos & length );
 
 	virtual TrackContentObjectView * createView( TrackView * tv ) = 0;
 
@@ -145,8 +145,8 @@ class LMMS_EXPORT TrackContentObject : public Model, public JournallingObject
 	/// Returns true if and only if a->startPosition() < b->startPosition()
 	static bool comparePosition(const TrackContentObject* a, const TrackContentObject* b);
 
-	MidiTime startTimeOffset() const;
-	void setStartTimeOffset( const MidiTime &startTimeOffset );
+	TimePos startTimeOffset() const;
+	void setStartTimeOffset( const TimePos &startTimeOffset );
 
 	void updateColor();
 
@@ -175,9 +175,9 @@ public slots:
 	Track * m_track;
 	QString m_name;
 
-	MidiTime m_startPosition;
-	MidiTime m_length;
-	MidiTime m_startTimeOffset;
+	TimePos m_startPosition;
+	TimePos m_length;
+	TimePos m_startTimeOffset;
 
 	BoolModel m_mutedModel;
 	BoolModel m_soloModel;

include/TrackContentObjectView.h

@@ -182,9 +182,9 @@ protected slots:
 	Actions m_action;
 	QPoint m_initialMousePos;
 	QPoint m_initialMouseGlobalPos;
-	MidiTime m_initialTCOPos;
-	MidiTime m_initialTCOEnd;
-	QVector<MidiTime> m_initialOffsets;
+	TimePos m_initialTCOPos;
+	TimePos m_initialTCOEnd;
+	QVector<TimePos> m_initialOffsets;
 
 	TextFloat * m_hint;
 
@@ -211,7 +211,7 @@ protected slots:
 	void setInitialOffsets();
 
 	bool mouseMovedDistance( QMouseEvent * me, int distance );
-	MidiTime draggedTCOPos( QMouseEvent * me );
+	TimePos draggedTCOPos( QMouseEvent * me );
 } ;
 
 

include/TrackContentWidget.h

@@ -28,8 +28,8 @@
 #include <QMimeData>
 #include <QWidget>
 
-#include "MidiTime.h"
 #include "JournallingObject.h"
+#include "TimePos.h"
 
 
 class QMenu;
@@ -66,12 +66,12 @@ class TrackContentWidget : public QWidget, public JournallingObject
 		}
 	}
 
-	bool canPasteSelection( MidiTime tcoPos, const QDropEvent *de );
-	bool canPasteSelection( MidiTime tcoPos, const QMimeData *md, bool allowSameBar = false );
-	bool pasteSelection( MidiTime tcoPos, QDropEvent * de );
-	bool pasteSelection( MidiTime tcoPos, const QMimeData * md, bool skipSafetyCheck = false );
+	bool canPasteSelection( TimePos tcoPos, const QDropEvent *de );
+	bool canPasteSelection( TimePos tcoPos, const QMimeData *md, bool allowSameBar = false );
+	bool pasteSelection( TimePos tcoPos, QDropEvent * de );
+	bool pasteSelection( TimePos tcoPos, const QMimeData * md, bool skipSafetyCheck = false );
 
-	MidiTime endPosition( const MidiTime & posStart );
+	TimePos endPosition( const TimePos & posStart );
 
 	// qproperty access methods
 
@@ -87,7 +87,7 @@ class TrackContentWidget : public QWidget, public JournallingObject
 
 public slots:
 	void update();
-	void changePosition( const MidiTime & newPos = MidiTime( -1 ) );
+	void changePosition( const TimePos & newPos = TimePos( -1 ) );
 
 protected:
 	enum ContextMenuAction
@@ -122,7 +122,7 @@ public slots:
 
 private:
 	Track * getTrack();
-	MidiTime getPosition( int mouseX );
+	TimePos getPosition( int mouseX );
 
 	TrackView * m_trackView;
 

src/core/TrackContentObject.cpp

@@ -85,9 +85,9 @@ TrackContentObject::~TrackContentObject()
  *
  * \param _pos The new position of the track content object.
  */
-void TrackContentObject::movePosition( const MidiTime & pos )
+void TrackContentObject::movePosition( const TimePos & pos )
 {
-	MidiTime newPos = qMax(0, pos.getTicks());
+	TimePos newPos = qMax(0, pos.getTicks());
 	if (m_startPosition != newPos)
 	{
 		Engine::mixer()->requestChangeInModel();
@@ -108,7 +108,7 @@ void TrackContentObject::movePosition( const MidiTime & pos )
  *
  * \param _length The new length of the track content object.
  */
-void TrackContentObject::changeLength( const MidiTime & length )
+void TrackContentObject::changeLength( const TimePos & length )
 {
 	m_length = length;
 	Engine::getSong()->updateLength();
@@ -138,7 +138,7 @@ void TrackContentObject::copyStateTo( TrackContentObject *src, TrackContentObjec
 		QDomElement parent = doc.createElement( "StateCopy" );
 		src->saveState( doc, parent );
 
-		const MidiTime pos = dst->startPosition();
+		const TimePos pos = dst->startPosition();
 		dst->restoreState( parent.firstChild().toElement() );
 		dst->movePosition( pos );
 
@@ -167,15 +167,15 @@ void TrackContentObject::toggleMute()
 
 
 
-MidiTime TrackContentObject::startTimeOffset() const
+TimePos TrackContentObject::startTimeOffset() const
 {
 	return m_startTimeOffset;
 }
 
 
 
 
-void TrackContentObject::setStartTimeOffset( const MidiTime &startTimeOffset )
+void TrackContentObject::setStartTimeOffset( const TimePos &startTimeOffset )
 {
 	m_startTimeOffset = startTimeOffset;
 }