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

Unified Diff: debugger/QT/SkDebuggerGUI.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 | « bench/subset/SubsetZoomBench.cpp ('k') | debugger/QT/SkDrawCommandGeometryWidget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: debugger/QT/SkDebuggerGUI.cpp
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index d86e3786f1f17507deb25b1420f089a8d2e87900..155fb63901ee91a3118bc7c8d837ace4bbac67ef 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -137,16 +137,16 @@ void SkDebuggerGUI::run(const SkPicture* pict,
sk_tools::PictureRenderer* renderer,
int repeats) {
SkASSERT(pict);
- if (NULL == pict) {
+ if (nullptr == pict) {
return;
}
- SkASSERT(renderer != NULL);
- if (NULL == renderer) {
+ SkASSERT(renderer != nullptr);
+ if (nullptr == renderer) {
return;
}
- renderer->init(pict, NULL, NULL, NULL, false, false);
+ renderer->init(pict, nullptr, nullptr, nullptr, false, false);
renderer->setup();
renderer->render();
@@ -181,7 +181,7 @@ void SkDebuggerGUI::actionProfile() {
SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream,
&SkImageDecoder::DecodeMemory)); // , fSkipCommands));
- if (NULL == picture.get()) {
+ if (nullptr == picture.get()) {
return;
}
}
@@ -729,7 +729,7 @@ void SkDebuggerGUI::loadPicture(const SkString& fileName) {
SkPicture* picture = SkPicture::CreateFromStream(stream);
- if (NULL == picture) {
+ if (nullptr == picture) {
QMessageBox::critical(this, "Error loading file", "Couldn't read file, sorry.");
return;
}
@@ -755,7 +755,7 @@ void SkDebuggerGUI::loadPicture(const SkString& fileName) {
this->setupListWidget();
this->setupComboBox();
- this->setupOverviewText(NULL, 0.0, 1);
+ this->setupOverviewText(nullptr, 0.0, 1);
fInspectorWidget.setDisabled(false);
fViewStateFrame.setDisabled(false);
fSettingsWidget.setDisabled(false);
« no previous file with comments | « bench/subset/SubsetZoomBench.cpp ('k') | debugger/QT/SkDrawCommandGeometryWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698