Mercurial > hg > svcore
diff data/model/RegionModel.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 | e22b6e89a7f7 |
children | cc27f35aa75c |
line wrap: on
line diff
--- a/data/model/RegionModel.h Tue Jun 17 13:52:07 2014 +0100 +++ b/data/model/RegionModel.h Tue Jun 17 14:33:42 2014 +0100 @@ -38,14 +38,14 @@ public: RegionRec() : frame(0), value(0.f), duration(0) { } RegionRec(long _frame) : frame(_frame), value(0.0f), duration(0) { } - RegionRec(long _frame, float _value, size_t _duration, QString _label) : + RegionRec(long _frame, float _value, int _duration, QString _label) : frame(_frame), value(_value), duration(_duration), label(_label) { } int getDimensions() const { return 3; } long frame; float value; - size_t duration; + int duration; QString label; QString getLabel() const { return label; } @@ -60,7 +60,7 @@ .arg(XmlExportable::encodeEntities(label)).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(); @@ -94,7 +94,7 @@ Q_OBJECT public: - RegionModel(size_t sampleRate, size_t resolution, + RegionModel(int sampleRate, int resolution, bool notifyOnAdd = true) : IntervalModel<RegionRec>(sampleRate, resolution, notifyOnAdd), m_valueQuantization(0), @@ -102,7 +102,7 @@ { } - RegionModel(size_t sampleRate, size_t resolution, + RegionModel(int sampleRate, int resolution, float valueMinimum, float valueMaximum, bool notifyOnAdd = true) : IntervalModel<RegionRec>(sampleRate, resolution,