Mercurial > hg > svcore

diff data/model/ImageModel.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/ImageModel.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/model/ImageModel.h	Wed Jun 18 13:51:16 2014 +0100
@@ -55,7 +55,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();
@@ -89,7 +89,7 @@
     Q_OBJECT
 
 public:
-    ImageModel(size_t sampleRate, size_t resolution, bool notifyOnAdd = true) :
+    ImageModel(int sampleRate, int resolution, bool notifyOnAdd = true) :
 	SparseModel<ImagePoint>(sampleRate, resolution, notifyOnAdd)
     { }