From 7f8b12890a50f0d393747585b64ea0ab920d7d37 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Tue, 19 Feb 2008 00:03:12 +0000
Subject: [PATCH] getters - use them!

---
 editor/syncdocument.h  | 14 ++++++--------
 editor/trackview.cpp   |  2 +-
 sync/data.cpp          |  2 --
 sync/device_client.cpp |  6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/editor/syncdocument.h b/editor/syncdocument.h
index 1adc86b..71b4b26 100644
--- a/editor/syncdocument.h
+++ b/editor/syncdocument.h
@@ -82,19 +82,17 @@ public:
 		
 		virtual void exec(SyncDocument *data)
 		{
-			sync::Track *t = data->actualTracks[this->track];
-			assert(NULL != t);
-			assert(!t->isKeyFrame(row));
-			t->setKeyFrame(row, key);
+			sync::Track &t = data->getTrack(this->track);
+			assert(!t.isKeyFrame(row));
+			t.setKeyFrame(row, key);
 			data->sendSetKeyCommand(track, row, key); // update clients
 		}
 		
 		virtual void undo(SyncDocument *data)
 		{
-			sync::Track *t = data->actualTracks[this->track];
-			assert(NULL != t);
-			assert(t->isKeyFrame(row));
-			t->deleteKeyFrame(row);
+			sync::Track &t = data->getTrack(this->track);
+			assert(t.isKeyFrame(row));
+			t.deleteKeyFrame(row);
 			
 			data->sendDeleteKeyCommand(track, row); // update clients
 		}
diff --git a/editor/trackview.cpp b/editor/trackview.cpp
index 095ee6f..992db9d 100644
--- a/editor/trackview.cpp
+++ b/editor/trackview.cpp
@@ -220,7 +220,7 @@ void TrackView::paintTracks(HDC hdc, RECT rcTracks)
 	{
 		assert(trackIter != document->tracks.end());
 		size_t trackIndex = trackIter->second;
-		const sync::Track &t = *document->actualTracks[trackIndex];
+		const sync::Track &t = document->getTrack(trackIndex);
 
 		if (track < firstTrack) continue;
 		for (int row = firstRow; row <= lastRow; ++row)
diff --git a/sync/data.cpp b/sync/data.cpp
index e708804..c8d2df0 100644
--- a/sync/data.cpp
+++ b/sync/data.cpp
@@ -23,7 +23,6 @@ size_t Data::getTrackIndex(const std::basic_string<TCHAR> &name)
 Track &Data::getTrack(const std::basic_string<TCHAR> &name)
 {
 	size_t index = getTrackIndex(name);
-	assert(index >= 0);
 	assert(index < int(actualTracks.size()));
 	assert(NULL != actualTracks[index]);
 	return *actualTracks[index];
@@ -31,7 +30,6 @@ Track &Data::getTrack(const std::basic_string<TCHAR> &name)
 
 size_t Data::getTrackIndexFromPos(size_t track)
 {
-	assert(track >= 0);
 	assert(track < tracks.size());
 	
 	sync::Data::TrackContainer::iterator trackIter = tracks.begin();
diff --git a/sync/device_client.cpp b/sync/device_client.cpp
index 01546fd..77c1a86 100644
--- a/sync/device_client.cpp
+++ b/sync/device_client.cpp
@@ -193,10 +193,8 @@ void ClientDevice::saveTracks()
 		size_t index = iter->second;
 		
 		assert(index < syncData.getTrackCount());
-		sync::Track *track = syncData.actualTracks[index];
-		
-		assert(NULL != track);
-		saveTrack(*track, getTrackFileName(iter->first));
+		const sync::Track &track = syncData.getTrack(index);
+		saveTrack(track, getTrackFileName(iter->first));
 	}
 }