diff options
| author |  tfarina <tfarina@chromium.org> | 2014-07-28 19:26:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-28 19:26:58 -0700 |
| commit | a8e2e1504b9af6ba791637f228debaa23953064a (patch) | |
| tree | c4dc50d10bb27a4bfd263f877cb7d602f6779afc /experimental | |
| parent | 2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8 (diff) | |
Cleanup: Rename SkOSPath functions.
Mostly for brevity and matches better with Python:
Python | Old C++ | New C++
os.path.join | SkOSPath::SkPathJoin | SkOSPath::Join
os.path.basename | SkOSPath::SkBasename | SkOSPath::Basename
BUG=None
TEST=make all
R=mtklein@google.com, bsalomon@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/428443002
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/PdfViewer/chop_transparency_main.cpp | 2 | ||||
| -rw-r--r-- | experimental/PdfViewer/pdf_viewer_main.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/experimental/PdfViewer/chop_transparency_main.cpp b/experimental/PdfViewer/chop_transparency_main.cpp index 3f4b1fdee2..c79515d2c9 100644 --- a/experimental/PdfViewer/chop_transparency_main.cpp +++ b/experimental/PdfViewer/chop_transparency_main.cpp @@ -157,7 +157,7 @@ int tool_main(int argc, char** argv) { if (!is_image_file(filename.c_str())) { continue; } - SkString fullname = SkOSPath::SkPathJoin(dir, filename.c_str()); + SkString fullname = SkOSPath::Join(dir, filename.c_str()); decodeFileAndWrite(fullname.c_str()); } } else if (sk_exists(readPath) && is_image_file(readPath)) { diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp index c1b0284d8a..fab3dc01df 100644 --- a/experimental/PdfViewer/pdf_viewer_main.cpp +++ b/experimental/PdfViewer/pdf_viewer_main.cpp @@ -103,7 +103,7 @@ static bool add_page_and_replace_filename_extension(SkString* path, int page, static bool make_output_filepath(SkString* path, const SkString& dir, const SkString& name, int page) { - *path = SkOSPath::SkPathJoin(dir.c_str(), name.c_str()); + *path = SkOSPath::Join(dir.c_str(), name.c_str()); return add_page_and_replace_filename_extension(path, page, PDF_FILE_EXTENSION, PNG_FILE_EXTENSION); @@ -221,7 +221,7 @@ static bool render_page(const SkString& outputDir, static bool process_pdf(const SkString& inputPath, const SkString& outputDir) { SkDebugf("Loading PDF: %s\n", inputPath.c_str()); - SkString inputFilename = SkOSPath::SkBasename(inputPath.c_str()); + SkString inputFilename = SkOSPath::Basename(inputPath.c_str()); SkAutoTDelete<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(inputPath.c_str())); if (NULL == renderer.get()) { @@ -299,7 +299,7 @@ static int process_input(const char* input, const SkString& outputDir) { SkOSFile::Iter iter(input, PDF_FILE_EXTENSION); SkString inputFilename; while (iter.next(&inputFilename)) { - SkString inputPath = SkOSPath::SkPathJoin(input, inputFilename.c_str()); + SkString inputPath = SkOSPath::Join(input, inputFilename.c_str()); if (!process_pdf(inputPath, outputDir)) { ++failures; } |