Replace nil -> NULL in the views code.
Review URL: http://codereview.appspot.com/67139
git-svn-id: http://skia.googlecode.com/svn/trunk@200 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/SkImageView.cpp b/src/views/SkImageView.cpp
index f19e913..9c358c7 100644
--- a/src/views/SkImageView.cpp
+++ b/src/views/SkImageView.cpp
@@ -9,10 +9,10 @@
SkImageView::SkImageView()
{
- fMatrix = nil;
+ fMatrix = NULL;
fScaleType = kMatrix_ScaleType;
- fData.fAnim = nil; // handles initializing the other union values
+ fData.fAnim = NULL; // handles initializing the other union values
fDataIsAnim = true;
fUriIsValid = false; // an empty string is not valid
@@ -58,7 +58,7 @@
{
fScaleType = SkToU8(st);
if (fUriIsValid)
- this->inval(nil);
+ this->inval(NULL);
}
}
@@ -85,7 +85,7 @@
if (matrix && !matrix->isIdentity())
{
- if (fMatrix == nil)
+ if (fMatrix == NULL)
fMatrix = (SkMatrix*)sk_malloc_throw(sizeof(SkMatrix));
*fMatrix = *matrix;
changed = true;
@@ -96,14 +96,14 @@
{
SkASSERT(!fMatrix->isIdentity());
sk_free(fMatrix);
- fMatrix = nil;
+ fMatrix = NULL;
changed = true;
}
}
// only redraw if we changed our matrix and we're not in scaleToFit mode
if (changed && this->getScaleType() == kMatrix_ScaleType && fUriIsValid)
- this->inval(nil);
+ this->inval(NULL);
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@
if (evt.isType(SK_EventType_Inval))
{
if (fUriIsValid)
- this->inval(nil);
+ this->inval(NULL);
return true;
}
return this->INHERITED::onEvent(evt);
@@ -167,7 +167,7 @@
SkDEBUGF(("SkImageView : now = %X[%12.3f], diff = %d\n", now, now/1000., diff));
if (diff == SkAnimator::kDifferent)
- this->inval(nil);
+ this->inval(NULL);
else if (diff == SkAnimator::kPartiallyDifferent)
{
SkRect bounds;
@@ -200,7 +200,7 @@
void SkImageView::onUriChange()
{
if (this->freeData())
- this->inval(nil);
+ this->inval(NULL);
fUriIsValid = true; // give ensureUriIsLoaded() a shot at the new uri
}
@@ -213,7 +213,7 @@
else
delete fData.fBitmap;
- fData.fAnim = nil; // valid for all union values
+ fData.fAnim = NULL; // valid for all union values
return true;
}
return false;