summaryrefslogtreecommitdiffstats
path: root/o3d/converter
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
commitb7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 (patch)
treed723b8556ad386a0b8a6e999e3a842e0bfe6f9b0 /o3d/converter
parent1976d41ac728fcceb30f2df3c243cb7417f538f1 (diff)
downloadchromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.zip
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.gz
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.bz2
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
Diffstat (limited to 'o3d/converter')
-rw-r--r--o3d/converter/cross/converter_main.cc20
-rw-r--r--o3d/converter/cross/verifier_main.cc2
2 files changed, 11 insertions, 11 deletions
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<std::wstring> 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 "