Mercurial > hg > svcore

diff data/fileio/CSVFileReader.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 e369dd281cf2
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/CSVFileReader.h	Wed Jun 18 13:51:16 2014 +0100
@@ -28,7 +28,7 @@
 class CSVFileReader : public DataFileReader
 {
 public:
-    CSVFileReader(QString path, CSVFormat format, size_t mainModelSampleRate);
+    CSVFileReader(QString path, CSVFormat format, int mainModelSampleRate);
     virtual ~CSVFileReader();
 
     virtual bool isOK() const;
@@ -40,10 +40,10 @@
     QFile *m_file;
     QString m_error;
     mutable int m_warnings;
-    size_t m_mainModelSampleRate;
+    int m_mainModelSampleRate;
 
-    size_t convertTimeValue(QString, int lineno, size_t sampleRate,
-                            size_t windowSize) const;
+    int convertTimeValue(QString, int lineno, int sampleRate,
+                            int windowSize) const;
 };