comparison data/fileio/CSVFileReader.h @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:01 +0100
parents 59e7fe1b1003
children e369dd281cf2
comparison
equal deleted inserted replaced
925:3efc20c59a94 935:f960d67ce842
26 class QFile; 26 class QFile;
27 27
28 class CSVFileReader : public DataFileReader 28 class CSVFileReader : public DataFileReader
29 { 29 {
30 public: 30 public:
31 CSVFileReader(QString path, CSVFormat format, size_t mainModelSampleRate); 31 CSVFileReader(QString path, CSVFormat format, int mainModelSampleRate);
32 virtual ~CSVFileReader(); 32 virtual ~CSVFileReader();
33 33
34 virtual bool isOK() const; 34 virtual bool isOK() const;
35 virtual QString getError() const; 35 virtual QString getError() const;
36 virtual Model *load() const; 36 virtual Model *load() const;
38 protected: 38 protected:
39 CSVFormat m_format; 39 CSVFormat m_format;
40 QFile *m_file; 40 QFile *m_file;
41 QString m_error; 41 QString m_error;
42 mutable int m_warnings; 42 mutable int m_warnings;
43 size_t m_mainModelSampleRate; 43 int m_mainModelSampleRate;
44 44
45 size_t convertTimeValue(QString, int lineno, size_t sampleRate, 45 int convertTimeValue(QString, int lineno, int sampleRate,
46 size_t windowSize) const; 46 int windowSize) const;
47 }; 47 };
48 48
49 49
50 #endif 50 #endif
51 51