Mercurial > hg > svcore

comparison data/fileio/CSVFormat.cpp @ 1007:ba404199345f tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 10 Nov 2014 09:19:49 +0000
parents 1974859baba5
children 1888ca033a84
comparison
equal deleted inserted replaced
980:6e6da0636e5e 1007:ba404199345f
101 if (m_separator == "") guessSeparator(line); 101 if (m_separator == "") guessSeparator(line);
102 102
103 QStringList list = StringBits::split(line, m_separator[0], m_allowQuoting); 103 QStringList list = StringBits::split(line, m_separator[0], m_allowQuoting);
104 104
105 int cols = list.size(); 105 int cols = list.size();
106 if (lineno == 0 || (cols < m_columnCount)) m_columnCount = cols; 106 if (lineno == 0 || (cols > m_columnCount)) m_columnCount = cols;
107 if (cols != m_columnCount) m_variableColumnCount = true; 107 if (cols != m_columnCount) m_variableColumnCount = true;
108 108
109 // All columns are regarded as having these qualities until we see 109 // All columns are regarded as having these qualities until we see
110 // something that indicates otherwise: 110 // something that indicates otherwise:
111 111