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";