Mercurial > hg > svcore
diff data/model/SparseOneDimensionalModel.h @ 929:59e7fe1b1003 warnfix_no_size_t
Unsigned removals and warning fixes in data/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 14:33:42 +0100 |
parents | 3a3541b357fe |
children | cc27f35aa75c |
line wrap: on
line diff
--- a/data/model/SparseOneDimensionalModel.h Tue Jun 17 13:52:07 2014 +0100 +++ b/data/model/SparseOneDimensionalModel.h Tue Jun 17 14:33:42 2014 +0100 @@ -26,12 +26,12 @@ struct OneDimensionalPoint { public: - OneDimensionalPoint(long _frame) : frame(_frame) { } - OneDimensionalPoint(long _frame, QString _label) : frame(_frame), label(_label) { } + OneDimensionalPoint(int _frame) : frame(_frame) { } + OneDimensionalPoint(int _frame, QString _label) : frame(_frame), label(_label) { } int getDimensions() const { return 1; } - long frame; + int frame; QString label; QString getLabel() const { return label; } @@ -45,7 +45,7 @@ .arg(extraAttributes); } - QString toDelimitedDataString(QString delimiter, size_t sampleRate) const + QString toDelimitedDataString(QString delimiter, int sampleRate) const { QStringList list; list << RealTime::frame2RealTime(frame, sampleRate).toString().c_str(); @@ -76,7 +76,7 @@ Q_OBJECT public: - SparseOneDimensionalModel(size_t sampleRate, size_t resolution, + SparseOneDimensionalModel(int sampleRate, int resolution, bool notifyOnAdd = true) : SparseModel<OneDimensionalPoint>(sampleRate, resolution, notifyOnAdd) { @@ -184,10 +184,10 @@ */ NoteList getNotes() const { - return getNotes(getStartFrame(), getEndFrame()); + return getNotesWithin(getStartFrame(), getEndFrame()); } - NoteList getNotes(size_t startFrame, size_t endFrame) const { + NoteList getNotesWithin(int startFrame, int endFrame) const { PointList points = getPoints(startFrame, endFrame); NoteList notes;