Mercurial > hg > svcore

diff data/model/PathModel.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children a1cd5abcb38b
line wrap: on
line diff
--- a/data/model/PathModel.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/model/PathModel.h	Wed Jun 18 13:51:16 2014 +0100
@@ -43,7 +43,7 @@
     }
         
     QString toDelimitedDataString(QString delimiter,
-                                  size_t sampleRate) const {
+                                  int sampleRate) const {
         QStringList list;
         list << RealTime::frame2RealTime(frame, sampleRate).toString().c_str();
         list << QString("%1").arg(mapframe);
@@ -67,7 +67,7 @@
 class PathModel : public SparseModel<PathPoint>
 {
 public:
-    PathModel(size_t sampleRate, size_t resolution, bool notify = true) :
+    PathModel(int sampleRate, int resolution, bool notify = true) :
         SparseModel<PathPoint>(sampleRate, resolution, notify) { }
 
     virtual void toXml(QTextStream &out,