diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 15:57:23 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 15:57:23 +0000 |
commit | 2e4c50cd49a81bef973b934c236b110e660f3746 (patch) | |
tree | ae4a3d58d0a8efc60d47494305b59c57980eac78 /o3d/converter | |
parent | 445a971d141c3b745a84f8fed3a2d627789ebf22 (diff) | |
download | chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.zip chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.gz chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.bz2 |
Remove deprecated CommandLine::GetLooseValues(), rename to args().
It returned a wstring, when really we wanted the native encoded
strings. Fixing the majority of callers actually simplified them
in many cases because the callers wanted native strings too.
Since I'm touching every caller, I gave it a more useful name.
I'm not sure where "loose" came from but it never made sense to me.
BUG=24672
Review URL: http://codereview.chromium.org/3028010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter')
-rw-r--r-- | o3d/converter/cross/converter_main.cc | 8 | ||||
-rw-r--r-- | o3d/converter/cross/verifier_main.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/o3d/converter/cross/converter_main.cc b/o3d/converter/cross/converter_main.cc index ee819a9..fda6907 100644 --- a/o3d/converter/cross/converter_main.cc +++ b/o3d/converter/cross/converter_main.cc @@ -78,16 +78,16 @@ int CrossMain(int argc, char**argv) { o3d::UTF8ToFilePath("convert.py")); - std::vector<std::wstring> values = command_line->GetLooseValues(); + const std::vector<CommandLine::StringType>& values = command_line->args(); if (values.size() == 1) { // If we're only given one argument, then construct the output // filename by substituting the extension on the filename (if any) // with .o3dtgz. - in_filename = o3d::WideToFilePath(values[0]); + in_filename = FilePath(values[0]); out_filename = in_filename.ReplaceExtension(FILE_PATH_LITERAL(".o3dtgz")); } else if (values.size()== 2) { - in_filename = o3d::WideToFilePath(values[0]); - out_filename = o3d::WideToFilePath(values[1]); + in_filename = FilePath(values[0]); + out_filename = FilePath(values[1]); } else { std::cerr << "Usage: " << argv[0] << " [ options ] <infile.dae> [ <outfile> ]\n"; diff --git a/o3d/converter/cross/verifier_main.cc b/o3d/converter/cross/verifier_main.cc index 931fa39..1f7280c 100644 --- a/o3d/converter/cross/verifier_main.cc +++ b/o3d/converter/cross/verifier_main.cc @@ -69,12 +69,12 @@ int CrossMain(int argc, char**argv) { FilePath in_filename, out_filename; - std::vector<std::wstring> values = command_line->GetLooseValues(); + const std::vector<CommandLine::StringType>& values = args->args(); if (values.size() == 1) { - in_filename = o3d::WideToFilePath(values[0]); + in_filename = FilePath(values[0]); } else if (values.size()== 2) { - in_filename = o3d::WideToFilePath(values[0]); - out_filename = o3d::WideToFilePath(values[1]); + in_filename = FilePath(values[0]); + out_filename = FilePath(values[1]); } else { std::cerr << "Usage: " << FilePath(argv[0]).BaseName().value() << " [--no-condition] <infile.fx> [<outfile.fx>]\n"; |