Mercurial > hg > svcore

diff data/fileio/CSVFileReader.cpp @ 1047:26cf6d5251ec cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further dedicated-types fixes
author Chris Cannam
date Tue, 10 Mar 2015 17:02:52 +0000
parents cc27f35aa75c
children ed207f89aaef e22bfe8ca248
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp	Tue Mar 10 13:22:10 2015 +0000
+++ b/data/fileio/CSVFileReader.cpp	Tue Mar 10 17:02:52 2015 +0000
@@ -36,7 +36,7 @@
 #include <map>
 
 CSVFileReader::CSVFileReader(QString path, CSVFormat format,
-                             int mainModelSampleRate) :
+                             sv_samplerate_t mainModelSampleRate) :
     m_format(format),
     m_device(0),
     m_ownDevice(true),
@@ -63,7 +63,7 @@
 }
 
 CSVFileReader::CSVFileReader(QIODevice *device, CSVFormat format,
-                             int mainModelSampleRate) :
+                             sv_samplerate_t mainModelSampleRate) :
     m_format(format),
     m_device(device),
     m_ownDevice(false),
@@ -96,7 +96,8 @@
 }
 
 sv_frame_t
-CSVFileReader::convertTimeValue(QString s, int lineno, int sampleRate,
+CSVFileReader::convertTimeValue(QString s, int lineno,
+                                sv_samplerate_t sampleRate,
                                 int windowSize) const
 {
     QRegExp nonNumericRx("[^0-9eE.,+-]");
@@ -155,7 +156,7 @@
     CSVFormat::ModelType modelType = m_format.getModelType();
     CSVFormat::TimingType timingType = m_format.getTimingType();
     CSVFormat::TimeUnits timeUnits = m_format.getTimeUnits();
-    int sampleRate = m_format.getSampleRate();
+    sv_samplerate_t sampleRate = m_format.getSampleRate();
     int windowSize = m_format.getWindowSize();
     QChar separator = m_format.getSeparator();
     bool allowQuoting = m_format.getAllowQuoting();