From fef6393454782931ce88a4ffa26b089f74a35d8a Mon Sep 17 00:00:00 2001 From: ana Date: Tue, 23 Mar 2010 13:28:32 +0000 Subject: [PATCH] Windows compatibility --- src/CONVERTOR/VISU_TableReader.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CONVERTOR/VISU_TableReader.cxx b/src/CONVERTOR/VISU_TableReader.cxx index 50d21b1b..19f582ea 100644 --- a/src/CONVERTOR/VISU_TableReader.cxx +++ b/src/CONVERTOR/VISU_TableReader.cxx @@ -159,7 +159,7 @@ namespace while( !aStmIn.eof() ) { aCell.push_back(aTmp); aCell.push_back('\n'); - ::getLine( aStmIn, aTmp ); + getLine( aStmIn, aTmp ); tmpind = aTmp.indexOf('"',1); if( tmpind >= 0 ) { break; @@ -240,7 +240,7 @@ VISU::ImportTables( const char* theFileName, TTableContainer& theContainer, QString aTmp; do { // find beginning of table (tables are separated by empty lines) - while( ::getLine( aStmIn, aTmp ) && aTmp.trimmed() == ""); + while( getLine( aStmIn, aTmp ) && aTmp.trimmed() == "" ); PTableIDMapper aTableIDMapper( new TTableIDMapper() ); TTable2D& aTable2D = *aTableIDMapper; @@ -359,7 +359,7 @@ VISU::ImportTables( const char* theFileName, TTableContainer& theContainer, */ // ************** OLD CODE ****************** } - ::getLine( aStmIn, aTmp ); + getLine( aStmIn, aTmp ); } if( aTable2D.Check() ) { if(MYDEBUG) std::cout << "aTable2D is checked OK " << aTable2D.myTitle << std::endl; @@ -387,7 +387,7 @@ void VISU::ImportCSVTable(const char* theFileName, TTableContainer& theContainer QString aTmp; do { // find beginning of table (tables are separated by empty lines) - while( ::getLine( aStmIn, aTmp ) && aTmp.trimmed() == ""); + while( getLine( aStmIn, aTmp ) && aTmp.trimmed() == "" ); PTableIDMapper aTableIDMapper( new TTableIDMapper() ); TTable2D& aTable2D = *aTableIDMapper; @@ -398,7 +398,7 @@ void VISU::ImportCSVTable(const char* theFileName, TTableContainer& theContainer while( !aStmIn.eof() ) { QString aCell = ""; - if( !(::findNextCell(aStmIn, aTmp, aCell, theSeparator)) ) { + if( !( findNextCell(aStmIn, aTmp, aCell, theSeparator)) ) { return; } if( aTmp.size()==0 ) { @@ -426,7 +426,7 @@ void VISU::ImportCSVTable(const char* theFileName, TTableContainer& theContainer } // clear list of values and read next string aValList.clear(); - ::getLine( aStmIn, aTmp ); + getLine( aStmIn, aTmp ); IsFirst = false; } else { -- 2.39.2