From b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Tue, 13 Oct 2009 02:07:25 +0000 Subject: Use ASCII strings for switch names. Review URL: http://codereview.chromium.org/270062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/converter/cross/converter_main.cc | 20 ++++++++++---------- o3d/converter/cross/verifier_main.cc | 2 +- o3d/converter_edge/cross/converter_main.cc | 24 ++++++++++++------------ o3d/converter_edge/cross/verifier_main.cc | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'o3d') diff --git a/o3d/converter/cross/converter_main.cc b/o3d/converter/cross/converter_main.cc index f7c60c5..bb1dc7d 100644 --- a/o3d/converter/cross/converter_main.cc +++ b/o3d/converter/cross/converter_main.cc @@ -109,23 +109,23 @@ int CrossMain(int argc, char**argv) { } o3d::converter::Options options; - options.condition = !command_line->HasSwitch(L"no-condition"); - options.pretty_print = command_line->HasSwitch(L"pretty-print"); - options.binary = !command_line->HasSwitch(L"no-binary"); - options.json_only = !command_line->HasSwitch(L"json-only"); - if (command_line->HasSwitch(L"base-path")) { + options.condition = !command_line->HasSwitch("no-condition"); + options.pretty_print = command_line->HasSwitch("pretty-print"); + options.binary = !command_line->HasSwitch("no-binary"); + options.json_only = !command_line->HasSwitch("json-only"); + if (command_line->HasSwitch("base-path")) { options.base_path = o3d::WideToFilePath( - command_line->GetSwitchValue(L"base-path")); + command_line->GetSwitchValue("base-path")); } - if (command_line->HasSwitch(L"asset-paths")) { + if (command_line->HasSwitch("asset-paths")) { std::vector paths; - SplitString(command_line->GetSwitchValue(L"asset-paths"), ',', &paths); + SplitString(command_line->GetSwitchValue("asset-paths"), ',', &paths); for (size_t ii = 0; ii < paths.size(); ++ii) { options.file_paths.push_back(o3d::WideToFilePath(paths[ii])); } } - if (command_line->HasSwitch(L"up-axis")) { - wstring up_axis_string = command_line->GetSwitchValue(L"up-axis"); + if (command_line->HasSwitch("up-axis")) { + wstring up_axis_string = command_line->GetSwitchValue("up-axis"); int x, y, z; if (swscanf(up_axis_string.c_str(), L"%d,%d,%d", &x, &y, &z) != 3) { std::cerr << "Invalid --up-axis value. Should be --up-axis=x,y,z\n"; diff --git a/o3d/converter/cross/verifier_main.cc b/o3d/converter/cross/verifier_main.cc index 4ffde5b..931fa39 100644 --- a/o3d/converter/cross/verifier_main.cc +++ b/o3d/converter/cross/verifier_main.cc @@ -82,7 +82,7 @@ int CrossMain(int argc, char**argv) { } o3d::converter::Options options; - options.condition = !command_line->HasSwitch(L"no-condition"); + options.condition = !command_line->HasSwitch("no-condition"); if (!options.condition && !out_filename.empty()) { std::cerr << "Warning: Ignoring output filename because conditioning " diff --git a/o3d/converter_edge/cross/converter_main.cc b/o3d/converter_edge/cross/converter_main.cc index ee40311..eef1dec 100644 --- a/o3d/converter_edge/cross/converter_main.cc +++ b/o3d/converter_edge/cross/converter_main.cc @@ -110,21 +110,21 @@ int CrossMain(int argc, char**argv) { } o3d::converter::Options options; - options.condition = !command_line->HasSwitch(L"no-condition"); - options.pretty_print = command_line->HasSwitch(L"pretty-print"); - if (command_line->HasSwitch(L"base-path")) { + options.condition = !command_line->HasSwitch("no-condition"); + options.pretty_print = command_line->HasSwitch("pretty-print"); + if (command_line->HasSwitch("base-path")) { options.base_path = o3d::WideToFilePath( - command_line->GetSwitchValue(L"base-path")); + command_line->GetSwitchValue("base-path")); } - if (command_line->HasSwitch(L"asset-paths")) { + if (command_line->HasSwitch("asset-paths")) { std::vector paths; - SplitString(command_line->GetSwitchValue(L"asset-paths"), ',', &paths); + SplitString(command_line->GetSwitchValue("asset-paths"), ',', &paths); for (size_t ii = 0; ii < paths.size(); ++ii) { options.file_paths.push_back(o3d::WideToFilePath(paths[ii])); } } - if (command_line->HasSwitch(L"up-axis")) { - wstring up_axis_string = command_line->GetSwitchValue(L"up-axis"); + if (command_line->HasSwitch("up-axis")) { + wstring up_axis_string = command_line->GetSwitchValue("up-axis"); int x, y, z; if (swscanf(up_axis_string.c_str(), L"%d,%d,%d", &x, &y, &z) != 3) { std::cerr << "Invalid --up-axis value. Should be --up-axis=x,y,z\n"; @@ -134,9 +134,9 @@ int CrossMain(int argc, char**argv) { static_cast(y), static_cast(z)); } - if (command_line->HasSwitch(L"sharp-edge-threshold")) { + if (command_line->HasSwitch("sharp-edge-threshold")) { wstring soften_edge_string = - command_line->GetSwitchValue(L"sharp-edge-threshold"); + command_line->GetSwitchValue("sharp-edge-threshold"); float soft_threshold; if (swscanf(soften_edge_string.c_str(), L"%f", &soft_threshold) != 1) { std::cerr << "Invalid --sharp-edges-threshold value.\n"; @@ -145,9 +145,9 @@ int CrossMain(int argc, char**argv) { options.enable_add_sharp_edge = true; options.sharp_edge_threshold = soft_threshold; } - if (command_line->HasSwitch(L"sharp-edge-color")) { + if (command_line->HasSwitch("sharp-edge-color")) { wstring edge_color_str = - command_line->GetSwitchValue(L"sharp-edge-color"); + command_line->GetSwitchValue("sharp-edge-color"); int r, g, b; if (swscanf(edge_color_str.c_str(), L"%d,%d,%d", &r, &g, &b) != 3) { std::cerr << "Invalid --sharp-edge-color value. Should be " diff --git a/o3d/converter_edge/cross/verifier_main.cc b/o3d/converter_edge/cross/verifier_main.cc index bc0e8a9..c401596 100644 --- a/o3d/converter_edge/cross/verifier_main.cc +++ b/o3d/converter_edge/cross/verifier_main.cc @@ -82,7 +82,7 @@ int CrossMain(int argc, char**argv) { } o3d::converter::Options options; - options.condition = !command_line->HasSwitch(L"no-condition"); + options.condition = !command_line->HasSwitch("no-condition"); if (!options.condition && !out_filename.empty()) { std::cerr << "Warning: Ignoring output filename because conditioning " -- cgit v1.1