comparison data/fileio/CSVFileReader.h @ 1038:cc27f35aa75c cxx11

Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.

 #define _CSV_FILE_READER_H_
 
 #include "DataFileReader.h"
 
 #include "CSVFormat.h"
+
+#include "base/BaseTypes.h"
 
 #include <QList>
 #include <QStringList>
 
 class QFile;

     QString m_filename;
     QString m_error;
     mutable int m_warnings;
     int m_mainModelSampleRate;
 
-    int convertTimeValue(QString, int lineno, int sampleRate,
-                            int windowSize) const;
+    sv_frame_t convertTimeValue(QString, int lineno, int sampleRate,
+                                int windowSize) const;
 };
 
 
 #endif