| Index: src/xml/SkXMLPullParser.cpp
|
| diff --git a/src/xml/SkXMLPullParser.cpp b/src/xml/SkXMLPullParser.cpp
|
| index ed042281a73f8a558ba9789b16b9c5d3576ae697..34ad282cc7a145ddf521cabcc1d9dbbe9c21758d 100644
|
| --- a/src/xml/SkXMLPullParser.cpp
|
| +++ b/src/xml/SkXMLPullParser.cpp
|
| @@ -16,13 +16,13 @@ static void reset(SkXMLPullParser::Curr* curr)
|
| curr->fIsWhitespace = false;
|
| }
|
|
|
| -SkXMLPullParser::SkXMLPullParser() : fStream(NULL)
|
| +SkXMLPullParser::SkXMLPullParser() : fStream(nullptr)
|
| {
|
| fCurr.fEventType = ERROR;
|
| fDepth = -1;
|
| }
|
|
|
| -SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(NULL)
|
| +SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(nullptr)
|
| {
|
| fCurr.fEventType = ERROR;
|
| fDepth = 0;
|
| @@ -32,7 +32,7 @@ SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(NULL)
|
|
|
| SkXMLPullParser::~SkXMLPullParser()
|
| {
|
| - this->setStream(NULL);
|
| + this->setStream(nullptr);
|
| }
|
|
|
| SkStream* SkXMLPullParser::setStream(SkStream* stream)
|
| @@ -89,7 +89,7 @@ const char* SkXMLPullParser::getName()
|
| case END_TAG:
|
| return fCurr.fName;
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -100,7 +100,7 @@ const char* SkXMLPullParser::getText()
|
| case IGNORABLE_WHITESPACE:
|
| return fCurr.fName;
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
|
|