From 8cffb9666f5974a1d497af130dc7ab3972d46aae Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Wed, 23 Aug 2006 22:33:08 +0000
Subject: [PATCH] Simplify.

---
 stepmania/src/NoteData.cpp | 10 ----------
 stepmania/src/NoteData.h   |  7 ++++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 25f3ca3e39..d54f4219bb 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -14,21 +14,11 @@
 #include "RageUtil_AutoPtr.h"
 REGISTER_CLASS_TRAITS( NoteData, new NoteData(*pCopy) )
 
-NoteData::NoteData()
-{
-	Init();
-}
-
 void NoteData::Init()
 {
-	ClearAll();
 	m_TapNotes = vector<TrackMap>();	// ensure that the memory is freed
 }
 
-NoteData::~NoteData()
-{
-}
-
 void NoteData::SetNumTracks( int iNewNumTracks )
 {
 	ASSERT( iNewNumTracks > 0 );
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 5da1554931..a374d461cc 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -58,13 +58,13 @@ private:
 	vector<TrackMap>	m_TapNotes;
 
 public:
-	NoteData();
-	~NoteData();
 	void Init();
 	
 	int GetNumTracks() const { return m_TapNotes.size(); }
 	void SetNumTracks( int iNewNumTracks );
 	bool IsComposite() const;
+	bool operator==( const NoteData &nd ) const { return m_TapNotes == nd.m_TapNotes; }
+	bool operator!=( const NoteData &nd ) const { return m_TapNotes != nd.m_TapNotes; }
 
 	/* Return the note at the given track and row.  Row may be out of
 	 * range; pretend the song goes on with TAP_EMPTYs indefinitely. */
@@ -195,7 +195,8 @@ public:
 	void LoadFromNode( const XNode* pNode );
 };
 
-namespace std {
+namespace std
+{
 	template<> inline void swap<NoteData>( NoteData &nd1, NoteData &nd2 ) { nd1.swap( nd2 ); }
 }