X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrackiter.cpp;h=c636d27c84cef8a30d6c700bb6fd454c9d49c9e0;hb=a76a60a5eb20f6e7c5bfc2a7250529b2510df987;hp=3c6295bb974437720b7677cf18bdbadab9136381;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/trackiter.cpp b/source/libr2c2/trackiter.cpp
index 3c6295b..c636d27 100644
--- a/source/libr2c2/trackiter.cpp
+++ b/source/libr2c2/trackiter.cpp
@@ -1,12 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <algorithm>
-#include <msp/core/except.h>
 #include "track.h"
 #include "trackiter.h"
 #include "tracktype.h"
@@ -26,13 +18,13 @@ TrackIter::TrackIter(Track *t, unsigned e):
 	_entry(t ? e : 0)
 {
 	if(_track && _entry>_track->get_type().get_endpoints().size())
-		throw InvalidParameterValue("Endpoint index not valid for track");
+		throw out_of_range("TrackIter::TrackIter");
 }
 
 const TrackType::Endpoint &TrackIter::endpoint() const
 {
 	if(!_track)
-		throw InvalidState("TrackIter is null");
+		throw logic_error("null track");
 
 	return _track->get_type().get_endpoint(_entry);
 }
@@ -108,7 +100,7 @@ TrackIter TrackIter::flip() const
 Track &TrackIter::operator*() const
 {
 	if(!_track)
-		throw InvalidState("TrackIter is null");
+		throw logic_error("null track");
 
 	return *_track;
 }