comparison data/fileio/CSVFileReader.cpp @ 1127:815f82508f96 tony-2.0-integration

Back out Matthias's e22bfe8ca248 in the hope that my (earlier but on a different branch, and now merged) fix 882d448c8a6d will do the right thing
author Chris Cannam
date Thu, 20 Aug 2015 15:33:13 +0100
parents 39019ce29178
children 87ae75da6527
comparison
equal deleted inserted replaced
1126:39019ce29178 1127:815f82508f96
29 #include <QFileInfo> 29 #include <QFileInfo>
30 #include <QString> 30 #include <QString>
31 #include <QRegExp> 31 #include <QRegExp>
32 #include <QStringList> 32 #include <QStringList>
33 #include <QTextStream> 33 #include <QTextStream>
34 #include <QIODevice>
35 34
36 #include <iostream> 35 #include <iostream>
37 #include <map> 36 #include <map>
38 37
39 using namespace std; 38 using namespace std;