comparison data/fileio/CSVFileReader.h @ 1036:682d64f05e72

Merge
author Chris Cannam
date Mon, 02 Mar 2015 17:21:34 +0000
parents 920699b6989d
children cc27f35aa75c
comparison
equal deleted inserted replaced
1035:d74ebd2d2c49 1036:682d64f05e72
51 51
52 protected: 52 protected:
53 CSVFormat m_format; 53 CSVFormat m_format;
54 QIODevice *m_device; 54 QIODevice *m_device;
55 bool m_ownDevice; 55 bool m_ownDevice;
56 QString m_filename;
56 QString m_error; 57 QString m_error;
57 mutable int m_warnings; 58 mutable int m_warnings;
58 int m_mainModelSampleRate; 59 int m_mainModelSampleRate;
59 60
60 int convertTimeValue(QString, int lineno, int sampleRate, 61 int convertTimeValue(QString, int lineno, int sampleRate,