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 /samplecode/SampleApp.cpp | |
| 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 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 27365e0b87..a3e9b248ff 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -755,7 +755,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev 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 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev 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 |