Labels templated.

Six more to go.
2011-05-31 11:22:21 -04:00
parent 860f6c76f0
commit da73396895
6 changed files with 96 additions and 111 deletions
@@ -385,89 +385,6 @@ struct ComboSegment
 	bool operator>=( const ComboSegment &other ) const { return !operator<(other); }
 };

-/**
- * @brief Identifies when a chart is entering a different section.
- * 
- * This is meant for helping to identify different sections of a chart
- * versus relying on measures and beats alone.
- */
-struct LabelSegment
-{
-	/**
-	 * @brief Creates a simple Label Segment with default values.
-	 *
-	 * It is best to override the values as soon as possible.
-	 */
-	LabelSegment() : m_iStartRow(-1), m_sLabel("") { }
-	/**
-	 * @brief Creates a Label Segment with the specified starting row and label.
-	 * @param s the starting row of this segment.
-	 * @param l the label for this section.
-	 */
-	LabelSegment( int s, RString l ): m_iStartRow(max(0, s)),
-		m_sLabel(l) {}
-	/**
-	 * @brief Creates a Label Segment with the specified starting beat and label.
-	 * @param s the starting beat of this segment.
-	 * @param l the label for this section.
-	 */
-	LabelSegment( float s, RString l ):
-		m_iStartRow(max(0, BeatToNoteRow(s))), m_sLabel(l) {}
-	/**
-	 * @brief The row in which the ComboSegment activates.
-	 */
-	int m_iStartRow;
-	/**
-	 * @brief The label/section name for this point.
-	 */
-	RString m_sLabel;
-	
-	/**
-	 * @brief Compares two LabelSegments to see if they are equal to each other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the equality of the two segments.
-	 */
-	bool operator==( const LabelSegment &other ) const
-	{
-		COMPARE( m_iStartRow );
-		COMPARE( m_sLabel );
-		return true;
-	}
-	/**
-	 * @brief Compares two LabelSegments to see if they are not equal to each other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the inequality of the two segments.
-	 */
-	bool operator!=( const LabelSegment &other ) const { return !operator==(other); }
-	/**
-	 * @brief Compares two LabelSegments to see if one is less than the other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the truth/falsehood of if the first is less than the second.
-	 */
-	bool operator<( const LabelSegment &other ) const { return m_iStartRow < other.m_iStartRow; }
-	/**
-	 * @brief Compares two LabelSegments to see if one is less than or equal to the other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the truth/falsehood of if the first is less or equal to than the second.
-	 */
-	bool operator<=( const LabelSegment &other ) const
-	{
-		return ( operator<(other) || operator==(other) );
-	}
-	/**
-	 * @brief Compares two LabelSegments to see if one is greater than the other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the truth/falsehood of if the first is greater than the second.
-	 */
-	bool operator>( const LabelSegment &other ) const { return !operator<=(other); }
-	/**
-	 * @brief Compares two LabelSegments to see if one is greater than or equal to the other.
-	 * @param other the other LabelSegment to compare to.
-	 * @return the truth/falsehood of if the first is greater than or equal to the second.
-	 */
-	bool operator>=( const LabelSegment &other ) const { return !operator<(other); }
-};
-
 /**
 * @brief Identifies when the arrow scroll changes.
 *