getters - use them!

This commit is contained in:
Erik Faye-Lund 2008-02-19 00:03:12 +00:00
parent ff614fbbb9
commit 7f8b12890a
4 changed files with 9 additions and 15 deletions

View File

@ -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
}

View File

@ -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)

View File

@ -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();

View File

@ -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));
}
}