From ec05778d5718a7912e506764d443a78d6a6179e3 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 5 Nov 2012 22:41:51 +0000 Subject: Converted tabs to spaces with tabconv. --- src/stable/csvreader.cpp | 118 +++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'src/stable/csvreader.cpp') diff --git a/src/stable/csvreader.cpp b/src/stable/csvreader.cpp index ddc68f0..c27c8ee 100644 --- a/src/stable/csvreader.cpp +++ b/src/stable/csvreader.cpp @@ -12,24 +12,24 @@ using namespace Bu; Bu::CsvReader::CsvReader( Bu::Stream &sIn, Bu::CsvReader::Style eStyle ) : - sIn( sIn ) + sIn( sIn ) { - switch( eStyle ) - { - case styleExcel: - sDecode = Bu::slot( &decodeExcel ); - break; - - case styleC: - sDecode = Bu::slot( &decodeC ); - break; - } + switch( eStyle ) + { + case styleExcel: + sDecode = Bu::slot( &decodeExcel ); + break; + + case styleC: + sDecode = Bu::slot( &decodeC ); + break; + } } Bu::CsvReader::CsvReader( Bu::Stream &sIn, - Bu::CsvReader::DecodeSignal sDecode ) : - sIn( sIn ), - sDecode( sDecode ) + Bu::CsvReader::DecodeSignal sDecode ) : + sIn( sIn ), + sDecode( sDecode ) { } @@ -39,61 +39,61 @@ Bu::CsvReader::~CsvReader() Bu::StrArray Bu::CsvReader::readLine() { - Bu::StrArray aVals; - - Bu::String sLine = sIn.readLine(); - - if( !sLine.isSet() ) - return Bu::StrArray(); - - Bu::String::iterator i = sLine.begin(); - - aVals.append( sDecode( i ) ); - - while( i ) - { - if( *i == ',' ) - { - i++; - if( !i ) - { - aVals.append(""); - break; - } - aVals.append( sDecode( i ) ); - } - else - { - // Blanks and stuff? - sio << "Out of bound: '" << *i << "'" << sio.nl; - i++; - } - } - - return aVals; + Bu::StrArray aVals; + + Bu::String sLine = sIn.readLine(); + + if( !sLine.isSet() ) + return Bu::StrArray(); + + Bu::String::iterator i = sLine.begin(); + + aVals.append( sDecode( i ) ); + + while( i ) + { + if( *i == ',' ) + { + i++; + if( !i ) + { + aVals.append(""); + break; + } + aVals.append( sDecode( i ) ); + } + else + { + // Blanks and stuff? + sio << "Out of bound: '" << *i << "'" << sio.nl; + i++; + } + } + + return aVals; } Bu::String Bu::CsvReader::decodeExcel( Bu::String::iterator &i ) { - Bu::String sRet; + Bu::String sRet; - for(; i && (*i == ' ' || *i == '\t'); i++ ) { } - - if( !i ) - return sRet; + for(; i && (*i == ' ' || *i == '\t'); i++ ) { } + + if( !i ) + return sRet; - if( *i == '\"' ) + if( *i == '\"' ) { for( i++ ; i; i++ ) { if( *i == '\"' ) - { - i++; - if( !i ) - { - return sRet; - } - else if( *i == '\"' ) + { + i++; + if( !i ) + { + return sRet; + } + else if( *i == '\"' ) { sRet += *i; } -- cgit v1.2.3