diff options
Diffstat (limited to 'src/tools/viewcsv.cpp')
-rw-r--r-- | src/tools/viewcsv.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/tools/viewcsv.cpp b/src/tools/viewcsv.cpp index d81525e..6997b9b 100644 --- a/src/tools/viewcsv.cpp +++ b/src/tools/viewcsv.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include <bu/sio.h> | 8 | #include <bu/sio.h> |
2 | #include <bu/optparser.h> | 9 | #include <bu/optparser.h> |
3 | #include <bu/csvreader.h> | 10 | #include <bu/csvreader.h> |
@@ -38,7 +45,7 @@ public: | |||
38 | return 0; | 45 | return 0; |
39 | } | 46 | } |
40 | 47 | ||
41 | Bu::FString sFileIn; | 48 | Bu::String sFileIn; |
42 | bool bHeader; | 49 | bool bHeader; |
43 | }; | 50 | }; |
44 | 51 | ||
@@ -245,10 +252,10 @@ public: | |||
245 | setHeaderRow( !bHeaderRow ); | 252 | setHeaderRow( !bHeaderRow ); |
246 | } | 253 | } |
247 | 254 | ||
248 | Bu::FString prompt( const Bu::FString &sPrompt ) | 255 | Bu::String prompt( const Bu::String &sPrompt ) |
249 | { | 256 | { |
250 | int maxx, maxy; | 257 | int maxx, maxy; |
251 | Bu::FString sStr; | 258 | Bu::String sStr; |
252 | 259 | ||
253 | RegEx re( sPrompt ); | 260 | RegEx re( sPrompt ); |
254 | 261 | ||
@@ -292,7 +299,7 @@ public: | |||
292 | sysCaret.reset(); | 299 | sysCaret.reset(); |
293 | } | 300 | } |
294 | 301 | ||
295 | void findNext( const Bu::FString &sTerm ) | 302 | void findNext( const Bu::String &sTerm ) |
296 | { | 303 | { |
297 | RegEx re( sTerm ); | 304 | RegEx re( sTerm ); |
298 | 305 | ||
@@ -398,7 +405,7 @@ int main( int argc, char *argv[] ) | |||
398 | CsvView view( doc ); | 405 | CsvView view( doc ); |
399 | view.setHeaderRow( opt.bHeader ); | 406 | view.setHeaderRow( opt.bHeader ); |
400 | 407 | ||
401 | Bu::FString sSearchTerm; | 408 | Bu::String sSearchTerm; |
402 | 409 | ||
403 | bool bRun = true; | 410 | bool bRun = true; |
404 | do | 411 | do |