Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Unified Diff: src/utils/SkRTConf.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkPatchUtils.cpp ('k') | src/utils/SkTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkRTConf.cpp
diff --git a/src/utils/SkRTConf.cpp b/src/utils/SkRTConf.cpp
index f441bf143b9b849d554b204b958e108aeb3a453e..9c076cbb16290d7424bc0e257ecd9ed4dbf496eb 100644
--- a/src/utils/SkRTConf.cpp
+++ b/src/utils/SkRTConf.cpp
@@ -41,7 +41,7 @@ SkRTConfRegistry::SkRTConfRegistry(): fConfs(100) {
continue;
}
- char *valptr = strtok(NULL, sep);
+ char *valptr = strtok(nullptr, sep);
if (!valptr) {
continue;
}
@@ -240,7 +240,7 @@ static inline void str_replace(char *s, char search, char replace) {
}
template<typename T> bool SkRTConfRegistry::parse(const char *name, T* value) {
- const char *str = NULL;
+ const char *str = nullptr;
for (int i = fConfigFileKeys.count() - 1 ; i >= 0; i--) {
if (fConfigFileKeys[i]->equals(name)) {
@@ -301,7 +301,7 @@ template <typename T> void SkRTConfRegistry::set(const char *name,
}
return;
}
- SkASSERT(confArray != NULL);
+ SkASSERT(confArray != nullptr);
for (SkRTConfBase **confBase = confArray->begin(); confBase != confArray->end(); confBase++) {
// static_cast here is okay because there's only one kind of child class.
SkRTConf<T> *concrete = static_cast<SkRTConf<T> *>(*confBase);
« no previous file with comments | « src/utils/SkPatchUtils.cpp ('k') | src/utils/SkTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698