aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar tfarina <tfarina@chromium.org>2014-07-28 19:26:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-28 19:26:58 -0700
commita8e2e1504b9af6ba791637f228debaa23953064a (patch)
treec4dc50d10bb27a4bfd263f877cb7d602f6779afc /include/core
parent2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8 (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 'include/core')
-rw-r--r--include/core/SkOSFile.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkOSFile.h b/include/core/SkOSFile.h
index 1ca11ee932..39eeb4b0b0 100644
--- a/include/core/SkOSFile.h
+++ b/include/core/SkOSFile.h
@@ -133,7 +133,7 @@ public:
*
* Uses SkPATH_SEPARATOR, to work on all platforms.
*/
- static SkString SkPathJoin(const char *rootPath, const char *relativePath);
+ static SkString Join(const char* rootPath, const char* relativePath);
/**
* Return the name of the file, ignoring the directory structure.
@@ -143,6 +143,7 @@ public:
* @return SkString The basename of the file - anything beyond the
* final slash, or the full name if there is no slash.
*/
- static SkString SkBasename(const char* fullPath);
+ static SkString Basename(const char* fullPath);
};
+
#endif