commit a8e2e1504b9af6ba791637f228debaa23953064a
author tfarina <tfarina@chromium.org> Mon Jul 28 19:26:58 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 28 19:26:58 2014 -0700
tree c4dc50d10bb27a4bfd263f877cb7d602f6779afc
parent 2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8

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

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 27365e0..a3e9b24 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -755,7 +755,7 @@
         SkString filename;
         while (iter.next(&filename)) {
             *fSamples.append() = new PictFileFactory(
-                    SkOSPath::SkPathJoin(FLAGS_pictureDir[0], filename.c_str()));
+                SkOSPath::Join(FLAGS_pictureDir[0], filename.c_str()));
         }
     }
     if (!FLAGS_picture.isEmpty()) {
@@ -769,7 +769,7 @@
         SkString filename;
         while (iter.next(&filename)) {
             *fSamples.append() = new PdfFileViewerFactory(
-                    SkOSPath::SkPathJoin(FLAGS_pictureDir[0], filename.c_str()));
+                SkOSPath::Join(FLAGS_pictureDir[0], filename.c_str()));
         }
     }
 #endif

samplecode/SampleUnpremul.cpp

diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index ab99ecb..bfe69e0b 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -106,7 +106,7 @@
         }
 
         // Name, size of the file, and whether or not it is premultiplied.
-        SkString header(SkOSPath::SkBasename(fCurrFile.c_str()));
+        SkString header(SkOSPath::Basename(fCurrFile.c_str()));
         header.appendf("     [%dx%d]     %s", fBitmap.width(), fBitmap.height(),
                        (fPremul ? "premultiplied" : "unpremultiplied"));
         canvas->drawText(header.c_str(), header.size(), 0, height, paint);
@@ -167,7 +167,7 @@
                 return;
             }
         }
-        fCurrFile = SkOSPath::SkPathJoin(fResPath.c_str(), basename.c_str());
+        fCurrFile = SkOSPath::Join(fResPath.c_str(), basename.c_str());
         this->decodeCurrFile();
     }